From 653776f119efe5f2160ded4b07e429dd5fe380d7 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 25 Jan 2021 18:53:24 +0100
Subject: [PATCH 1/3] Fix issue with import from external source page

---
 .../+import-external-page/import-external-page.module.ts    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/+import-external-page/import-external-page.module.ts b/src/app/+import-external-page/import-external-page.module.ts
index bcf10b0752..1a0fd9e360 100644
--- a/src/app/+import-external-page/import-external-page.module.ts
+++ b/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

From 743bd0bba261efc475d105463d8e5427173a02ee Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 26 Jan 2021 10:29:23 +0100
Subject: [PATCH 2/3] Fix issue with comcol-data.service.spec.ts

---
 src/app/core/data/comcol-data.service.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 80e70bed51..f734d15c86 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -162,11 +162,12 @@ describe('ComColDataService', () => {
     });
 
     describe('if the scope Community can\'t be found', () => {
-      it('should throw an error', () => {
+      it('should throw an error', (done) => {
         const result = service.getBrowseEndpoint(options);
         const expected = cold('--#-', undefined, new Error(`The Community with scope ${scopeID} couldn't be retrieved`));
 
         expect(result).toBeObservable(expected);
+        done();
       });
     });
 

From ce8e1efa4823d676a6147acbfabb176015da86fa Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 4 Feb 2021 18:12:20 +0100
Subject: [PATCH 3/3] Fix issue with comcol-data.service.spec.ts

---
 src/app/core/data/comcol-data.service.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index f734d15c86..c18aff184e 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/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';
 
@@ -162,12 +163,11 @@ describe('ComColDataService', () => {
     });
 
     describe('if the scope Community can\'t be found', () => {
-      it('should throw an error', (done) => {
-        const result = service.getBrowseEndpoint(options);
+      it('should throw an error', () => {
+        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);
-        done();
       });
     });