121534: Removed the unauthorized metadata-import & metadata-export sc…

…ript calls
alexandrevryghem · Nov 25, 2024 · 7322cda · 7322cda
1 parent 41f9751
commit 7322cda
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 37 deletions.
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
@@ -12,7 +12,7 @@ import { RemoteData } from './core/data/remote-data';
 import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
 import { BrowseService } from './core/browse/browse.service';
 import { MenuService } from './shared/menu/menu.service';
-import { filter, find, map, take } from 'rxjs/operators';
+import { filter, find, map, take, switchMap } from 'rxjs/operators';
 import { hasValue } from './shared/empty.util';
 import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
@@ -416,28 +416,16 @@ export class MenuResolver implements Resolve<boolean> {
     ];
     menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection));
 
-    observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)
-    ]).pipe(
-      filter(([authorized, metadataExportScriptExists]: boolean[]) => authorized && metadataExportScriptExists),
-      take(1)
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      take(1),
+      filter((isAuthorized: boolean) => isAuthorized),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)),
+      take(1),
+      filter((canExecute: boolean) => canExecute),
     ).subscribe(() => {
       // Hides the export menu for unauthorised people
       // If in the future more sub-menus are added,
       // it should be reviewed if they need to be in this subscribe
-      this.menuService.addSection(MenuID.ADMIN, {
-        id: 'export',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.export'
-        } as TextMenuItemModel,
-        icon: 'file-export',
-        index: 3,
-        shouldPersistOnRouteChange: true
-      });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'export_metadata',
         parentID: 'export',
@@ -466,6 +454,18 @@ export class MenuResolver implements Resolve<boolean> {
         } as OnClickMenuItemModel,
         shouldPersistOnRouteChange: true
       });
+      this.menuService.addSection(MenuID.ADMIN, {
+        id: 'export',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.TEXT,
+          text: 'menu.section.export'
+        } as TextMenuItemModel,
+        icon: 'file-export',
+        index: 3,
+        shouldPersistOnRouteChange: true
+      });
     });
   }
 
@@ -477,28 +477,16 @@ export class MenuResolver implements Resolve<boolean> {
     const menuList = [];
     menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection));
 
-    observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)
-    ]).pipe(
-      filter(([authorized, metadataImportScriptExists]: boolean[]) => authorized && metadataImportScriptExists),
-      take(1)
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      take(1),
+      filter((isAuthorized: boolean) => isAuthorized),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)),
+      take(1),
+      filter((canExecute: boolean) => canExecute),
     ).subscribe(() => {
       // Hides the import menu for unauthorised people
       // If in the future more sub-menus are added,
       // it should be reviewed if they need to be in this subscribe
-      this.menuService.addSection(MenuID.ADMIN, {
-        id: 'import',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.import'
-        } as TextMenuItemModel,
-        icon: 'file-import',
-        index: 2,
-        shouldPersistOnRouteChange: true,
-      });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'import_metadata',
         parentID: 'import',
@@ -523,6 +511,18 @@ export class MenuResolver implements Resolve<boolean> {
         } as LinkMenuItemModel,
         shouldPersistOnRouteChange: true
       });
+      this.menuService.addSection(MenuID.ADMIN, {
+        id: 'import',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.TEXT,
+          text: 'menu.section.import'
+        } as TextMenuItemModel,
+        icon: 'file-import',
+        index: 2,
+        shouldPersistOnRouteChange: true,
+      });
     });
   }
 

diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts
@@ -86,6 +86,7 @@ export class MenuComponent implements OnInit, OnDestroy {
     this.menuCollapsed = this.menuService.isMenuCollapsed(this.menuID);
     this.menuPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
     this.menuVisible = this.menuService.isMenuVisible(this.menuID);
+    // todo this should check if the subsection values changed as well
     this.sections = this.menuService.getMenuTopSections(this.menuID).pipe(distinctUntilChanged(compareArraysUsingIds()));
 
     this.subs.push(