Merged dspace-cris-2024_02_x into task/dspace-cris-2024_02_x/DSC-1956

Author: FrancescoMolinaro

bitbucket-pipelines.yml

@@ -62,7 +62,7 @@ definitions:
     - step: &angular-build
         name: angular-build
         image:
-          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
+          name: cypress/browsers:node-22.21.0-chrome-141.0.7390.107-1-ff-144.0-edge-141.0.3537.92-1
           run-as-user: 1000
         size: 4x
         caches:
@@ -78,7 +78,7 @@ definitions:
     - step: &unittest-code-checks
         name: test-code-checks
         image:
-          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
+          name: cypress/browsers:node-22.21.0-chrome-141.0.7390.107-1-ff-144.0-edge-141.0.3537.92-1
           run-as-user: 1000
         size: 4x
         caches:
@@ -96,7 +96,7 @@ definitions:
     - step: &run-e2e-tests
         name: Run E2E test
         image:
-          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
+          name: cypress/browsers:node-22.21.0-chrome-141.0.7390.107-1-ff-144.0-edge-141.0.3537.92-1
           run-as-user: 0
         size: 4x
         services:

package.json

@@ -115,7 +115,6 @@
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
-    "domino-ext": "^2.1.4",
     "ejs": "^3.1.10",
     "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",

server.ts

@@ -24,7 +24,6 @@ import * as express from 'express';
 import * as ejs from 'ejs';
 import * as compression from 'compression';
 import * as expressStaticGzip from 'express-static-gzip';
-import * as domino from 'domino-ext';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
@@ -85,20 +84,10 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
-// Create a DOM window object based on the template
-const _window = domino.createWindow(indexHtml);
-
 // The REST server base URL
 const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
 
 const IIIF_ALLOWED_ORIGINS = environment.rest.allowedOrigins || [];
-
-// Assign the DOM window and document objects to the global object
-(_window as any).screen = { deviceXDPI: 0, logicalXDPI: 0 };
-(global as any).window = _window;
-(global as any).document = _window.document;
-(global as any).navigator = _window.navigator;
-
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 

src/app/app.component.ts

@@ -10,6 +10,7 @@ import {
   Component,
   HostListener,
   Inject,
+  OnDestroy,
   OnInit,
   PLATFORM_ID,
 } from '@angular/core';
@@ -31,13 +32,15 @@ import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
   Observable,
+  Subject,
 } from 'rxjs';
 import {
   delay,
   distinctUntilChanged,
   map,
   switchMap,
   take,
+  takeUntil,
   withLatestFrom,
 } from 'rxjs/operators';
 
@@ -78,10 +81,15 @@ import { SocialService } from './social/social.service';
     SocialComponent,
   ],
 })
-export class AppComponent implements OnInit, AfterViewInit {
+export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
   notificationOptions;
   models;
 
+  /**
+   * Subject to signal component destruction and clean up subscriptions
+   */
+  private destroy$: Subject<void> = new Subject<void>();
+
   /**
    * Whether or not the authentication is currently blocking the UI
    */
@@ -172,6 +180,7 @@ export class AppComponent implements OnInit, AfterViewInit {
         take(1),
         map((currentUrl) => [currentUrl, event]),
       )),
