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

DSC-2699

Approved-by: Andrea Barbasso

Author: vins01-4science

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

@@ -13,6 +13,7 @@ export enum FeatureID {
   CanManageGroup = 'canManageGroup',
   IsCollectionAdmin = 'isCollectionAdmin',
   IsCommunityAdmin = 'isCommunityAdmin',
+  IsComColAdmin = 'isComColAdmin',
   CanChangePassword = 'canChangePassword',
   CanDownload = 'canDownload',
   CanRequestACopy = 'canRequestACopy',

src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts

@@ -96,12 +96,12 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
 
   ngOnInit(): void {
     this.allOptions$ = this.calculateBrowseProperty().pipe(
-      switchMap ( (browseProperty) => this.configurationService.findByPropertyName( browseProperty) ),
+      switchMap((browseProperty) => this.configurationService.findByPropertyName(browseProperty)),
       getFinishedRemoteData(),
-      switchMap( (remoteData) => this.searchForBaseBrowseCollectionPropertyIfDataNotFound(remoteData)),
+      switchMap((remoteData) => this.searchForBaseBrowseCollectionPropertyIfDataNotFound(remoteData)),
       getFinishedRemoteData(),
       getRemoteDataPayload(),
-      map ( (configProperty) => {
+      map((configProperty) => {
         const comColRoute = (this.contentType === 'collection') ? getCollectionPageRoute(this.id) : getCommunityPageRoute(this.id);
         let options = this.initOptionsByContentType(comColRoute);
         if (configProperty) {
@@ -132,14 +132,14 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
       this.allOptions$,
       this.router.events.pipe(
         startWith(this.router),
-        filter((next: Router|Scroll) => (isNotEmpty((next as Router)?.url) || (next as Scroll)?.type === EventType.Scroll)),
-        map((next: Router|Scroll) => (next as Router)?.url || ((next as Scroll).routerEvent as NavigationEnd).urlAfterRedirects),
+        filter((next: Router | Scroll) => (isNotEmpty((next as Router)?.url) || (next as Scroll)?.type === EventType.Scroll)),
+        map((next: Router | Scroll) => (next as Router)?.url || ((next as Scroll).routerEvent as NavigationEnd).urlAfterRedirects),
         distinctUntilChanged(),
       ),
     ]).subscribe(([navOptions, url]: [ComColPageNavOption[], string]) => {
       for (const option of navOptions) {
         if (url?.split('?')[0] === comColRoute && option.id === this.appConfig[this.contentType].defaultBrowseTab) {
-          void this.router.navigate([option.routerLink], { queryParams: option.params, replaceUrl: true  });
+          void this.router.navigate([option.routerLink], { queryParams: option.params, replaceUrl: true });
           break;
         } else if (option.routerLink === url?.split('?')[0]) {
           this.currentOptionId$.next(option.id);
@@ -154,7 +154,7 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
       ).subscribe((allOptions: ComColPageNavOption[]) => {
         for (const option of allOptions) {
           if (option.id === this.appConfig[this.contentType].defaultBrowseTab) {
-            this.currentOptionId$.next(option[0].id);
+            this.currentOptionId$.next(option.id);
             void this.router.navigate([option.routerLink], { queryParams: option.params });
             break;
           }
@@ -181,8 +181,8 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
     if (this.contentType === 'collection') {
       return this.collectionService.findById(this.id).pipe(
         getFirstSucceededRemoteDataPayload(),
-        map( (collection) => collection.firstMetadataValue('dspace.entity.type') ),
-        map ( (entityType) => entityType ? 'browse.collection.' + entityType : 'browse.collection' ),
+        map((collection) => collection.firstMetadataValue('dspace.entity.type')),
+        map((entityType) => entityType ? 'browse.collection.' + entityType : 'browse.collection'),
       );
     }
     return of('browse.' + this.contentType);

src/app/shared/menu/providers/admin-search.menu.ts

@@ -32,7 +32,7 @@ export class AdminSearchMenuProvider extends AbstractMenuProvider {
   }
 
   public getSections(): Observable<PartialMenuSection[]> {
-    return this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+    return this.authorizationService.isAuthorized(FeatureID.IsComColAdmin).pipe(
       map((isSiteAdmin) => {
         return [
           {

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

@@ -57,7 +57,7 @@ export class ExportMenuProvider extends AbstractExpandableMenuProvider {
 
   public getSubSections(): Observable<PartialMenuSection[]> {
     return observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      this.authorizationService.isAuthorized(FeatureID.IsComColAdmin),
       this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME),
     ]).pipe(
       map(([authorized, metadataExportScriptExists]: [boolean, boolean]) => {

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

@@ -53,7 +53,7 @@ export class ImportMenuProvider extends AbstractExpandableMenuProvider {
 
   public getSubSections(): Observable<PartialMenuSection[]> {
     return observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      this.authorizationService.isAuthorized(FeatureID.IsComColAdmin),
       this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME),
     ]).pipe(
       map(([authorized, metadataImportScriptExists]) => {