refactor: currying isAllowed to clean up callers

liimaorg · Aug 23, 2024 · f970988 · f970988
1 parent 8db243f
commit f970988
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/AMW_angular/io/src/app/auth/auth.service.ts b/AMW_angular/io/src/app/auth/auth.service.ts
@@ -45,6 +45,9 @@ export class AuthService extends BaseService {
   }
 }
 
-export function isAllowed(action: string, role: string) {
-  return action === 'ALL' || action === role;
+// currying function which verifies roles in a action
+export function isAllowed(role: string) {
+  return (action: string) => {
+    return action === 'ALL' || action === role;
+  };
 }
diff --git a/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.ts b/AMW_angular/io/src/app/settings/deployment-parameter/deployment-parameter.component.ts
@@ -44,8 +44,8 @@ export class DeploymentParameterComponent implements OnInit, OnDestroy {
 
   private getUserPermissions() {
     const actions = this.authService.getActionsForPermission('MANAGE_DEPLOYMENT_PARAMETER');
-    this.canCreate.set(actions.some((action) => isAllowed(action, 'CREATE')));
-    this.canDelete.set(actions.some((action) => isAllowed(action, 'DELETE')));
+    this.canCreate.set(actions.some(isAllowed('CREATE')));
+    this.canDelete.set(actions.some(isAllowed('DELETE')));
   }
 
   addKey(): void {

diff --git a/AMW_angular/io/src/app/settings/releases/releases.component.ts b/AMW_angular/io/src/app/settings/releases/releases.component.ts
@@ -73,9 +73,9 @@ export class ReleasesComponent implements OnInit {
 
   private getUserPermissions() {
     const actions = this.authService.getActionsForPermission('RELEASE');
-    this.canCreate.set(actions.some((action) => isAllowed(action, 'CREATE')));
-    this.canEdit.set(actions.some((action) => isAllowed(action, 'UPDATE')));
-    this.canDelete.set(actions.some((action) => isAllowed(action, 'DELETE')));
+    this.canCreate.set(actions.some(isAllowed('CREATE')));
+    this.canEdit.set(actions.some(isAllowed('UPDATE')));
+    this.canDelete.set(actions.some(isAllowed('DELETE')));
   }
 
   private getReleases() {

diff --git a/AMW_angular/io/src/app/settings/tags/tags.component.ts b/AMW_angular/io/src/app/settings/tags/tags.component.ts
@@ -35,8 +35,8 @@ export class TagsComponent implements OnInit, OnDestroy {
 
   private getUserPermissions() {
     const actions = this.authService.getActionsForPermission('MANAGE_GLOBAL_TAGS');
-    this.canCreate.set(actions.some((action) => isAllowed(action, 'CREATE')));
-    this.canDelete.set(actions.some((action) => isAllowed(action, 'DELETE')));
+    this.canCreate.set(actions.some(isAllowed('CREATE')));
+    this.canDelete.set(actions.some(isAllowed('DELETE')));
   }
 
   addTag(): void {