fix: Set permissions success callback

hslayers · Feb 13, 2024 · 297ea26 · 297ea26
1 parent 0f5b7ea
commit 297ea26
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/projects/hslayers/common/dialog-set-permissions/set-permissions.component.ts b/projects/hslayers/common/dialog-set-permissions/set-permissions.component.ts
@@ -22,17 +22,26 @@ import {UpsertLayerObject} from 'hslayers-ng/types';
   imports: [CommonModule, TranslateCustomPipe, HsLaymanModule],
 })
 export class HsSetPermissionsDialogComponent
-  implements HsDialogComponent, OnInit {
+  implements HsDialogComponent, OnInit
+{
   dialogItem: HsDialogItem;
   viewRef: ViewRef;
   currentAccessRights: accessRightsModel = {
     'access_rights.write': 'private',
     'access_rights.read': 'EVERYONE',
   };
+  /**
+   * @param onPermissionSaved Callback method as service instance and method name.
+   * Pass service as property to not polute the component
+   * and because compoent is cosntructed dynamically via dialog service (no input)
+   */
   data: {
     recordType: string;
     selectedRecord: HsAddDataLayerDescriptor;
-    onPermissionSaved: () => any;
+    onPermissionSaved: {
+      service: any;
+      method: string;
+    };
   };
   endpoint: HsEndpoint;
   state: 'idle' | 'loading' | 'success' | 'error' = 'idle';
@@ -107,7 +116,9 @@ export class HsSetPermissionsDialogComponent
           return;
         }
         this.state = 'success';
-        this.data.onPermissionSaved();
+        this.data.onPermissionSaved.service[
+          this.data.onPermissionSaved.method
+        ]();
         break;
       case 'composition':
         await this.hsLaymanService.updateCompositionAccessRights(
@@ -120,7 +131,9 @@ export class HsSetPermissionsDialogComponent
           return;
         }
         this.state = 'success';
-        this.data.onPermissionSaved();
+        this.data.onPermissionSaved.service[
+          this.data.onPermissionSaved.method
+        ]();
         break;
       default:
     }

diff --git a/...layers/components/add-data/catalogue/catalogue-list-item/catalogue-list-item.component.ts b/...layers/components/add-data/catalogue/catalogue-list-item/catalogue-list-item.component.ts
@@ -179,7 +179,10 @@ export class HsCatalogueListItemComponent implements OnInit {
     this.hsDialogContainerService.create(HsSetPermissionsDialogComponent, {
       recordType: 'layer',
       selectedRecord: layer,
-      onPermissionSaved: this.hsAddDataCatalogueService.reloadData,
+      onPermissionSaved: {
+        service: this.hsAddDataCatalogueService,
+        method: 'reloadData',
+      },
     });
   }
 

diff --git a/projects/hslayers/components/compositions/compositions-list-item.component.ts b/projects/hslayers/components/compositions/compositions-list-item.component.ts
@@ -90,8 +90,10 @@ export class HsCompositionsListItemComponent {
     this.hsDialogContainerService.create(HsSetPermissionsDialogComponent, {
       recordType: 'composition',
       selectedRecord: composition,
-      onPermissionSaved:
-        this.hsCompositionsCatalogueService.loadFilteredCompositions,
+      onPermissionSaved: {
+        service: this.hsCompositionsCatalogueService,
+        method: 'loadFilteredCompositions',
+      },
     });
   }