Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-2599

Author: FrancescoMolinaro

cypress/e2e/my-dspace.cy.ts

@@ -119,7 +119,7 @@ describe('My DSpace page', () => {
         // Open the New Import dropdown
         cy.get('button[data-test="import-dropdown"]').click();
         // Click on the "Item" type in that dropdown
-        cy.get('#importControlsDropdownMenu button[title="Equipment"]').click();
+    cy.get('#importControlsDropdownMenu button[title="Funding"]').click();
 
         // New URL should include /import-external, as we've moved to the import page
         cy.url().should('include', '/import-external');

cypress/support/e2e.ts

@@ -51,6 +51,13 @@ before(() => {
     cy.task('saveRestBaseDomain', baseDomain);
 
   });
+
+  // We might receive uncaught exceptions from external libraries (e.g. it happened before with a broken
+  // version of the addToAny plugin). These should not cause our tests to fail, so we catch them here.
+  Cypress.on('uncaught:exception', (err, runnable) => {
+    // returning false here prevents Cypress from failing the test
+    return false;
+  });
 });
 
 // Runs once before the first test in each "block"

server.ts

@@ -274,6 +274,11 @@ export function app() {
    */
   server.get('/app/client/health', clientHealthCheck);
 
+  /**
+   * Redirecting old manifest
+   */
+  server.get('/json/iiif/**/manifest', redirectManifest);
+
   /**
    * Default sending all incoming requests to ngApp() function, after first checking for a cached
    * copy of the page (see cacheCheck())
@@ -704,6 +709,39 @@ function healthCheck(req, res) {
     });
 }
 
+/*
+ * The callback function to redirect old manifest
+ */
+function redirectManifest(req, res) {
+  console.info('Redirecting old manifest');
+  const url = req.url;
+  const regex = /json\/iiif\/([^\/]+\/[^\/]+)(?:\/([^\/]+))?\/manifest/;
+  const match = url.match(regex);
+  let handle;
+  let id;
+
+  if (match) {
+    handle = match[1];
+    const baseUrl = `${environment.rest.baseUrl}/api/pid/find?id=${handle}`;
+    axios.get(baseUrl)
+      .then((response) => {
+        if (response.status === 200) {
+          const newUrl = `${environment.rest.baseUrl}/iiif/${response.data.id}/manifest`;
+          console.info('Manifest found, redirect to ', newUrl);
+          res.redirect(newUrl);
+        }
+      })
+      .catch((error) => {
+        res.status(error.response.status).send({
+          error: error.message
+        });
+      });
+  } else {
+    res.status(422).send({
+      error: 'Wrong handle'
+    });
+  }
+}
 
 // Webpack will replace 'require' with '__webpack_require__'
 // '__non_webpack_require__' is a proxy to Node 'require'

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts

@@ -42,7 +42,7 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
   }
 
   ngOnInit(): void {
-    this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link);
+    this.isDisabled = this.itemModel?.disabled || (isEmpty(this.itemModel?.link) && isEmpty(this.itemModel?.href));
     super.ngOnInit();
   }
 

src/app/breadcrumbs/breadcrumbs.component.html

@@ -14,7 +14,7 @@
     </ng-template>
 
     <ng-template #activeBreadcrumb let-text="text">
-        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><span class="text-truncate" [innerHTML]="text | translate"></span></div></li>
+        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><span class="text-truncate" [innerHTML]="text | translate | dsEscapeHtml"></span></div></li>
     </ng-template>
 </ng-container>
 

src/app/breadcrumbs/breadcrumbs.component.spec.ts

@@ -10,6 +10,7 @@ import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of as observableOf } from 'rxjs';
 import { DebugElement } from '@angular/core';
