From dbc718e60d85af03707a4cbda4a7eb322e808b0a Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 6 Aug 2021 08:33:22 +0300
Subject: [PATCH 1/2] fix: hide action column when no action is permitted

---
 .../extensible-table.component.html                 |  2 +-
 .../extensible-table/extensible-table.component.ts  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html
index ebbece2277..29644aa2e2 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html
@@ -1,6 +1,6 @@
 <ngx-datatable default [rows]="data" [count]="recordsTotal" [list]="list">
   <ngx-datatable-column
-    *ngIf="actionsTemplate || actionList.length"
+    *ngIf="(actionsTemplate || actionList.length) && hasAtLeastOnePermittedAction"
     [name]="actionsText | abpLocalization"
     [maxWidth]="columnWidths[0]"
     [width]="columnWidths[0]"
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts
index 84b47a02ac..6aea101dc7 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.ts
@@ -4,6 +4,7 @@ import {
   getShortDateFormat,
   getShortDateShortTimeFormat,
   getShortTimeFormat,
+  PermissionService,
 } from '@abp/ng.core';
 import { formatDate } from '@angular/common';
 import {
@@ -65,6 +66,8 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
 
   readonly trackByFn: TrackByFunction<EntityProp<R>> = (_, item) => item.name;
 
+  hasAtLeastOnePermittedAction: boolean;
+
   constructor(
     @Inject(LOCALE_ID) private locale: string,
     private config: ConfigStateService,
@@ -75,8 +78,14 @@ export class ExtensibleTableComponent<R = any> implements OnChanges {
     const extensions = injector.get(ExtensionsService);
     const name = injector.get(EXTENSIONS_IDENTIFIER);
     this.propList = extensions.entityProps.get(name).props;
-    this.actionList = (extensions['entityActions'].get(name)
-      .actions as unknown) as EntityActionList<R>;
+    this.actionList = extensions['entityActions'].get(name)
+      .actions as unknown as EntityActionList<R>;
+
+    const permissionService = injector.get(PermissionService);
+    this.hasAtLeastOnePermittedAction =
+      permissionService.filterItemsByPolicy(
+        this.actionList.toArray().map(action => ({ requiredPolicy: action.permission })),
+      ).length > 0;
     this.setColumnWidths(DEFAULT_ACTIONS_COLUMN_WIDTH);
   }
 

From c688df65f578028d7ab2662ac5d54af0aae0fde8 Mon Sep 17 00:00:00 2001
From: Bunyamin Coskuner <bnymncoskuner@gmail.com>
Date: Fri, 6 Aug 2021 11:08:30 +0300
Subject: [PATCH 2/2] Update
 npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Muhammed Altuğ <muhammetaltug@gmail.com>
---
 .../components/extensible-table/extensible-table.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html
index 29644aa2e2..81e2845ac0 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html
@@ -1,6 +1,6 @@
 <ngx-datatable default [rows]="data" [count]="recordsTotal" [list]="list">
   <ngx-datatable-column
-    *ngIf="(actionsTemplate || actionList.length) && hasAtLeastOnePermittedAction"
+    *ngIf="actionsTemplate || (actionList.length && hasAtLeastOnePermittedAction)"
     [name]="actionsText | abpLocalization"
     [maxWidth]="columnWidths[0]"
     [width]="columnWidths[0]"