fix: permissions for different ctx's and add read possibility via edi…

…t-button
liimaorg · Jan 3, 2025 · d9001ec · d9001ec
1 parent 2292e15
commit d9001ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...o/src/app/resources/resource-edit/resource-functions/resource-functions-list.component.ts b/...o/src/app/resources/resource-edit/resource-functions/resource-functions-list.component.ts
@@ -48,13 +48,15 @@ export class ResourceFunctionsListComponent implements OnInit, OnDestroy {
         canShowInstanceFunctions: this.authService.hasPermission(RESOURCE_PERM, Action.READ),
         canShowSuperTypeFunctions: this.authService.hasPermission(RESOURCETYPE_PERM, Action.READ),
         canAdd:
-          (this.contextId() === 1 || this.contextId === null) &&
+          this.contextId() === 1 &&
           this.authService.hasResourceGroupPermission(RESOURCE_PERM, Action.CREATE, this.resource().resourceGroupId),
-        canEdit:
-          (this.contextId() === 1 || this.contextId === null) &&
-          this.authService.hasResourceGroupPermission(RESOURCE_PERM, Action.UPDATE, this.resource().resourceGroupId),
+        canEdit: this.authService.hasResourceGroupPermission(
+          RESOURCE_PERM,
+          Action.UPDATE,
+          this.resource().resourceGroupId,
+        ),
         canDelete:
-          (this.contextId() === 1 || this.contextId === null) &&
+          this.contextId() === 1 &&
           this.authService.hasResourceGroupPermission(RESOURCE_PERM, Action.DELETE, this.resource().resourceGroupId),
       };
     } else {
@@ -84,7 +86,7 @@ export class ResourceFunctionsListComponent implements OnInit, OnDestroy {
         result.push({
           title: 'Resource Type Functions',
           entries: resource,
-          canOverwrite: this.permissions().canEdit || this.permissions().canShowSuperTypeFunctions,
+          canOverwrite: this.permissions().canEdit && this.contextId() === 1,
         });
       }
       return result;

diff --git a/...rces/resource-type-edit/resource-type-functions/resource-type-functions-list.component.ts b/...rces/resource-type-edit/resource-type-functions/resource-type-functions-list.component.ts
@@ -47,13 +47,11 @@ export class ResourceTypeFunctionsListComponent {
         canShowInstanceFunctions: this.authService.hasPermission(RESOURCETYPE_PERM, Action.READ),
         canShowSuperTypeFunctions: this.authService.hasPermission(RESOURCETYPE_PERM, Action.READ),
         canAdd:
-          (this.contextId() === 1 || this.contextId === null) &&
+          this.contextId() === 1 &&
           this.authService.hasResourceTypePermission(RESOURCETYPE_PERM, Action.CREATE, this.resourceType().name),
-        canEdit:
-          (this.contextId() === 1 || this.contextId === null) &&
-          this.authService.hasResourceTypePermission(RESOURCETYPE_PERM, Action.UPDATE, this.resourceType().name),
+        canEdit: this.authService.hasResourceTypePermission(RESOURCETYPE_PERM, Action.UPDATE, this.resourceType().name),
         canDelete:
-          (this.contextId() === 1 || this.contextId === null) &&
+          this.contextId() === 1 &&
           this.authService.hasResourceTypePermission(RESOURCETYPE_PERM, Action.DELETE, this.resourceType().name),
       };
     } else {
@@ -83,7 +81,7 @@ export class ResourceTypeFunctionsListComponent {
         result.push({
           title: 'Supertype Functions',
           entries: resource,
-          canOverwrite: this.permissions().canEdit || this.permissions().canShowSuperTypeFunctions,
+          canOverwrite: this.permissions().canEdit && this.contextId() === 1,
         });
       }
       return result;