+import {EscapeHtmlPipe} from '../shared/utils/escape-html.pipe';
 
 describe('BreadcrumbsComponent', () => {
   let component: BreadcrumbsComponent;
@@ -43,6 +44,7 @@ describe('BreadcrumbsComponent', () => {
       declarations: [
         BreadcrumbsComponent,
         VarDirective,
+        EscapeHtmlPipe
       ],
       imports: [
         RouterTestingModule.withRoutes([]),

src/app/core/locale/locale.service.spec.ts

@@ -11,6 +11,7 @@ import { NativeWindowRef } from '../services/window.service';
 import { RouteService } from '../services/route.service';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
 import { of as observableOf } from 'rxjs';
+import { PLATFORM_ID } from '@angular/core';
 
 describe('LocaleService test suite', () => {
   let service: LocaleService;
@@ -24,6 +25,7 @@ describe('LocaleService test suite', () => {
   let routeService;
   let document;
   let spyOnGetLanguage;
+  const platformId = 'browser';
 
 
   const translateServiceStub: any = {
@@ -62,6 +64,7 @@ describe('LocaleService test suite', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: TranslateService, useValue: translateServiceStub },
           { provide: Document, useValue: document },
+          { provide: PLATFORM_ID, useValue: platformId },
         ]
       });
     }));
@@ -72,7 +75,7 @@ describe('LocaleService test suite', () => {
       routeService = TestBed.inject(RouteService);
       window = new NativeWindowRef();
       document = { documentElement: { lang: 'en' } };
-      service = new LocaleService(window, cookieService, translateService, authService, routeService, document);
+      service = new LocaleService(window, cookieService, translateService, authService, routeService, document, platformId);
       serviceAsAny = service;
       spyOnGet = spyOn(cookieService, 'get');
       spyOnSet = spyOn(cookieService, 'set');

src/app/core/locale/locale.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
 
 import { TranslateService } from '@ngx-translate/core';
 
@@ -10,7 +10,7 @@ import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
 import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 import { RouteService } from '../services/route.service';
-import { DOCUMENT } from '@angular/common';
+import { DOCUMENT, isPlatformBrowser } from '@angular/common';
 import { LangConfig } from '../../../config/lang-config.interface';
 
 export const LANG_COOKIE = 'dsLanguage';
@@ -41,7 +41,8 @@ export class LocaleService {
     protected translate: TranslateService,
     protected authService: AuthService,
     protected routeService: RouteService,
-    @Inject(DOCUMENT) protected document: any
+    @Inject(DOCUMENT) protected document: any,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
     this.initDefaults();
   }
@@ -53,7 +54,9 @@ export class LocaleService {
     this.routeService.getQueryParameterValue('lang').subscribe(lang => {
       if (lang && this.translate.getLangs().includes(lang)) {
         this.setCurrentLanguageCode(lang);
-        this.routeService.removeQueryParam('lang');
+        if (isPlatformBrowser(this.platformId)) {
+          this.routeService.removeQueryParam('lang');
+        }
       }
     });
   }

src/app/core/locale/server-locale.service.ts

@@ -1,5 +1,5 @@
 import { LANG_ORIGIN, LocaleService } from './locale.service';
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
@@ -21,9 +21,10 @@ export class ServerLocaleService extends LocaleService {
     protected translate: TranslateService,
     protected authService: AuthService,
     protected routeService: RouteService,
-    @Inject(DOCUMENT) protected document: any
+    @Inject(DOCUMENT) protected document: any,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
-    super(_window, cookie, translate, authService, routeService, document);
+    super(_window, cookie, translate, authService, routeService, document, platformId);
   }
 
   /**

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longtext/longtext.component.html

@@ -2,7 +2,7 @@
    <div class="{{field.styleValue}}">
     <ds-truncatable [id]="truncableId">
       <ds-truncatable-part [id]="truncableId" [minLines]="3">
-        <span [innerHTML]="formatText(metadataValue.value)" data-test="formatted-text"></span>
+        <span [innerHTML]="metadataValue.value | dsEscapeHtml" data-test="formatted-text"></span>
       </ds-truncatable-part>
     </ds-truncatable>
   </div>