Merged in task/dspace-cris-2023_02_x/DSC-1857 (pull request DSpace#2517)

[DSC-1857] replace script find one with new auth feature

Approved-by: Andrea Barbasso

Author: FrancescoMolinaro

src/app/core/data/feature-authorization/feature-id.ts

@@ -40,4 +40,6 @@ export enum FeatureID {
   ShowClaimItem = 'showClaimItem',
   CanCorrectItem = 'canCorrectItem',
   CanViewInWorkflowSinceStatistics = 'canViewInWorkflowSinceStatistics',
+  CanExportMetadata = 'canExportMetadata',
+  CanImportMetadata = 'canImportMetadata',
 }

src/app/menu.resolver.spec.ts

@@ -10,7 +10,6 @@ import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.compo
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { MenuService } from './shared/menu/menu.service';
 import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
-import { ScriptDataService } from './core/data/processes/script-data.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { MenuID } from './shared/menu/menu-id.model';
@@ -70,7 +69,6 @@ describe('MenuResolver', () => {
   let menuService;
   let sectionsService;
   let authorizationService;
-  let scriptService;
   let configService;
 
   beforeEach(waitForAsync(() => {
@@ -84,9 +82,7 @@ describe('MenuResolver', () => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
       isAuthorized: observableOf(true)
     });
-    scriptService = jasmine.createSpyObj('scriptService', {
-      scriptWithNameExistsAndCanExecute: observableOf(true)
-    });
+
     configService = jasmine.createSpyObj('ConfigurationDataService', {
       findByPropertyName: observableOf({})
     });
@@ -98,7 +94,6 @@ describe('MenuResolver', () => {
         { provide: MenuService, useValue: menuService },
         { provide: SectionDataService, useValue: sectionsService },
         { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: ScriptDataService, useValue: scriptService },
         { provide: AuthService, useValue: AuthServiceStub },
         { provide: ConfigurationDataService, useValue: configService },
         {
@@ -412,7 +407,7 @@ describe('MenuResolver', () => {
     describe('for site admin', () => {
       beforeEach(() => {
         authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID: FeatureID) => {
-          return observableOf(featureID === FeatureID.AdministratorOf);
+          return observableOf(featureID === FeatureID.AdministratorOf || featureID === FeatureID.CanExportMetadata || featureID === FeatureID.CanImportMetadata);
         });
       });
 

src/app/menu.resolver.ts

@@ -40,11 +40,8 @@ import {
 } from './shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component';
 import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import {
-  METADATA_EXPORT_SCRIPT_NAME,
-  METADATA_IMPORT_SCRIPT_NAME,
-  ScriptDataService
-} from './core/data/processes/script-data.service';
+
+
 import {
   ExportBatchSelectorComponent
 } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
@@ -73,7 +70,6 @@ export class MenuResolver implements Resolve<boolean> {
     protected menuService: MenuService,
     protected authorizationService: AuthorizationDataService,
     protected modalService: NgbModal,
-    protected scriptDataService: ScriptDataService,
     protected authService: AuthService,
     protected sectionDataService: SectionDataService,
     protected configService: ConfigurationDataService,
@@ -561,18 +557,9 @@ export class MenuResolver implements Resolve<boolean> {
     ];
     menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection));
 
-    observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
-      this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
-    ]).pipe(
-      filter(([isAdmin, isCommunityAdmin, isCollectionAdmin]) =>
-        isAdmin || isCollectionAdmin || isCommunityAdmin
-      ),
+    this.authorizationService.isAuthorized(FeatureID.CanExportMetadata).pipe(
+      filter((canExport) => canExport),
       take(1),
-      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)),
-      filter((metadataExportScriptExists: boolean) => metadataExportScriptExists),
-      take(1)
     ).subscribe(() => {
       // Hides the export menu for unauthorised people
       // If in the future more sub-menus are added,
@@ -694,18 +681,9 @@ export class MenuResolver implements Resolve<boolean> {
     const menuList = [];
     menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection));
 
-    observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
-      this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
-    ]).pipe(
-      filter(([isAdmin, isCommunityAdmin, isCollectionAdmin]) =>
-        isAdmin || isCollectionAdmin || isCommunityAdmin
-      ),
+    this.authorizationService.isAuthorized(FeatureID.CanImportMetadata).pipe(
+      filter((canImport) => canImport),
       take(1),
-      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)),
-      filter((metadataImportScriptExists: boolean) => metadataImportScriptExists),
-      take(1)
     ).subscribe(() => {
       // Hides the import menu for unauthorised people
       // If in the future more sub-menus are added,