+      takeUntil(this.destroy$),
     ).subscribe(([currentUrl, event]: [string, any]) => {
       if (event instanceof NavigationStart) {
         const nextUrl = event.url;
@@ -188,6 +197,11 @@ export class AppComponent implements OnInit, AfterViewInit {
     });
   }
 
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
   @HostListener('window:resize', ['$event'])
   public onResize(event): void {
     this.dispatchWindowSize(event.target.innerWidth, event.target.innerHeight);
@@ -202,7 +216,10 @@ export class AppComponent implements OnInit, AfterViewInit {
   private trackIdleModal() {
     const isIdle$ = this.authService.isUserIdle();
     const isAuthenticated$ = this.authService.isAuthenticated();
-    isIdle$.pipe(withLatestFrom(isAuthenticated$))
+    isIdle$.pipe(
+      withLatestFrom(isAuthenticated$),
+      takeUntil(this.destroy$),
+    )
       .subscribe(([userIdle, authenticated]) => {
         if (userIdle && authenticated) {
           if (!this.idleModalOpen) {

src/app/app.metareducers.spec.ts

@@ -0,0 +1,64 @@
+import { universalMetaReducer } from './app.metareducers';
+import { StoreActionTypes } from './store.actions';
+
+describe('universalMetaReducer', () => {
+  const mockReducer = (state: any, action: any) => state;
+
+  it('should pass state through for unknown action', () => {
+    const state = { core: { route: { queryParams: { a: '1' }, params: {} } } };
+    const result = universalMetaReducer(mockReducer)(state, { type: 'UNKNOWN' });
+    expect(result).toEqual(state);
+  });
+
+  describe('REHYDRATE', () => {
+    it('should merge payload into state', () => {
+      const state = { otherProp: 'keep-me' };
+      const payload = { core: { route: { queryParams: { f: ['x'] }, params: {} } } };
+      const result = universalMetaReducer(mockReducer)(state, {
+        type: StoreActionTypes.REHYDRATE,
+        payload,
+      });
+      expect(result.otherProp).toBe('keep-me');
+      expect(result.core.route).toEqual({ queryParams: {}, params: {} });
+    });
+
+    it('should reset core.route to empty after rehydration', () => {
+      const state = { core: { route: { queryParams: { f: ['x'] }, params: { id: '123' } } } };
+      const payload = { core: { route: { queryParams: { stale: ['val'] }, params: { stale: 'val' } } } };
+      const result = universalMetaReducer(mockReducer)(state, {
+        type: StoreActionTypes.REHYDRATE,
+        payload,
+      });
+      expect(result.core.route).toEqual({ queryParams: {}, params: {} });
+    });
+
+    it('should not crash when state.core is undefined', () => {
+      const state = {};
+      const payload = { core: { route: { queryParams: { a: '1' }, params: {} } } };
+      const result = universalMetaReducer(mockReducer)(state, {
+        type: StoreActionTypes.REHYDRATE,
+        payload,
+      });
+      expect(result.core.route).toEqual({ queryParams: {}, params: {} });
+    });
+
+    it('should preserve other core properties when resetting route', () => {
+      const state = { core: { route: {} } };
+      const payload = { core: { route: { queryParams: { x: '1' }, params: {} }, otherProp: 'keep-me' } };
+      const result = universalMetaReducer(mockReducer)(state, {
+        type: StoreActionTypes.REHYDRATE,
+        payload,
+      });
+      expect(result.core.otherProp).toBe('keep-me');
+      expect(result.core.route).toEqual({ queryParams: {}, params: {} });
+    });
+
+    it('should handle REPLAY action (no-op)', () => {
+      const state = { core: { route: { queryParams: { a: '1' }, params: {} } } };
+      const result = universalMetaReducer(mockReducer)(state, {
+        type: StoreActionTypes.REPLAY,
+      });
+      expect(result).toEqual(state);
+    });
+  });
+});

src/app/app.metareducers.ts

@@ -19,6 +19,11 @@ export function universalMetaReducer(reducer) {
     switch (action.type) {
       case StoreActionTypes.REHYDRATE:
         state = Object.assign({}, state, action.payload);
+        if (state.core) {
+          state.core = Object.assign({}, state.core, {
+            route: { queryParams: {}, params: {} },
+          });
+        }
         break;
       case StoreActionTypes.REPLAY:
       default:

src/app/core/auth/auth.actions.ts

@@ -35,6 +35,7 @@ export const AuthActionTypes = {
   LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'),
   LOG_OUT_SUCCESS: type('dspace/auth/LOG_OUT_SUCCESS'),
   SET_REDIRECT_URL: type('dspace/auth/SET_REDIRECT_URL'),
+  SET_REDIRECT_URL_AND_NAVIGATE: type('dspace/auth/SET_REDIRECT_URL_AND_NAVIGATE'),
   RETRIEVE_AUTHENTICATED_EPERSON: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON'),
   RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS'),
   RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'),
@@ -360,6 +361,23 @@ export class SetRedirectUrlAction implements Action {
   }
 }
 
+/**
+ * Change the redirect url.
+ * @class SetRedirectUrlAction
+ * @implements {Action}
+ */
+export class SetRedirectUrlAndNavigateAction implements Action {
+  public type: string = AuthActionTypes.SET_REDIRECT_URL_AND_NAVIGATE;
+  payload: {
+    redirectUrl: string;
+    navigateUrl: string;
+  };
+
+  constructor(redirectUrl: string, navigateUrl: string) {
+    this.payload = { redirectUrl, navigateUrl };
+  }
+}
+
 /**
  * Start loading for a hard redirect
  * @class StartHardRedirectLoadingAction

src/app/core/auth/auth.effects.ts

@@ -79,6 +79,7 @@ import {
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
   RetrieveTokenAction,
+  SetRedirectUrlAndNavigateAction,
   SetUserAsIdleAction,
 } from './auth.actions';
 // import services
@@ -164,6 +165,13 @@ export class AuthEffects {
     }),
   ), { dispatch: false });
 
+  public redirectAndNavigate$: Observable<Action> = createEffect(() => this.actions$
+    .pipe(ofType(AuthActionTypes.SET_REDIRECT_URL_AND_NAVIGATE),
+      tap((action: SetRedirectUrlAndNavigateAction) => this.router.navigate([decodeURIComponent(action.payload.navigateUrl)])),
+    ),
+  { dispatch: false },
+  );
+
   // It means "reacts to this action but don't send another"
   public authenticatedError$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATED_ERROR),

src/app/core/auth/auth.reducer.ts

@@ -17,6 +17,7 @@ import {
   RetrieveAuthMethodsSuccessAction,
   SetAuthCookieStatus,
   SetRedirectUrlAction,
+  SetRedirectUrlAndNavigateAction,
 } from './auth.actions';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
@@ -267,6 +268,11 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         redirectUrl: (action as SetRedirectUrlAction).payload,
       });
 
+    case AuthActionTypes.SET_REDIRECT_URL_AND_NAVIGATE:
+      return Object.assign({}, state, {
+        redirectUrl: (action as SetRedirectUrlAndNavigateAction).payload.redirectUrl,
+      });
+
     case AuthActionTypes.REDIRECT_AFTER_LOGIN_SUCCESS:
       return Object.assign({}, state, {
         loading: true,

src/app/core/auth/auth.service.ts

@@ -64,6 +64,7 @@ import {
   ResetAuthenticationMessagesAction,
   SetAuthCookieStatus,
   SetRedirectUrlAction,
+  SetRedirectUrlAndNavigateAction,
   SetUserAsIdleAction,
   UnsetUserAsIdleAction,
 } from './auth.actions';
@@ -556,15 +557,19 @@ export class AuthService {
   /**
    * Set redirect url
    */
-  setRedirectUrl(url: string) {
+  setRedirectUrl(redirectUrl: string, navigateUrl?: string) {
     // Add 1 hour to the current date
     const expireDate = Date.now() + (1000 * 60 * 60);
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = { expires: expires };
-    this.storage.set(REDIRECT_COOKIE, url, options);
-    this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : ''));
+    const options: Cookies.CookieAttributes = { expires: expires };
+    this.storage.set(REDIRECT_COOKIE, redirectUrl, options);
+    if (hasValue(navigateUrl)) {
+      this.store.dispatch(new SetRedirectUrlAndNavigateAction(isNotUndefined(redirectUrl) ? redirectUrl : '', navigateUrl));
+    } else {
+      this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(redirectUrl) ? redirectUrl : ''));
+    }
   }
 
   /**