Browse Source

fix: conflict over extensible table actions button generation

pull/19818/head
sumeyyeKurtulus 2 years ago
parent
commit
6c65e855b9
  1. 2
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html
  2. 18
      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>

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

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

Loading…
Cancel
Save