DS-4515: Start new submission via Search or ID Lookup (i.e. submit external source)

src/app/+import-external-page/import-external-page.component.html

@@ -0,0 +1 @@
+<ds-submission-import-external></ds-submission-import-external>

src/app/+import-external-page/import-external-page.component.spec.ts

@@ -0,0 +1,26 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ImportExternalPageComponent } from './import-external-page.component';
+
+describe('ImportExternalPageComponent', () => {
+  let component: ImportExternalPageComponent;
+  let fixture: ComponentFixture<ImportExternalPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ImportExternalPageComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ImportExternalPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create ImportExternalPageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/+import-external-page/import-external-page.component.ts

@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component representing the external import page of the submission.
+ */
+@Component({
+  selector: 'ds-import-external-page',
+  templateUrl: './import-external-page.component.html',
+  styleUrls: ['./import-external-page.component.scss']
+})
+export class ImportExternalPageComponent {
+
+}

src/app/+import-external-page/import-external-page.module.ts

@@ -0,0 +1,29 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../shared/shared.module';
+import { CoreModule } from '../core/core.module';
+import { ImportExternalRoutingModule } from './import-external-routing.module';
+import { SubmissionModule } from '../submission/submission.module';
+import { ImportExternalPageComponent } from './import-external-page.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CoreModule.forRoot(),
+    ImportExternalRoutingModule,
+    SubmissionModule,
+  ],
+  declarations: [
+    ImportExternalPageComponent
+  ],
+  entryComponents: [ ]
+})
+
+/**
+ * This module handles all components that are necessary for the submission external import page
+ */
+export class ImportExternalPageModule {
+
+}

src/app/+import-external-page/import-external-routing.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { SubmissionImportExternalComponent } from '../submission/import-external/submission-import-external.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: '',
+        component: SubmissionImportExternalComponent,
+        pathMatch: 'full',
+        data: {
+          title: 'submission.import-external.page.title'
+        }
+      }
+    ])
+  ],
+  providers: [ ]
+})
+export class ImportExternalRoutingModule {
+
+}

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

@@ -7,9 +7,14 @@
 
   </div>
   <div class="add">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" (click)="openDialog()" role="button">
-      <i class="fa fa-plus-circle" aria-hidden="true"></i> {{'mydspace.new-submission' | translate}}
+    <button class="btn btn-lg btn-primary mt-1 ml-2" (click)="openDialog()" role="button" title="{{'mydspace.new-submission' | translate}}">
+      <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
+  <div class="add">
+    <a class="btn btn-lg btn-primary mt-1 ml-2" [routerLink]="['/import-external']" role="button" title="{{'mydspace.new-submission-external' | translate}}">
+      <i class="fa fa-file-import" aria-hidden="true"></i>
+    </a>
+  </div>
 
 </div>

src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts

