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

Author: atarix83

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

@@ -25,7 +25,7 @@
       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

@@ -17,9 +17,11 @@ import {
 } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
+import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { ItemExportFormatService } from '../../core/itemexportformat/item-export-format.service';
 import {
   ItemExportFormat,
   ItemExportFormatMap,
@@ -108,6 +110,10 @@ describe('EntityDropdownComponent', () => {
     getAllAuthorizedRelationshipTypeImport: jasmine.createSpy('getAllAuthorizedRelationshipTypeImport'),
   });
 
+  const itemExportFormatServiceMock: any = jasmine.createSpyObj('ItemExportFormatService', {
+    byEntityTypeAndMolteplicity: jasmine.createSpy('byEntityTypeAndMolteplicity'),
+  });
+
   const translateServiceMock: any = {
     instant(name) {
       return 'Statistics';
@@ -130,6 +136,7 @@ describe('EntityDropdownComponent', () => {
       ],
       providers: [
         { provide: EntityTypeDataService, useValue: entityTypeServiceMock },
+        { provide: ItemExportFormatService, useValue: itemExportFormatServiceMock },
         { provide: TranslateService, useValue: translateServiceMock },
         ChangeDetectorRef,
       ],
@@ -145,6 +152,7 @@ describe('EntityDropdownComponent', () => {
     componentAsAny = fixture.componentInstance;
     componentAsAny.entityTypeService.getAllAuthorizedRelationshipType.and.returnValue(paginatedEntitiesRD$);
     componentAsAny.entityTypeService.getAllAuthorizedRelationshipTypeImport.and.returnValue(paginatedEntitiesRD$);
+    componentAsAny.itemExportFormatService.byEntityTypeAndMolteplicity.and.returnValue(of(entityFormatList));
     component.isSubmission = true;
   });
 
@@ -164,6 +172,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();
@@ -202,4 +228,12 @@ describe('EntityDropdownComponent', () => {
     expect(component.searchListEntity).toEqual([]);
   });
 
+  it('should invoke the method byEntityTypeAndMolteplicity of EntityTypeService when isSubmission is false', () => {
+    component.isSubmission = false;
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+
+    expect((component as any).itemExportFormatService.byEntityTypeAndMolteplicity).toHaveBeenCalled();
+  });
 });

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

@@ -25,6 +25,7 @@ import {
   reduce,
   startWith,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 import { SortPipe } from 'src/app/shared/utils/sort.pipe';
@@ -36,12 +37,14 @@ import {
   PaginatedList,
 } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { ItemExportFormatService } from '../../core/itemexportformat/item-export-format.service';
+import {
+  ItemExportFormatMolteplicity,
+  ItemExportFormatService,
+} from '../../core/itemexportformat/item-export-format.service';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteWithNotEmptyData } from '../../core/shared/operators';
 import {
   hasValue,
-  isEmpty,
   isNotNull,
 } from '../empty.util';
 import { ThemedLoadingComponent } from '../loading/themed-loading.component';
@@ -84,11 +87,16 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
   public searchListEntity: ItemType[] = [];
 
   /**
-   * TRUE if the parent operation is a 'new submission' operation, FALSE otherwise (eg.: is an 'Import metadata from an external source'
-   * operation).
+   * TRUE if the parent operation is a 'new submission' operation, FALSE otherwise (eg.: is an 'Import metadata from an external source' operation).
    */
   @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
    */
@@ -127,6 +135,8 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
   constructor(
     private changeDetectorRef: ChangeDetectorRef,
     private entityTypeService: EntityTypeDataService,
+    private itemExportFormatService: ItemExportFormatService,
+    private el: ElementRef,
     private translate: TranslateService,
   ) { }
 
@@ -190,23 +200,44 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
   public populateEntityList(page: number) {
     this.isLoadingList.next(true);
     let searchListEntity$: Observable<RemoteData<PaginatedList<ItemType>>>;
-    // Set the pagination info
-    const findOptions: FindListOptions = {
-      elementsPerPage: 10,
-      currentPage: page,
-    };
-    if (this.isSubmission) {
-      searchListEntity$ =
-        this.entityTypeService.getAllAuthorizedRelationshipType(findOptions);
+    if (this.isSubmission || this.isImportFromExternalSource) {
+      // Set the pagination info
+      const findOptions: FindListOptions = {
+        elementsPerPage: 10,
+        currentPage: page,
+      };
+
+      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.entityTypeService.getAllAuthorizedRelationshipTypeImport(findOptions);
+        this.itemExportFormatService.byEntityTypeAndMolteplicity(null, ItemExportFormatMolteplicity.MULTIPLE)
+          .pipe(
+            take(1),
+            map((formatTypes: any) => {
+              const entityList: ItemType[] = Object.keys(formatTypes)
+                .filter((entityType: string) => isNotNull(entityType) && entityType !== 'null')
+                .map((entityType: string) => ({
+                  id: entityType,
+                  label: entityType,
+                } as any));
+              return createSuccessfulRemoteDataObject(buildPaginatedList(null, entityList));
+            }),
+            tap(() => this.hasNextPage = false),
+          );
     }
 
     this.searchListEntity$ = searchListEntity$.pipe(
-      getFirstSucceededRemoteWithNotEmptyData(),
-      map((formatTypes: RemoteData<PaginatedList<ItemType>>) =>this.parseItemTypesResponse(formatTypes)),
-      tap((entityTypes) => this.hasNextPages(findOptions, entityTypes)),
       switchMap((entityType: RemoteData<PaginatedList<ItemType>>) => entityType.payload.page),
       map((item: ItemType) => {
         return {
@@ -229,26 +260,6 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
     );
   }
 
-  private parseItemTypesResponse(formatTypes: RemoteData<PaginatedList<ItemType>>) {
-    if (formatTypes.statusCode !== 200) {
-      return createSuccessfulRemoteDataObject(buildPaginatedList(null, []));
-    }
-    const entityList: ItemType[] = (formatTypes?.payload?.page || [])
-      .filter(itemType => isNotNull(itemType?.id));
-    return createSuccessfulRemoteDataObject(buildPaginatedList(null, entityList));
-  }
-
-  private hasNextPages<A>(findOptions: FindListOptions, entityType: RemoteData<PaginatedList<A>>) {
-    if (
-      findOptions.elementsPerPage > 0 &&
-      (isEmpty(entityType?.payload?.totalElements) || entityType.payload.totalElements < findOptions.elementsPerPage)
-    ) {
-      this.hasNextPage = false;
-    } else {
-      this.hasNextPage = true;
-    }
-  }
-
   /**
    * Reset pagination values
    */