Merge pull request #999 from 4Science/#997

Fix issue with import from external source page

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

@@ -6,14 +6,18 @@ 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';
+import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
+import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
 
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule,
+    SharedModule.withEntryComponents(),
     CoreModule.forRoot(),
     ImportExternalRoutingModule,
     SubmissionModule,
+    JournalEntitiesModule.withEntryComponents(),
+    ResearchEntitiesModule.withEntryComponents()
   ],
   declarations: [
     ImportExternalPageComponent

src/app/core/data/comcol-data.service.spec.ts

@@ -21,6 +21,7 @@ import {
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
 import { BitstreamDataService } from './bitstream-data.service';
+import { take } from 'rxjs/operators';
 
 const LINK_NAME = 'test';
 
@@ -163,7 +164,7 @@ describe('ComColDataService', () => {
 
     describe('if the scope Community can\'t be found', () => {
       it('should throw an error', () => {
-        const result = service.getBrowseEndpoint(options);
+        const result = service.getBrowseEndpoint(options).pipe(take(1));
         const expected = cold('--#-', undefined, new Error(`The Community with scope ${scopeID} couldn't be retrieved`));
 
         expect(result).toBeObservable(expected);