@@ -23,6 +23,8 @@ import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.moc
 import { UploaderService } from '../../shared/uploader/uploader.service';
 import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { HostWindowService } from '../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 
 describe('MyDSpaceNewSubmissionComponent test', () => {
 
@@ -63,7 +65,8 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         },
         ChangeDetectorRef,
         MyDSpaceNewSubmissionComponent,
-        UploaderService
+        UploaderService,
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts

@@ -1,9 +1,11 @@
 import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { Router } from '@angular/router';
 
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { SubmissionState } from '../../submission/submission.reducers';
 import { AuthService } from '../../core/auth/auth.service';
@@ -15,9 +17,7 @@ import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { NotificationType } from '../../shared/notifications/models/notification-type';
 import { hasValue } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/search-result.model';
-import { Router } from '@angular/router';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { CreateItemParentSelectorComponent } from 'src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 
 /**
  * This component represents the whole mydspace page header
@@ -52,6 +52,8 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
    * @param {NotificationsService} notificationsService
    * @param {Store<SubmissionState>} store
    * @param {TranslateService} translate
+   * @param {Router} router
+   * @param {NgbModal} modalService
    */
   constructor(private authService: AuthService,
               private changeDetectorRef: ChangeDetectorRef,

src/app/app-routing.module.ts

@@ -110,6 +110,7 @@ export function getUnauthorizedPath() {
       { path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
       { path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
       { path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' },
+      { path: 'import-external', loadChildren: './+import-external-page/import-external-page.module#ImportExternalPageModule' },
       {
         path: 'workspaceitems',
         loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule'

src/app/core/data/external-source.service.ts

@@ -19,6 +19,7 @@ import { RemoteData } from './remote-data';
 import { PaginatedList } from './paginated-list';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 
 /**
  * A service handling all external source requests

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

@@ -24,7 +24,7 @@ interface CollectionListEntryItem {
 /**
  * An interface to represent an entry in the collection list
  */
-interface CollectionListEntry {
+export interface CollectionListEntry {
   communities: CollectionListEntryItem[],
   collection: CollectionListEntryItem
 }

src/app/shared/mocks/external-source.service.mock.ts

@@ -0,0 +1,59 @@
+import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSource } from '../../core/shared/external-source.model';
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const externalSourceOrcid: ExternalSource = {
+  type: new ResourceType('externalsource'),
+  id: 'orcid',
+  name: 'orcid',
+  hierarchical: false,
+  _links: {
+    entries: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid/entries'
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid'
+    }
+  }
+};
+
+export const externalSourceCiencia: ExternalSource = {
+  type: new ResourceType('externalsource'),
+  id: 'ciencia',
+  name: 'ciencia',
+  hierarchical: false,
+  _links: {
+    entries: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia/entries'
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia'
+    }
+  }
+};
+
+export const externalSourceMyStaffDb: ExternalSource = {
+  type: new ResourceType('externalsource'),
+  id: 'my_staff_db',
+  name: 'my_staff_db',
+  hierarchical: false,
+  _links: {
+    entries: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entries'
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db'
+    }
+  }
+};
+
+/**
+ * Mock for [[ExternalSourceService]]
+ */
+export function getMockExternalSourceService():
+ExternalSourceService {
+  return jasmine.createSpyObj('ExternalSourceService', {
+    findAll: jasmine.createSpy('findAll'),
+    getExternalSourceEntries: jasmine.createSpy('getExternalSourceEntries'),
+  });
+}

src/app/shared/shared.module.ts

@@ -471,7 +471,8 @@ const ENTRY_COMPONENTS = [
   ClaimedTaskActionsRejectComponent,
   ClaimedTaskActionsReturnToPoolComponent,
   ClaimedTaskActionsEditMetadataComponent,
-  FileDownloadLinkComponent,
+  CollectionDropdownComponent,
+  FileDownloadLinkComponent
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [

src/app/shared/testing/submission-service.stub.ts

@@ -2,6 +2,7 @@ export class SubmissionServiceStub {
 
   changeSubmissionCollection = jasmine.createSpy('changeSubmissionCollection');
   createSubmission = jasmine.createSpy('createSubmission');
+  createSubmissionFromExternalSource = jasmine.createSpy('createSubmissionFromExternalSource');
   depositSubmission = jasmine.createSpy('depositSubmission');
   discardSubmission = jasmine.createSpy('discardSubmission');
   dispatchInit = jasmine.createSpy('dispatchInit');

src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html

@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.create.collection.head' | translate}}
+    <button type="button" class="close" (click)="closeCollectionModal()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <ds-collection-dropdown (selectionChange)="selectObject($event)">
+    </ds-collection-dropdown>
+  </div>
+</div>

src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss

@@ -0,0 +1,3 @@
+.close:focus {
+  outline: none !important;
+}

src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts

@@ -0,0 +1,89 @@
+import { Component, NO_ERRORS_SCHEMA, EventEmitter } from '@angular/core';
+import { async, TestBed, ComponentFixture, inject } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionImportExternalCollectionComponent } from './submission-import-external-collection.component';
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+describe('SubmissionImportExternalCollectionComponent test suite', () => {
+  let comp: SubmissionImportExternalCollectionComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionImportExternalCollectionComponent>;
+
+  beforeEach(async (() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionImportExternalCollectionComponent,
+        TestComponent,
+      ],
+      providers: [
+        NgbActiveModal,
+        SubmissionImportExternalCollectionComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-submission-import-external-collection></ds-submission-import-external-collection>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionImportExternalCollectionComponent', inject([SubmissionImportExternalCollectionComponent], (app: SubmissionImportExternalCollectionComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionImportExternalCollectionComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it('The variable \'selectedEvent\' should be assigned', () => {
+      const event = new EventEmitter<CollectionListEntry>();
+      comp.selectObject(event);
+
+      expect(comp.selectedEvent).toEqual(event);
+    });
+
+    it('The variable \'selectedEvent\' should be assigned', () => {
+      spyOn(compAsAny.activeModal, 'dismiss');
+      comp.closeCollectionModal();
+
+      expect(compAsAny.activeModal.dismiss).toHaveBeenCalled();
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}