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

Task/dspace cris 2025 02 x/DSC-2709

Approved-by: Francesco Molinaro

Author: Andrea Barbasso

src/app/app.menus.ts

@@ -9,6 +9,7 @@ import { buildMenuStructure } from './shared/menu/menu.structure';
 import { MenuID } from './shared/menu/menu-id.model';
 import { MenuRoute } from './shared/menu/menu-route.model';
 import { AccessControlMenuProvider } from './shared/menu/providers/access-control.menu';
+import { AdminCommunityListMenuProvider } from './shared/menu/providers/admin-community-list.menu';
 import { AdminSearchMenuProvider } from './shared/menu/providers/admin-search.menu';
 import { CoarNotifyMenuProvider } from './shared/menu/providers/coar-notify.menu';
 import { SubscribeMenuProvider } from './shared/menu/providers/comcol-subscribe.menu';
@@ -59,6 +60,7 @@ export const MENUS = buildMenuStructure({
     StatisticsMenuProvider,
   ],
   [MenuID.ADMIN]: [
+    AdminCommunityListMenuProvider,
     NewMenuProvider,
     EditMenuProvider,
     ImportMenuProvider,

src/app/shared/menu/providers/admin-community-list.menu.spec.ts

@@ -0,0 +1,59 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
+import { TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
+import { MenuItemType } from '../menu-item-type.model';
+import { PartialMenuSection } from '../menu-provider.model';
+import { AdminCommunityListMenuProvider } from './admin-community-list.menu';
+
+describe('AdminCommunityListMenuProvider', () => {
+  const expectedSections: PartialMenuSection[] = [
+    {
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: `menu.section.communities_and_collections`,
+        link: `/community-list`,
+      },
+      icon: 'users',
+    },
+  ];
+
+  let provider: AdminCommunityListMenuProvider;
+  let authorizationServiceStub = new AuthorizationDataServiceStub();
+
+  beforeEach(() => {
+    spyOn(authorizationServiceStub, 'isAuthorized').and.returnValue(
+      of(true),
+    );
+
+    TestBed.configureTestingModule({
+      providers: [
+        AdminCommunityListMenuProvider,
+        { provide: APP_CONFIG, useValue: { layout: { navbar: { showCommunityCollection: false } } } },
+        { provide: AuthorizationDataService, useValue: authorizationServiceStub } ],
+    });
+    provider = TestBed.inject(AdminCommunityListMenuProvider);
+  });
+
+  it('should be created', () => {
+    expect(provider).toBeTruthy();
+  });
+
+  it('getSections should return expected menu sections', (done) => {
+    provider.getSections().subscribe((sections) => {
+      expect(sections).toEqual(expectedSections);
+      done();
+    });
+  });
+});

src/app/shared/menu/providers/admin-community-list.menu.ts

@@ -0,0 +1,55 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
+import {
+  inject,
+  Injectable,
+} from '@angular/core';
+import {
+  map,
+  Observable,
+  of,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { MenuItemType } from '../menu-item-type.model';
+import {
+  AbstractMenuProvider,
+  PartialMenuSection,
+} from '../menu-provider.model';
+
+/**
+ * Menu provider to create the "Communities & Collections" menu section in the admin navbar
+ */
+@Injectable()
+export class AdminCommunityListMenuProvider extends AbstractMenuProvider {
+
+  protected appConfig = inject(APP_CONFIG);
+  protected authorizationService = inject(AuthorizationDataService);
+
+  public getSections(): Observable<PartialMenuSection[]> {
+    if (this.appConfig.layout.navbar.showCommunityCollection) {
+      return of([]);
+    }
+    return this.authorizationService.isAuthorized(FeatureID.IsComColAdmin).pipe(
+      map(isComColAdmin => {
+        return [{
+          visible: isComColAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: `menu.section.communities_and_collections`,
+            link: `/community-list`,
+          },
+          icon: 'users',
+        },
+        ] as PartialMenuSection[];
+      }));
+  }
+}

src/app/shared/menu/providers/community-list.menu.spec.ts

@@ -8,6 +8,7 @@
 
 import { TestBed } from '@angular/core/testing';
 
+import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { MenuItemType } from '../menu-item-type.model';
 import { PartialMenuSection } from '../menu-provider.model';
 import { CommunityListMenuProvider } from './community-list.menu';
@@ -31,6 +32,7 @@ describe('CommunityListMenuProvider', () => {
     TestBed.configureTestingModule({
       providers: [
         CommunityListMenuProvider,
+        { provide: APP_CONFIG, useValue: { layout: { navbar: { showCommunityCollection: true } } } },
       ],
     });
     provider = TestBed.inject(CommunityListMenuProvider);

src/app/shared/menu/providers/community-list.menu.ts

@@ -6,12 +6,16 @@
  * http://www.dspace.org/license/
  */
 
-import { Injectable } from '@angular/core';
+import {
+  inject,
+  Injectable,
+} from '@angular/core';
 import {
   Observable,
   of,
 } from 'rxjs';
 
+import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { MenuItemType } from '../menu-item-type.model';
 import {
   AbstractMenuProvider,
@@ -23,7 +27,13 @@ import {
  */
 @Injectable()
 export class CommunityListMenuProvider extends AbstractMenuProvider {
+
+  protected appConfig = inject(APP_CONFIG);
   public getSections(): Observable<PartialMenuSection[]> {
+    if (!this.appConfig.layout.navbar.showCommunityCollection) {
+      return of([]);
+    }
+
     return of([
       {
         visible: true,

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

@@ -1,76 +1,14 @@
 import { TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { Item } from '../../../core/shared/item.model';
-import { ITEM } from '../../../core/shared/item.resource-type';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { MenuItemType } from '../menu-item-type.model';
-import { PartialMenuSection } from '../menu-provider.model';
+import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { StatisticsMenuProvider } from './statistics.menu';
 
 describe('StatisticsMenuProvider', () => {
-
-  const expectedSectionsNoDSO: PartialMenuSection[] = [
-    {
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.statistics',
-        link: `statistics`,
-      },
-      icon: 'chart-line',
-    },
-  ];
-
-  const expectedSectionsForItem: PartialMenuSection[] = [
-    {
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.statistics',
-        link: `statistics/items/test-item-uuid`,
-      },
-      icon: 'chart-line',
-    },
-  ];
-
-  const expectedSectionsForItemInvisible: PartialMenuSection[] = [
-    {
-      visible: false,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.statistics',
-        link: `statistics/items/test-item-uuid`,
-      },
-      icon: 'chart-line',
-    },
-  ];
-
   let provider: StatisticsMenuProvider;
-
-  const item: Item = Object.assign(new Item(), {
-    uuid: 'test-item-uuid',
-    type: ITEM.value,
-    _links: { self: { href: 'self-link' } },
-    metadata: {
-      'dc.title': [{
-        'value': 'Untyped Item',
-      }],
-    },
-  });
-
-  const item2: Item = Object.assign(new Item(), {
-    uuid: 'test-item2-uuid',
-    type: ITEM.value,
-    _links: { self: { href: 'self-link' } },
-    metadata: {
-      'dc.title': [{
-        'value': 'Untyped Item 2',
-      }],
-    },
-  });
   let authorizationService: AuthorizationDataService;
 
   beforeEach(() => {
@@ -83,6 +21,7 @@ describe('StatisticsMenuProvider', () => {
       providers: [
         StatisticsMenuProvider,
         { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub({}, { }) },
       ],
     });
     provider = TestBed.inject(StatisticsMenuProvider);
@@ -93,62 +32,21 @@ describe('StatisticsMenuProvider', () => {
   });
 
   describe('getSectionsForContext', () => {
-    it('should return the general statistics link when no DSO is provided', (done) => {
+    it('should return menu entries when at least one authorization is granted', (done) => {
       provider.getSectionsForContext(undefined).subscribe((sections) => {
-        expect(sections).toEqual(expectedSectionsNoDSO);
-        done();
-      });
-    });
-    it('should return a statistics link to the DSO when a DSO is provided', (done) => {
-      provider.getSectionsForContext(item).subscribe((sections) => {
-        expect(sections).toEqual(expectedSectionsForItem);
-        done();
-      });
-    });
-    it('should not return anything if not authorized to view statistics', (done) => {
-      (TestBed.inject(AuthorizationDataService) as any).isAuthorized.and.returnValue(of(false));
-      provider.getSectionsForContext(item).subscribe((sections) => {
-        expect(sections).toEqual(expectedSectionsForItemInvisible);
-        done();
-      });
-    });
-  });
-
-  describe('getRouteContext', () => {
-    it('should get the dso from the route', (done) => {
-      const route = { data: { dso: createSuccessfulRemoteDataObject(item) } } as any;
-
-      provider.getRouteContext(route, undefined).subscribe((dso) => {
-        expect(dso).toEqual(item);
+        expect(Array.isArray(sections)).toBeTrue();
+        expect(sections.length).toBeGreaterThan(0);
+        expect(sections.some((s) => s.id === 'statistics')).toBeTrue();
         done();
       });
     });
-    it('should get the dso from first parent route with a dso when the route itself has none', (done) => {
-      const route = {
-        data: {},
-        parent: {
-          data: {},
-          parent: {
-            data: { dso: createSuccessfulRemoteDataObject(item) },
-            parent: { data: { dso: createSuccessfulRemoteDataObject(item2) } },
-          },
-        },
-      } as any;
 
-      provider.getRouteContext(route, undefined).subscribe((dso) => {
-        expect(dso).toEqual(item);
-        expect(dso).not.toEqual(item2);
-        done();
-      });
-    });
-    it('should return undefined when no dso is found in the route', (done) => {
-      const route = { data: {}, parent: { data: {}, parent: { data: {}, parent: { data: {} } } } } as any;
-
-      provider.getRouteContext(route, undefined).subscribe((dso) => {
-        expect(dso).toBeUndefined();
+    it('should return an empty array when no authorizations are granted', (done) => {
+      (TestBed.inject(AuthorizationDataService) as any).isAuthorized.and.returnValue(of(false));
+      provider.getSectionsForContext(undefined).subscribe((sections) => {
+        expect(sections).toEqual([]);
         done();
       });
     });
   });
-
 });