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

# Conflicts:
#	src/app/item-page/item-page-routing.module.ts

Author: atarix83

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
       CYPRESS_BASE_URL: http://127.0.0.1:4000
       # When Chrome version is specified, we pin to a specific version of Chrome
       # Comment this out to use the latest release
-      CHROME_VERSION: "116.0.5845.187-1"
+      #CHROME_VERSION: "116.0.5845.187-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
       NODE_OPTIONS: '--max-old-space-size=4096'
       # Project name to use when running "docker compose" prior to e2e tests
@@ -172,11 +172,12 @@ jobs:
       # Get homepage and verify that the <meta name="title"> tag includes "DSpace".
       # If it does, then SSR is working, as this tag is created by our MetadataService.
       # This step also prints entire HTML of homepage for easier debugging if grep fails.
-      - name: Verify SSR (server-side rendering)
-        run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/home)
-          echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
+      # TODO: enable this step once we have a CRIS back end to test against
+      # - name: Verify SSR (server-side rendering)
+      #   run: |
+      #     result=$(wget -O- -q http://127.0.0.1:4000/home)
+      #     echo "$result"
+      #     echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
 
       - name: Stop running app
         run: kill -9 $(lsof -t -i:4000)

bitbucket-pipelines.yml

@@ -6,9 +6,9 @@ definitions:
     - step: &unittest-code-checks
         name: test-code-checks
         image:
-          name: cypress/browsers:node18.12.0-chrome107
+          name: cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
           run-as-user: 1000
-        size: 2x
+        size: 4x
         caches:
           - node
         script:

config/config.example.yml

@@ -187,6 +187,8 @@ submission:
     metadataDetailsList:
       - label: 'Document type'
         name: dc.type
+  # Minimum number of characters required before performing a lookup.
+  minChars: 3
 
 #  Default Language in which the UI will be rendered if the user's browser language is not an active language
 defaultLanguage: en

cypress.config.ts

@@ -43,5 +43,19 @@ export default defineConfig({
     // It can be overridden via the CYPRESS_BASE_URL environment variable
     // (By default we set this to a value which should work in most development environments)
     baseUrl: 'http://localhost:4000',
+    excludeSpecPattern: [
+      'cypress/e2e/collection-create.cy.ts',
+      'cypress/e2e/collection-edit.cy.ts',
+      'cypress/e2e/collection-statistics.cy.ts',
+      'cypress/e2e/community-edit.cy.ts',
+      'cypress/e2e/community-statistics.cy.ts',
+      'cypress/e2e/homepage.cy.ts',
+      'cypress/e2e/item-edit.cy.ts',
+      'cypress/e2e/item-template.cy.ts',
+      'cypress/e2e/login-modal.cy.ts',
+      'cypress/e2e/search-navbar.cy.ts',
+      'cypress/e2e/search-page.cy.ts',
+    ]
   },
+  defaultCommandTimeout: 10000,
 });

cypress/support/e2e.ts

