Merge branch 'dspace-cris-2024_02_x' into ux-plus-cris-2024_02_x

# Conflicts:
#	src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.spec.ts
#	src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts

Author: atarix83

src/app/app.component.spec.ts

@@ -2,12 +2,15 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   inject,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
   ActivatedRoute,
+  NavigationStart,
   Router,
 } from '@angular/router';
 import {
@@ -19,7 +22,10 @@ import {
   TranslateLoader,
   TranslateModule,
 } from '@ngx-translate/core';
-import { of } from 'rxjs';
+import {
+  of,
+  Subject,
+} from 'rxjs';
 
 import { APP_CONFIG } from '../config/app-config.interface';
 import { environment } from '../environments/environment';
@@ -46,7 +52,6 @@ import { MockActivatedRoute } from './shared/mocks/active-router.mock';
 import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
 import { AuthServiceMock } from './shared/mocks/auth.service.mock';
 import { HeadTagServiceMock } from './shared/mocks/head-tag-service.mock';
-import { RouterMock } from './shared/mocks/router.mock';
 import { getMockThemeService } from './shared/mocks/theme-service.mock';
 import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
 import { CSSVariableService } from './shared/sass-helper/css-variable.service';
@@ -65,6 +70,8 @@ const initialState = {
   core: { auth: { loading: false } },
 };
 
+const itemPageUrl = '/entities/publication/3b6ef8e8-15a1-4607-abf8-2a6fbd572346';
+
 export function getMockLocaleService(): LocaleService {
   return jasmine.createSpyObj('LocaleService', {
     setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode'),
@@ -77,13 +84,20 @@ describe('App component', () => {
   let routeServiceMock;
   let klaroServiceSpy: jasmine.SpyObj<KlaroService>;
   let datadogRumServiceSpy: jasmine.SpyObj<DatadogRumService>;
+  let routerEventsObs: Subject<any>;
+  let routerMock: Router;
 
   const getDefaultTestBedConf = () => {
     breadcrumbsServiceSpy = jasmine.createSpyObj(['listenForRouteChanges']);
     routeServiceMock = jasmine.createSpyObj('RouterService', {
       getCurrentUrl: of('/home'),
     });
 
+    routerEventsObs = new Subject<any>();
+    routerMock = jasmine.createSpyObj([], {
+      events: routerEventsObs,
+    });
+
     klaroServiceSpy = jasmine.createSpyObj('KlaroService', {
       getSavedPreferences: jasmine.createSpy('getSavedPreferences'),
       watchConsentUpdates: jasmine.createSpy('watchConsentUpdates').and.returnValue(null),
@@ -112,7 +126,7 @@ describe('App component', () => {
         { provide: HeadTagService, useValue: new HeadTagServiceMock() },
         { provide: Angulartics2DSpace, useValue: new AngularticsProviderMock() },
         { provide: AuthService, useValue: new AuthServiceMock() },
-        { provide: Router, useValue: new RouterMock() },
+        { provide: Router, useValue: routerMock },
         { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
@@ -173,4 +187,32 @@ describe('App component', () => {
     });
 
   });
+
+  describe('isRouteLoading$ handling', () => {
+
+    it('should not show loading for item page', fakeAsync(() => {
+      routeServiceMock.getCurrentUrl.and.returnValue(of(itemPageUrl));
+      routerEventsObs.next(new NavigationStart(1, itemPageUrl));
+      fixture.detectChanges();
+      tick();
+      expect(comp.isRouteLoading$.value).toBeFalse();
+    }));
+
+    it('should show loading for item page administrative edit', fakeAsync(() => {
+      routeServiceMock.getCurrentUrl.and.returnValue(of(itemPageUrl));
+      routerEventsObs.next(new NavigationStart(2, itemPageUrl + '/edit'));
+      fixture.detectChanges();
+      tick();
+      expect(comp.isRouteLoading$.value).toBeTrue();
+    }));
+
+    it('should not show loading navigating between item pages in administrative edit', fakeAsync(() => {
+      routeServiceMock.getCurrentUrl.and.returnValue(of(itemPageUrl + '/edit'));
+      routerEventsObs.next(new NavigationStart(2, itemPageUrl + '/edit/status'));
+      fixture.detectChanges();
+      tick();
+      expect(comp.isRouteLoading$.value).toBeFalse();
+    }));
+
+  });
 });

src/app/app.component.ts

@@ -176,7 +176,8 @@ export class AppComponent implements OnInit, AfterViewInit {
       )),
     ).subscribe(([currentUrl, event]: [string, any]) => {
       if (event instanceof NavigationStart) {
-        if (!(currentUrl.startsWith('/entities' || getEditItemPageRoute()) || currentUrl.startsWith(getWorkspaceItemModuleRoute()) || currentUrl.startsWith(getWorkflowItemModuleRoute()))) {
+        const nextUrl = event.url;
+        if (!this.shouldSkipLoadingStatus(currentUrl, nextUrl)) {
           distinctNext(this.isRouteLoading$, true);
         }
         // distinctNext(this.isRouteLoading$, true);
@@ -219,4 +220,14 @@ export class AppComponent implements OnInit, AfterViewInit {
       });
   }
 
+  private shouldSkipLoadingStatus(currentUrl: string, nextUrl: string): boolean {
+    return ((currentUrl.startsWith('/entities') || currentUrl.startsWith(getEditItemPageRoute())) && !(this.isAdministrativeEditItemPageRoute(nextUrl, currentUrl)))
+      || currentUrl.startsWith(getWorkspaceItemModuleRoute()) || currentUrl.startsWith(getWorkflowItemModuleRoute());
+  }
+
+  private isAdministrativeEditItemPageRoute(nextUrl: string, currentUrl: string): boolean {
+    const editPageRegEx = /\/(entities\/[^\/]+|items)\/[0-9a-f-]{36}\/edit(?:\/.*)?$/;
+    return editPageRegEx.test(nextUrl) && !editPageRegEx.test(currentUrl);
+  }
+
 }

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.spec.ts

@@ -511,6 +511,8 @@ describe('MetadataContainerComponent', () => {
           bitstreamField.bitstream.bundle,
           [ { metadataName: 'metadataFieldTest', metadataValue: 'metadataValueTest' } ],
           false,
+          {},
+          false,
         );
       });
     });
@@ -527,6 +529,8 @@ describe('MetadataContainerComponent', () => {
           bitstreamField.bitstream.bundle,
           [], // <--- empty array of filters,
           false, // <--- filterNonRestricted
+          {},
+          false,
         );
       });
     });

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts

@@ -239,7 +239,7 @@ export class MetadataContainerComponent implements OnInit {
         metadataValue: this.field.bitstream.metadataValue,
       });
     }
