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

[DSC-1700] fix(entity-dropdown): add support for importing from external sources

Approved-by: Vincenzo Mecca

Author: atarix83

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');

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

@@ -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/shared/entity-dropdown/entity-dropdown.component.spec.ts

@@ -173,6 +173,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();

src/app/shared/entity-dropdown/entity-dropdown.component.ts

@@ -90,6 +90,12 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
    */
   @Input() isSubmission: boolean;
 
+  /**
+   * TRUE if the main operation is "Import metadata from an external source", FALSE otherwise.
+   * Used to determine which list type to populate.
+   */
+  @Input() isImportFromExternalSource: boolean;
+
   /**
    * The entity to output to the parent component
    */
@@ -192,23 +198,26 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
    */
   public populateEntityList(page: number) {
     this.isLoadingList.next(true);
-    let searchListEntity$;
-    if (this.isSubmission) {
+    let searchListEntity$: Observable<RemoteData<PaginatedList<ItemType>>>;
+    if (this.isSubmission || this.isImportFromExternalSource) {
       // Set the pagination info
       const findOptions: FindListOptions = {
         elementsPerPage: 10,
         currentPage: page,
       };
-      searchListEntity$ =
-        this.entityTypeService.getAllAuthorizedRelationshipType(findOptions)
-          .pipe(
-            getFirstSucceededRemoteWithNotEmptyData(),
-            tap(entityType => {
-              if ((this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements) {
-                this.hasNextPage = false;
-              }
-            }),
-          );
+
+      searchListEntity$ = this.isSubmission ?
+        this.entityTypeService.getAllAuthorizedRelationshipType(findOptions) :
+        this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findOptions);
+
+      searchListEntity$ = searchListEntity$.pipe(
+        getFirstSucceededRemoteWithNotEmptyData(),
+        tap(entityType => {
+          if ((this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements) {
+            this.hasNextPage = false;
+          }
+        }),
+      );
     } else {
       searchListEntity$ =
         this.itemExportFormatService.byEntityTypeAndMolteplicity(null, ItemExportFormatMolteplicity.MULTIPLE)