Merged in task/dspace-cris-2024_02_x/DSC-2764 (pull request DSpace#4332)

Task/dspace cris 2024 02 x/DSC-2764

Approved-by: Andrea Barbasso

Author: Mattia Vianelli

src/app/lucky-search/search/lucky-search.component.spec.ts

@@ -14,6 +14,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { APP_CONFIG } from '../../../config/app-config.interface';
 import { getBitstreamDownloadRoute } from '../../app-routing-paths';
 import {
   SortDirection,
@@ -131,6 +132,7 @@ describe('LuckySearchComponent', () => {
         { provide: HardRedirectService, useValue: hardRedirectService },
         { provide: PLATFORM_ID, useValue: 'browser' },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: APP_CONFIG, useValue: {} },
       ],
     }).overrideComponent(LuckySearchComponent, {
       remove: {
@@ -355,4 +357,57 @@ describe('LuckySearchComponent', () => {
     });
 
   });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(LuckySearchComponent);
+      component = fixture.componentInstance;
+    });
+
+    it('should return default code when no specific identifier is found', () => {
+      // @ts-ignore: Accessing private method for testing
+      component.appConfig = {
+        luckySearchRedirects: {
+          default: 301,
+        },
+      } as any;
+      // @ts-ignore: Accessing private method for testing
+      component.currentFilter = { identifier: 'unknown' };
+
+      // @ts-ignore: Accessing private method for testing
+      const result = component.getRedirectCode();
+
+      expect(result).toBe(301);
+    });
+
+    it('should return 302 when default is not set and identifier is not found', () => {
+      // @ts-ignore: Accessing private method for testing
+      component.appConfig = {
+        luckySearchRedirects: {},
+      } as any;
+      // @ts-ignore: Accessing private method for testing
+      component.currentFilter = { identifier: 'unknown' };
+
+      // @ts-ignore: Accessing private method for testing
+      const result = component.getRedirectCode();
+      expect(result).toBe(302);
+    });
+
+    it('should return specific code for known identifier', () => {
+      // @ts-ignore: Accessing private method for testing
+      component.appConfig = {
+        luckySearchRedirects: {
+          default: 302,
+          'legacy-id': 301,
+        },
+      };
+      // @ts-ignore: Accessing private method for testing
+      component.currentFilter = { identifier: 'legacy-id' };
+
+      // @ts-ignore: Accessing private method for testing
+      const result = component.getRedirectCode();
+      expect(result).toBe(301);
+    });
+
+  });
 });

src/app/lucky-search/search/lucky-search.component.ts

@@ -32,6 +32,10 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { getBitstreamDownloadRoute } from '../../app-routing-paths';
 import {
   BitstreamDataService,
@@ -132,6 +136,7 @@ export class LuckySearchComponent implements OnInit {
     private hardRedirectService: HardRedirectService,
     private notificationService: NotificationsService,
     private translateService: TranslateService,
+    @Inject(APP_CONFIG) private appConfig: AppConfig,
   ) {}
 
   ngOnInit(): void {
@@ -241,12 +246,21 @@ export class LuckySearchComponent implements OnInit {
 
   public redirect(url: string): void {
     if (isPlatformServer(this.platformId)) {
-      this.hardRedirectService.redirect(url, 302);
+      this.hardRedirectService.redirect(url, this.getRedirectCode());
     } else {
       this.router.navigateByUrl(url, { replaceUrl: true });
     }
   }
 
+  private getRedirectCode(): number {
+    let code: number = this.appConfig?.luckySearchRedirects?.default || 302;
+    if (Object.keys(this.appConfig?.luckySearchRedirects).includes(this.currentFilter.identifier)) {
+      code = this.appConfig.luckySearchRedirects[this.currentFilter.identifier];
+    }
+
+    return code;
+  }
+
   private parseBitstreamFilters(queryParams: Params): MetadataFilter[] {
     const metadataName = queryParams?.bitstreamMetadata;
     const metadataValue = queryParams?.bitstreamValue;

src/config/app-config.interface.ts

@@ -37,6 +37,7 @@ import {
   LayoutConfig,
 } from './layout-config.interfaces';
 import { LoaderConfig } from './loader-config.interfaces';
+import { LuckySearchRedirectConfig } from './lucky-search-redirect-config';
 import { MarkdownConfig } from './markdown-config.interface';
 import { MatomoConfig } from './matomo-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
@@ -108,6 +109,8 @@ interface AppConfig extends Config {
   identifierSubtypes: IdentifierSubtypesConfig[];
   datadogRum?: DatadogRumConfig;
   matomo?: MatomoConfig;
+  permanentRedirectPaths?: string[];
+  luckySearchRedirects?: LuckySearchRedirectConfig;
 }
 
 /**

src/config/default-app-config.ts

@@ -37,6 +37,7 @@ import {
   SuggestionConfig,
 } from './layout-config.interfaces';
 import { LoaderConfig } from './loader-config.interfaces';
+import { LuckySearchRedirectConfig } from './lucky-search-redirect-config';
 import { MarkdownConfig } from './markdown-config.interface';
 import { MatomoConfig } from './matomo-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
@@ -1026,4 +1027,9 @@ export class DefaultAppConfig implements AppConfig {
   };
 
   matomo: MatomoConfig = {};
+
+  luckySearchRedirects: LuckySearchRedirectConfig = {
+    'legacy-id': 301,
+    default: 302,
+  };
 }

src/config/lucky-search-redirect-config.ts

@@ -0,0 +1,6 @@
+import { Config } from './config.interface';
+
+export interface LuckySearchRedirectConfig extends Config {
+  [indexName: string]: number;
+  default: number;
+}