-    return this.bitstreamDataService.findShowableBitstreamsByItem(this.item.uuid, this.field.bitstream.bundle, filters, false)
+    return this.bitstreamDataService.findShowableBitstreamsByItem(this.item.uuid, this.field.bitstream.bundle, filters, false, {}, false)
       .pipe(
         getFirstCompletedRemoteData(),
         map((response: RemoteData<PaginatedList<Bitstream>>) => {

src/app/process-page/overview/process-overview.service.ts

@@ -98,4 +98,26 @@ export class ProcessOverviewService {
     );
   }
 
+  /**
+   * Retrieve processes by their owner and status
+   * @param processStatus              The status for which to retrieve processes
+   * @param findListOptions            The FindListOptions object
+   * @param autoRefreshingIntervalInMs Optional: The interval by which to automatically refresh the retrieved processes.
+   * Leave empty or set to null to only retrieve the processes once.
+   */
+  getOwnProcessesByProcessStatus(processStatus: ProcessStatus, findListOptions?: FindListOptions, autoRefreshingIntervalInMs: number = null) {
+    const requestParam = new RequestParam('processStatus', processStatus);
+    const options: FindListOptions = Object.assign(new FindListOptions(), {
+      searchParams: [requestParam],
+      elementsPerPage: 5,
+    }, findListOptions);
+
+    if (hasValue(autoRefreshingIntervalInMs) && autoRefreshingIntervalInMs > 0) {
+      this.processDataService.stopAutoRefreshing(processStatus);
+      return this.processDataService.autoRefreshingSearchBy(processStatus, 'own', options, autoRefreshingIntervalInMs);
+    } else {
+      return this.processDataService.searchBy('own', options);
+    }
+  }
+
 }

src/app/process-page/overview/table/process-overview-table.component.spec.ts

@@ -11,10 +11,14 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs';
+import {
+  BehaviorSubject,
+  of,
+} from 'rxjs';
 import { take } from 'rxjs/operators';
 
 import { AuthService } from '../../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { ProcessDataService } from '../../../core/data/processes/process-data.service';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
@@ -52,6 +56,10 @@ describe('ProcessOverviewTableComponent', () => {
 
   let translateServiceSpy: jasmine.SpyObj<TranslateService>;
 
+  const authorizationService = jasmine.createSpyObj('authorizationService', {
+    isAuthorized: of(true),
+  });
+
   function init() {
     processes = [
       Object.assign(new Process(), {
@@ -104,6 +112,7 @@ describe('ProcessOverviewTableComponent', () => {
         sort: 'creationTime',
       },
       getProcessesByProcessStatus: createSuccessfulRemoteDataObject$(createPaginatedList(processes)).pipe(take(1)),
+      getOwnProcessesByProcessStatus: createSuccessfulRemoteDataObject$(createPaginatedList(processes)).pipe(take(1)),
     });
     processService = jasmine.createSpyObj('processService', {
       searchBy: createSuccessfulRemoteDataObject$(createPaginatedList(processes)).pipe(take(1)),
@@ -153,6 +162,7 @@ describe('ProcessOverviewTableComponent', () => {
         { provide: NgbModal, useValue: modalService },
         { provide: AuthService, useValue: authService },
         { provide: RouteService, useValue: routeService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProcessOverviewTableComponent, {
@@ -227,6 +237,7 @@ describe('ProcessOverviewTableComponent', () => {
   });
 
   describe('getEPersonName function', () => {
+
     it('should return unknown user when id is null', (done: DoneFn) => {
       const id = null;
       const expectedTranslation = 'process.overview.unknown.user';
@@ -264,4 +275,16 @@ describe('ProcessOverviewTableComponent', () => {
       expect(translateServiceSpy.get).not.toHaveBeenCalled();
     });
   });
+
+  describe('when user is not admin', () => {
+    beforeAll(waitForAsync(() => {
+      authorizationService.isAuthorized.and.callFake(() => of(false));
+    }));
+
+    it ('should call getOwnProcessesByProcessStatus', () => {
+      expect(processOverviewService.getOwnProcessesByProcessStatus).toHaveBeenCalled();
+    });
+
+  });
+
 });

src/app/process-page/overview/table/process-overview-table.component.ts

@@ -40,6 +40,8 @@ import { PaginationService } from 'src/app/core/pagination/pagination.service';
 
 import { AuthService } from '../../../core/auth/auth.service';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -166,11 +168,13 @@ export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
               protected router: Router,
               protected auth: AuthService,
               private translateService: TranslateService,
+              protected authorizationService: AuthorizationDataService,
               @Inject(PLATFORM_ID) protected platformId: object,
   ) {
   }
 
   ngOnInit() {
+    const isAdmin$ = this.isCurrentUserAdmin();
     // Only auto refresh on browsers
     if (!isPlatformBrowser(this.platformId)) {
       this.useAutoRefreshingSearchBy = false;
@@ -216,8 +220,16 @@ export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
           this.processOverviewService.getFindListOptions(paginationOptions, this.sortField)),
         // Use the findListOptions to retrieve the relevant processes every interval
         switchMap((findListOptions: FindListOptions) =>
-          this.processOverviewService.getProcessesByProcessStatus(
-            this.processStatus, findListOptions, this.useAutoRefreshingSearchBy ? this.autoRefreshInterval : null),
+          isAdmin$.pipe(
+            switchMap((isAdmin: boolean) => {
+              const autoRefreshInterval = this.useAutoRefreshingSearchBy ? this.autoRefreshInterval : null;
+              if (isAdmin) {
+                return this.processOverviewService.getProcessesByProcessStatus(this.processStatus, findListOptions, autoRefreshInterval);
+              } else {
+                return this.processOverviewService.getOwnProcessesByProcessStatus(this.processStatus, findListOptions, autoRefreshInterval);
+              }
+            }),
+          ),
         ),
         // Redirect the user when he is logged out
         redirectOn4xx(this.router, this.auth),
@@ -310,4 +322,8 @@ export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
     this.processOverviewService.stopAutoRefreshing(this.processStatus);
   }
 
+  isCurrentUserAdmin(): Observable<boolean> {
+    return this.authorizationService.isAuthorized(FeatureID.AdministratorOf, undefined, undefined);
+  }
+
 }