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

Task/dspace cris 2023 02 x/DSC-2764

Approved-by: Andrea Barbasso

Author: Mattia Vianelli

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

@@ -25,6 +25,7 @@ import {getBitstreamDownloadRoute} from '../../app-routing-paths';
 import {PLATFORM_ID} from '@angular/core';
 import {NotificationsService} from '../../shared/notifications/notifications.service';
 import {NotificationsServiceStub} from '../../shared/testing/notifications-service.stub';
+import {APP_CONFIG} from '../../../config/app-config.interface';
 
 describe('LuckySearchComponent', () => {
   let fixture: ComponentFixture<LuckySearchComponent>;
@@ -101,6 +102,7 @@ describe('LuckySearchComponent', () => {
         {provide: HardRedirectService, useValue: hardRedirectService},
         {provide: PLATFORM_ID, useValue: 'browser'},
         {provide: NotificationsService, useValue: new NotificationsServiceStub()},
+        {provide: APP_CONFIG, useValue: {}},
       ],
     })
       .compileComponents();
@@ -288,30 +290,83 @@ describe('LuckySearchComponent', () => {
       component = fixture.componentInstance;
     });
 
-  it('should not redirect when no bitstreams are found', () => {
-    const item = Object.assign(new Item(), {uuid: 'item-uuid-1', name: 'Test item 1'});
-    const data = createSuccessfulRemoteDataObject(createPaginatedList([
-      {indexableObject: item, hitHighlights: {}}
-    ])) as any;
-    component.resultsRD$.next(data);
-    component.bitstreamFilters$.next([{metadataName: 'dc.title', metadataValue: 'Non-existent bitstream'}]);
-    bitstreamDataService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])));
-    spyOn(component, 'redirect');
-    fixture.detectChanges();
-    expect(component.redirect).not.toHaveBeenCalled();
-  });
+    it('should not redirect when no bitstreams are found', () => {
+      const item = Object.assign(new Item(), {uuid: 'item-uuid-1', name: 'Test item 1'});
+      const data = createSuccessfulRemoteDataObject(createPaginatedList([
+        {indexableObject: item, hitHighlights: {}}
+      ])) as any;
+      component.resultsRD$.next(data);
+      component.bitstreamFilters$.next([{metadataName: 'dc.title', metadataValue: 'Non-existent bitstream'}]);
+      bitstreamDataService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])));
+      spyOn(component, 'redirect');
+      fixture.detectChanges();
+      expect(component.redirect).not.toHaveBeenCalled();
+    });
 
-  it('should update showEmptySearchSection$ when no results are found', () => {
+    it('should update showEmptySearchSection$ when no results are found', () => {
       fixture.detectChanges();
-    const emptyResults = createSuccessfulRemoteDataObject(createPaginatedList([]));
+      const emptyResults = createSuccessfulRemoteDataObject(createPaginatedList([]));
 
-    spyOn(component as any, 'getLuckySearchResults').and.returnValue(observableOf(emptyResults));
-    spyOn(component as any, 'processSearchResults').and.returnValue(observableOf(emptyResults));
+      spyOn(component as any, 'getLuckySearchResults').and.returnValue(observableOf(emptyResults));
+      spyOn(component as any, 'processSearchResults').and.returnValue(observableOf(emptyResults));
 
-    component.getSearchResults();
+      component.getSearchResults();
+
+      expect(component.showEmptySearchSection$.getValue()).toBe(true);
+    });
 
-    expect(component.showEmptySearchSection$.getValue()).toBe(true);
   });
 
+  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

@@ -25,6 +25,7 @@ import {HardRedirectService} from '../../core/services/hard-redirect.service';
 import {isPlatformServer} from '@angular/common';
 import {NotificationsService} from '../../shared/notifications/notifications.service';
 import {TranslateService} from '@ngx-translate/core';
+import {APP_CONFIG, AppConfig} from '../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-lucky-search',
@@ -77,6 +78,7 @@ export class LuckySearchComponent implements OnInit {
     private hardRedirectService: HardRedirectService,
     private notificationService: NotificationsService,
     private translateService: TranslateService,
+    @Inject(APP_CONFIG) private appConfig: AppConfig,
   ) {}
 
   ngOnInit(): void {
@@ -186,12 +188,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

@@ -39,6 +39,7 @@ import { MetaTagsConfig } from './meta-tags.config';
 import { MetadataLinkViewPopoverDataConfig } from './metadata-link-view-popoverdata-config.interface';
 import { IdentifierSubtypesConfig } from './identifier-subtypes-config.interface';
 import { DatadogRumConfig } from './datadog-rum-config.interfaces';
+import {LuckySearchRedirectConfig} from './lucky-search-redirect-config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -86,6 +87,9 @@ interface AppConfig extends Config {
   metadataLinkViewPopoverData: MetadataLinkViewPopoverDataConfig;
   identifierSubtypes: IdentifierSubtypesConfig[];
   datadogRum?: DatadogRumConfig;
+  permanentRedirectPaths?: string[];
+  luckySearchRedirects?: LuckySearchRedirectConfig;
+
 }
 
 /**

src/config/default-app-config.ts

@@ -42,6 +42,7 @@ import { MetaTagsConfig } from './meta-tags.config';
 import { MetadataLinkViewPopoverDataConfig } from './metadata-link-view-popoverdata-config.interface';
 import { IdentifierSubtypesConfig, IdentifierSubtypesIconPositionEnum } from './identifier-subtypes-config.interface';
 import { DatadogRumConfig } from './datadog-rum-config.interfaces';
+import {LuckySearchRedirectConfig} from './lucky-search-redirect-config';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -885,4 +886,9 @@ export class DefaultAppConfig implements AppConfig {
     trackLongTasks: true,
     defaultPrivacyLevel: 'mask-user-input',
   };
+
+  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;
+}