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

Author: Micheleboychuk

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"

…/models/sherpa-policies-details.model.ts …ion/models/opf-policies-details.model.tssrc/app/core/submission/models/sherpa-policies-details.model.ts renamed to src/app/core/submission/models/opf-policies-details.model.ts src/app/core/submission/models/sherpa-policies-details.model.ts renamed to src/app/core/submission/models/opf-policies-details.model.ts

@@ -1,25 +1,25 @@
 /**
  * An interface to represent an access condition.
  */
-export class SherpaPoliciesDetailsObject {
+export class JiscOpfPoliciesDetailsObject {
 
   /**
-   * The sherpa policies error
+   * The Jisc Open Policy Finder policies error
    */
   error: boolean;
 
   /**
-   * The sherpa policies journal details
+   * The Jisc Open Policy Finder policies journal details
    */
   journals: Journal[];
 
   /**
-   * The sherpa policies message
+   * The Jisc Open Policy Finder policies message
    */
   message: string;
 
   /**
-   * The sherpa policies metadata
+   * The Jisc Open Policy Finder policies metadata
    */
   metadata: Metadata;
 

src/app/core/submission/models/workspaceitem-section-opf-policies.model.ts

@@ -0,0 +1,22 @@
+import { JiscOpfPoliciesDetailsObject } from './opf-policies-details.model';
+
+/**
+ * An interface to represent the submission's item accesses condition.
+ */
+export interface WorkspaceitemSectionJiscOpfPoliciesObject {
+
+  /**
+   * The access condition id
+   */
+  id: string;
+
+  /**
+   * The Jisc Open Policy Finder policies retrievalTime
+   */
+  retrievalTime: string;
+
+  /**
+   * The Jisc Open Policy Finder policies details
+   */
+  opfResponse: JiscOpfPoliciesDetailsObject;
+}

src/app/core/submission/models/workspaceitem-section-sherpa-policies.model.ts

@@ -1,10 +1,10 @@
 import { WorkspaceitemSectionAccessesObject } from './workspaceitem-section-accesses.model';
 import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
 import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
+import { WorkspaceitemSectionJiscOpfPoliciesObject } from './workspaceitem-section-opf-policies.model';
 import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 import { WorkspaceitemSectionCcLicenseObject } from './workspaceitem-section-cc-license.model';
 import { WorkspaceitemSectionIdentifiersObject } from './workspaceitem-section-identifiers.model';
-import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
 import { WorkspaceitemSectionDetectDuplicateObject } from './workspaceitem-section-deduplication.model';
 import { WorkspaceitemSectionCorrectionObject } from './workspaceitem-section-correction.model';
 
@@ -25,7 +25,7 @@ export type WorkspaceitemSectionDataType
   | WorkspaceitemSectionLicenseObject
   | WorkspaceitemSectionCcLicenseObject
   | WorkspaceitemSectionAccessesObject
-  | WorkspaceitemSectionSherpaPoliciesObject
+  | WorkspaceitemSectionJiscOpfPoliciesObject
   | WorkspaceitemSectionIdentifiersObject
   | WorkspaceitemSectionDetectDuplicateObject
   | WorkspaceitemSectionCorrectionObject

src/app/core/submission/models/workspaceitem-sections.model.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.spec.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/app/lucky-search/search/lucky-search.component.ts

@@ -21,6 +21,6 @@
          class="dropdown-menu p-0"
          id="importControlsDropdownMenu"
          aria-labelledby="dropdownImport">
-      <ds-entity-dropdown [isSubmission]="false" (selectionChange)="openPage($event)"></ds-entity-dropdown>
+      <ds-entity-dropdown [isSubmission]="false" [isImportFromExternalSource]="true" (selectionChange)="openPage($event)"></ds-entity-dropdown>
     </div>
   </div>

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html

@@ -136,6 +136,24 @@ describe('EntityDropdownComponent', () => {
     expect((component as any).entityTypeService.getAllAuthorizedRelationshipType).toHaveBeenCalled();
   });
 
+  it('should init component with entities list when isImportFromExternalSource is true', () => {
+    component.isSubmission = false;
+    component.isImportFromExternalSource = true;
+    spyOn(component.subs, 'push');
+    spyOn(component, 'resetPagination');
+    spyOn(component, 'populateEntityList').and.callThrough();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    const elements = fixture.debugElement.queryAll(By.css('.entity-item'));
+
+    expect(elements.length).toEqual(5);
+    expect(component.subs.push).toHaveBeenCalled();
+    expect(component.resetPagination).toHaveBeenCalled();
+    expect(component.populateEntityList).toHaveBeenCalled();
+    expect((component as any).entityTypeService.getAllAuthorizedRelationshipTypeImport).toHaveBeenCalled();
+  });
+
   it('should trigger onSelect method when select a new entity from list', () => {
     scheduler.schedule(() => fixture.detectChanges());
     scheduler.flush();