Merge tag 'dspace-cris-2024.02.02' into main-cris

Release DSpace-CRIS 2024.02.02

Author: atarix83

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2024.02.02-SNAPSHOT",
+  "version": "2024.02.02",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

src/app/process-page/form/scripts-select/scripts-select.component.spec.ts

@@ -109,4 +109,86 @@ describe('ScriptsSelectComponent', () => {
     const validationError = fixture.debugElement.query(By.css('.validation-error'));
     expect(validationError).toBeFalsy();
   }));
+
+  it('should load more scripts when scrolled to the bottom', fakeAsync(() => {
+    spyOn(component, 'loadScripts');
+    const event = {
+      target: {
+        scrollTop: 100,
+        clientHeight: 200,
+        scrollHeight: 300,
+      },
+    };
+
+    component.onScroll(event);
+    tick();
+
+    expect(component.loadScripts).toHaveBeenCalled();
+  }));
+
+  it('should load more scripts when scrolled almost to the bottom', fakeAsync(() => {
+    spyOn(component, 'loadScripts');
+    const event = {
+      target: {
+        scrollTop: 99,
+        clientHeight: 200,
+        scrollHeight: 300,
+      },
+    };
+
+    component.onScroll(event);
+    tick();
+
+    expect(component.loadScripts).toHaveBeenCalled();
+  }));
+
+  it('should not load more scripts if already loading', fakeAsync(() => {
+    spyOn(component, 'loadScripts');
+    component.isLoading$.next(true);
+    const event = {
+      target: {
+        scrollTop: 100,
+        clientHeight: 200,
+        scrollHeight: 300,
+      },
+    };
+
+    component.onScroll(event);
+    tick();
+
+    expect(component.loadScripts).not.toHaveBeenCalled();
+  }));
+
+  it('should not load more scripts if it is the last page', fakeAsync(() => {
+    spyOn(component, 'loadScripts');
+    (component as any)._isLastPage = true;
+    const event = {
+      target: {
+        scrollTop: 100,
+        clientHeight: 200,
+        scrollHeight: 300,
+      },
+    };
+
+    component.onScroll(event);
+    tick();
+
+    expect(component.loadScripts).not.toHaveBeenCalled();
+  }));
+
+  it('should not load more scripts if not scrolled to the bottom', fakeAsync(() => {
+    spyOn(component, 'loadScripts');
+    const event = {
+      target: {
+        scrollTop: 50,
+        clientHeight: 200,
+        scrollHeight: 300,
+      },
+    };
+
+    component.onScroll(event);
+    tick();
+
+    expect(component.loadScripts).not.toHaveBeenCalled();
+  }));
 });

src/app/process-page/form/scripts-select/scripts-select.component.ts

@@ -128,7 +128,9 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
    * @param event The scroll event
    */
   onScroll(event: any) {
-    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+    // offset to fix issues with zooming in or out in the browser
+    const offset = 5;
+    if (event.target.scrollTop + event.target.clientHeight + offset >= event.target.scrollHeight) {
       if (!this.isLoading$.value && !this._isLastPage) {
         this.scriptOptions.currentPage++;
         this.loadScripts();

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);
+  }
+
 }

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts

@@ -218,7 +218,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       node.item,
       level,
       node.hasChildren,
-      ((!node.isSearchNode && node.hasChildren) || (node.isSearchNode && node.hasChildren &&  isNotEmpty(node.children))),
+      (node.hasChildren && isNotEmpty(node.children)),
       node.pageInfo,
       node.loadMoreParentItem,
       node.isSearchNode,