@@ -57,7 +57,7 @@ before(() => {
 beforeEach(() => {
     // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
     // This just ensures it doesn't get in the way of matching other objects in the page.
-    cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true%2C%22plumX%22:true%2C%22altmetric%22:true%2C%22dimensions%22:true}');
 
     // Remove any CSRF cookies saved from prior tests
     cy.clearCookie(DSPACE_XSRF_COOKIE);

src/app/app-routing.module.ts

@@ -18,7 +18,7 @@ import {
   HEALTH_PAGE_PATH,
   INFO_MODULE_PATH,
   INTERNAL_SERVER_ERROR,
-  LEGACY_BITSTREAM_MODULE_PATH,
+  LEGACY_BITSTREAM_MODULE_PATH, PAGE_NOT_FOUND_PATH,
   PROFILE_MODULE_PATH,
   REGISTER_PATH,
   REQUEST_COPY_MODULE_PATH,
@@ -55,8 +55,8 @@ import {
 @NgModule({
   imports: [
     RouterModule.forRoot([
-      { path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
-      { path: ERROR_PAGE , component: ThemedPageErrorComponent },
+      { path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent, data: { title: INTERNAL_SERVER_ERROR } },
+      { path: ERROR_PAGE , component: ThemedPageErrorComponent, data: { title: ERROR_PAGE}  },
       {
         path: '',
         canActivate: [AuthBlockingGuard],
@@ -68,7 +68,10 @@ import {
             path: 'reload/:rnd',
             component: ThemedPageNotFoundComponent,
             pathMatch: 'full',
-            canActivate: [ReloadGuard]
+            canActivate: [ReloadGuard],
+            data: {
+              title: PAGE_NOT_FOUND_PATH
+            }
           },
           {
             path: 'home',
@@ -275,7 +278,10 @@ import {
           },
           {
             path: FORBIDDEN_PATH,
-            component: ThemedForbiddenComponent
+            component: ThemedForbiddenComponent,
+            data: {
+              title: FORBIDDEN_PATH
+            }
           },
           {
             path: STATISTICS_PAGE_PATH,
@@ -314,7 +320,7 @@ import {
             loadChildren: () => import('./invitation/invitation.module')
               .then((m) => m.InvitationModule)
           },
-          { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent, canActivate: [RedirectService] },
+          { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent, canActivate: [RedirectService], data: { title: PAGE_NOT_FOUND_PATH }  },
         ]
       }
     ], {

src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html

@@ -1,6 +1,6 @@
 <div class="container">
   <div class="d-flex justify-content-between">
-    <h1 class="h3">{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h1>
+    <h1 class="h3">{{'bitstream.download.page' | translate:{ bitstream: (fileName$ | async) } }}</h1>
     <div class="pt-3">
       <button *ngIf="hasHistory" (click)="back()" class="btn btn-outline-secondary">
         <i class="fas fa-arrow-left"></i> {{'bitstream.download.page.back' | translate}}

src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts

@@ -8,7 +8,6 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { ActivatedRoute, Router } from '@angular/router';
-import { getForbiddenRoute } from '../../app-routing-paths';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
 import { SignpostingDataService } from '../../core/data/signposting-data.service';
@@ -123,72 +122,4 @@ describe('BitstreamDownloadPageComponent', () => {
       expect(component).toBeTruthy();
     });
   });
-
-  describe('bitstream retrieval', () => {
-    describe('when the user is authorized and not logged in', () => {
-      beforeEach(waitForAsync(() => {
-        init();
-        (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false));
-
-        initTestbed();
-      }));
-      beforeEach(() => {
-        fixture = TestBed.createComponent(BitstreamDownloadPageComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-      });
-      it('should redirect to the content link', () => {
-        expect(hardRedirectService.redirect).toHaveBeenCalledWith('bitstream-content-link');
-      });
-      it('should add the signposting links', () => {
-        expect(serverResponseService.setHeader).toHaveBeenCalled();
-      });
-    });
-    describe('when the user is authorized and logged in', () => {
-      beforeEach(waitForAsync(() => {
-        init();
-        initTestbed();
-      }));
-      beforeEach(() => {
-        fixture = TestBed.createComponent(BitstreamDownloadPageComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-      });
-      it('should redirect to an updated content link', () => {
-        expect(hardRedirectService.redirect).toHaveBeenCalledWith('content-url-with-headers');
-      });
-    });
-    describe('when the user is not authorized and logged in', () => {
-      beforeEach(waitForAsync(() => {
-        init();
-        (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
-        initTestbed();
-      }));
-      beforeEach(() => {
-        fixture = TestBed.createComponent(BitstreamDownloadPageComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-      });
-      it('should navigate to the forbidden route', () => {
-        expect(router.navigateByUrl).toHaveBeenCalledWith(getForbiddenRoute(), { skipLocationChange: true });
-      });
-    });
-    describe('when the user is not authorized and not logged in', () => {
-      beforeEach(waitForAsync(() => {
-        init();
-        (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false));
-        (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
-        initTestbed();
-      }));
-      beforeEach(() => {
-        fixture = TestBed.createComponent(BitstreamDownloadPageComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-      });
-      it('should navigate to the login page', () => {
-        expect(authService.setRedirectUrl).toHaveBeenCalled();
-        expect(router.navigateByUrl).toHaveBeenCalledWith('login');
-      });
-    });
-  });
 });

src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts

@@ -1,18 +1,15 @@
 import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core';
-import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
+import { map, startWith, take } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { isNotEmpty } from '../../shared/empty.util';
 import { getRemoteDataPayload } from '../../core/shared/operators';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { AuthService } from '../../core/auth/auth.service';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import { Observable } from 'rxjs';
 import { FileService } from '../../core/shared/file.service';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
-import { getForbiddenRoute } from '../../app-routing-paths';
 import { RemoteData } from '../../core/data/remote-data';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { isPlatformServer, Location } from '@angular/common';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { SignpostingDataService } from '../../core/data/signposting-data.service';
@@ -62,52 +59,18 @@ export class BitstreamDownloadPageComponent implements OnInit {
   }
 
   ngOnInit(): void {
-
     this.bitstreamRD$ = this.route.data.pipe(
-      map((data) => data.bitstream));
+      map((data) => data.bitstream)
+    );
 
     this.bitstream$ = this.bitstreamRD$.pipe(
-      redirectOn4xx(this.router, this.auth),
       getRemoteDataPayload()
     );
 
     this.fileName$ = this.bitstream$.pipe(
       map((bitstream: Bitstream) => this.dsoNameService.getName(bitstream)),
-      startWith('file'),
+      startWith('file')
     );
-
-    this.bitstream$.pipe(
-      switchMap((bitstream: Bitstream) => {
-        const isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self : undefined);
-        const isLoggedIn$ = this.auth.isAuthenticated();
-        return observableCombineLatest([isAuthorized$, isLoggedIn$, observableOf(bitstream)]);
-      }),
-      filter(([isAuthorized, isLoggedIn, bitstream]: [boolean, boolean, Bitstream]) => hasValue(isAuthorized) && hasValue(isLoggedIn)),
-      take(1),
-      switchMap(([isAuthorized, isLoggedIn, bitstream]: [boolean, boolean, Bitstream]) => {
-        if (isAuthorized && isLoggedIn) {
-          return this.fileService.retrieveFileDownloadLink(bitstream._links.content.href).pipe(
-            filter((fileLink) => hasValue(fileLink)),
-            take(1),
-            map((fileLink) => {
-              return [isAuthorized, isLoggedIn, bitstream, fileLink];
-            }));
-        } else {
-          return [[isAuthorized, isLoggedIn, bitstream, '']];
-        }
-      })
-    ).subscribe(([isAuthorized, isLoggedIn, bitstream, fileLink]: [boolean, boolean, Bitstream, string]) => {
-      if (isAuthorized && isLoggedIn && isNotEmpty(fileLink)) {
-        this.hardRedirectService.redirect(fileLink);
-      } else if (isAuthorized && !isLoggedIn) {
-        this.hardRedirectService.redirect(bitstream._links.content.href);
-      } else if (!isAuthorized && isLoggedIn) {
-        this.router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
-      } else if (!isAuthorized && !isLoggedIn) {
-        this.auth.setRedirectUrl(this.router.url);
-        this.router.navigateByUrl('login');
-      }
-    });
   }
 
   /**
@@ -124,7 +87,6 @@ export class BitstreamDownloadPageComponent implements OnInit {
           signpostingLinks.forEach((link: SignpostingLink) => {
             links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ');
           });
-
           this.responseService.setHeader('Link', links);
         });
       });