Browse Source

Merge pull request #19758 from abpframework/issue-17543

Angular - Actions button visibility problem on the extensible table component
pull/19762/head
oykuermann 2 years ago
committed by GitHub
parent
commit
29c2b90cc1
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html
  2. 20
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

2
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html

@ -17,7 +17,7 @@
*ngTemplateOutlet="actionsTemplate || gridActions; context: { $implicit: row, index: i }" *ngTemplateOutlet="actionsTemplate || gridActions; context: { $implicit: row, index: i }"
></ng-container> ></ng-container>
<ng-template #gridActions> <ng-template #gridActions>
@if (hasAvailableActions(i, row)) { @if (hasAvailableActions(row)) {
<abp-grid-actions [index]="i" [record]="row" text="AbpUi::Actions"></abp-grid-actions> <abp-grid-actions [index]="i" [record]="row" text="AbpUi::Actions"></abp-grid-actions>
} }
</ng-template> </ng-template>

20
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

@ -206,12 +206,20 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
}); });
} }
hasAvailableActions(index, data): boolean { hasAvailableActions(rowData): boolean {
const { permission, visible } = this.actionList.get(index)?.value || {}; let isActionAvailable = true;
let isActionAvailable = this.permissionService.getGrantedPolicy(permission); this.actionList.toArray().map(action => {
if (data && data.record) { const { visible, permission } = action;
isActionAvailable &&= visible(data); if (rowData && action) {
} const visibilityCheck = visible({
record: rowData,
getInjected: this.getInjected,
});
const permissionCheck = this.permissionService.getGrantedPolicy(permission);
isActionAvailable = visibilityCheck && permissionCheck;
}
});
return isActionAvailable; return isActionAvailable;
} }
} }

Loading…
Cancel
Save