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

[DSC-1857] configure new auth features

Approved-by: Andrea Barbasso

Author: FrancescoMolinaro

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

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

src/app/shared/menu/providers/export.menu.spec.ts

@@ -10,9 +10,7 @@ import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
-import { ScriptServiceStub } from '../../testing/script-service.stub';
 import { MenuItemType } from '../menu-item-type.model';
 import { PartialMenuSection } from '../menu-provider.model';
 import { ExportMenuProvider } from './export.menu';
@@ -59,7 +57,6 @@ describe('ExportMenuProvider', () => {
       providers: [
         ExportMenuProvider,
         { provide: AuthorizationDataService, useValue: authorizationServiceStub },
-        { provide: ScriptDataService, useClass: ScriptServiceStub },
       ],
     });
     provider = TestBed.inject(ExportMenuProvider);

src/app/shared/menu/providers/export.menu.ts

@@ -9,18 +9,13 @@
 import { Injectable } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
-  combineLatest as observableCombineLatest,
   map,
   Observable,
   of,
 } from 'rxjs';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import {
-  METADATA_EXPORT_SCRIPT_NAME,
-  ScriptDataService,
-} from '../../../core/data/processes/script-data.service';
 import { ExportBatchSelectorComponent } from '../../dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
 import { ExportMetadataCsvSelectorComponent } from '../../dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component';
 import { ExportMetadataXlsSelectorComponent } from '../../dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component';
@@ -35,7 +30,6 @@ import { AbstractExpandableMenuProvider } from './helper-providers/expandable-me
 export class ExportMenuProvider extends AbstractExpandableMenuProvider {
   constructor(
     protected authorizationService: AuthorizationDataService,
-    protected scriptDataService: ScriptDataService,
     protected modalService: NgbModal,
   ) {
     super();
@@ -56,14 +50,11 @@ export class ExportMenuProvider extends AbstractExpandableMenuProvider {
   }
 
   public getSubSections(): Observable<PartialMenuSection[]> {
-    return observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.IsComColAdmin),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME),
-    ]).pipe(
-      map(([authorized, metadataExportScriptExists]: [boolean, boolean]) => {
+    return this.authorizationService.isAuthorized(FeatureID.CanExportMetadata).pipe(
+      map((authorized: boolean) => {
         return [
           {
-            visible: authorized && metadataExportScriptExists,
+            visible: authorized,
             model: {
               type: MenuItemType.ONCLICK,
               text: 'menu.section.export_metadata_csv',
@@ -73,7 +64,7 @@ export class ExportMenuProvider extends AbstractExpandableMenuProvider {
             },
           },
           {
-            visible: authorized && metadataExportScriptExists,
+            visible: authorized,
             model: {
               type: MenuItemType.ONCLICK,
               text: 'menu.section.export_metadata_xls',
@@ -83,7 +74,7 @@ export class ExportMenuProvider extends AbstractExpandableMenuProvider {
             },
           },
           {
-            visible: authorized && metadataExportScriptExists,
+            visible: authorized,
             model: {
               type: MenuItemType.ONCLICK,
               text: 'menu.section.export_batch',

src/app/shared/menu/providers/import.menu.spec.ts

@@ -10,9 +10,7 @@ import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
-import { ScriptServiceStub } from '../../testing/script-service.stub';
 import { MenuItemType } from '../menu-item-type.model';
 import { PartialMenuSection } from '../menu-provider.model';
 import { ImportMenuProvider } from './import.menu';
@@ -58,7 +56,6 @@ describe('ImportMenuProvider', () => {
       providers: [
         ImportMenuProvider,
         { provide: AuthorizationDataService, useValue: authorizationServiceStub },
-        { provide: ScriptDataService, useClass: ScriptServiceStub },
       ],
     });
     provider = TestBed.inject(ImportMenuProvider);

src/app/shared/menu/providers/import.menu.ts

@@ -9,18 +9,13 @@
 import { Injectable } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
-  combineLatest as observableCombineLatest,
   map,
   Observable,
   of,
 } from 'rxjs';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import {
-  METADATA_IMPORT_SCRIPT_NAME,
-  ScriptDataService,
-} from '../../../core/data/processes/script-data.service';
 import { MenuItemType } from '../menu-item-type.model';
 import { PartialMenuSection } from '../menu-provider.model';
 import { AbstractExpandableMenuProvider } from './helper-providers/expandable-menu-provider';
@@ -32,7 +27,6 @@ import { AbstractExpandableMenuProvider } from './helper-providers/expandable-me
 export class ImportMenuProvider extends AbstractExpandableMenuProvider {
   constructor(
     protected authorizationService: AuthorizationDataService,
-    protected scriptDataService: ScriptDataService,
     protected modalService: NgbModal,
   ) {
     super();
@@ -52,22 +46,19 @@ export class ImportMenuProvider extends AbstractExpandableMenuProvider {
   }
 
   public getSubSections(): Observable<PartialMenuSection[]> {
-    return observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.IsComColAdmin),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME),
-    ]).pipe(
-      map(([authorized, metadataImportScriptExists]) => {
+    return this.authorizationService.isAuthorized(FeatureID.CanImportMetadata).pipe(
+      map((authorized: boolean) => {
         return [
           {
-            visible: authorized && metadataImportScriptExists,
+            visible: authorized,
             model: {
               type: MenuItemType.LINK,
               text: 'menu.section.import_metadata',
               link: '/admin/metadata-import',
             },
           },
           {
-            visible: authorized && metadataImportScriptExists,
+            visible: authorized,
             model: {
               type: MenuItemType.LINK,
               text: 'menu.section.import_batch',

src/config/default-app-config.ts

@@ -179,6 +179,8 @@ export class DefaultAppConfig implements AppConfig {
     FeatureID.CoarNotifyEnabled,
     FeatureID.CanSeeQA,
     FeatureID.IsComColAdmin,
+    FeatureID.CanExportMetadata,
+    FeatureID.CanImportMetadata,
   ];
 
   discoveryAuthorizationFeaturesConfig: DiscoveryConfigurationFeaturesConfig = {