Merge remote-tracking branch 'origin/develop' into plugins-functionality

landingPages/result/resultLanding.module.ts

@@ -26,7 +26,6 @@ import {ResultPreviewModule} from "../../utils/result-preview/result-preview.mod
 import {FeedbackModule} from "../feedback/feedback.module";
 import {TabsModule} from "../../utils/tabs/tabs.module";
 import {LoadingModule} from "../../utils/loading/loading.module";
-import {OrcidModule} from "../../orcid/orcid.module";
 import {IconsModule} from "../../utils/icons/icons.module";
 import {IconsService} from "../../utils/icons/icons.service";
 import {cite, fire, graph, landmark, link, link_to, quotes, rocket, versions} from "../../utils/icons/icons";
@@ -38,6 +37,7 @@ import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-sc
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
 import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
 import {ResultLandingRoutingModule} from "./resultLanding-routing.module";
+import {OrcidCoreModule} from "../../orcid/orcid-core.module";
 
 @NgModule({
   imports: [
@@ -47,7 +47,7 @@ import {ResultLandingRoutingModule} from "./resultLanding-routing.module";
     AltMetricsModule, Schema2jsonldModule, SEOServiceModule,
     DeletedByInferenceModule, ShowAuthorsModule, HelperModule, ResultLandingUtilsModule, AlertModalModule,
     LandingHeaderModule, NoLoadPaging, ResultPreviewModule, FeedbackModule, TabsModule, LoadingModule,
-    OrcidModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule,
+    OrcidCoreModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule,
     SdgFosSuggestModule, FullScreenModalModule, SafeHtmlPipeModule, EntityActionsModule
   ],
   declarations: [

orcid/my-orcid-links/searchMyOrcidResults.module.ts

@@ -6,15 +6,15 @@ import {RouterModule} from '@angular/router';
 import {ResultPreviewModule} from "../../utils/result-preview/result-preview.module";
 import {ErrorMessagesModule} from "../../utils/errorMessages.module";
 import {searcMyOrcidResultsComponent} from "./searchMyOrcidResults.component";
-import {OrcidModule} from "../orcid.module";
 import {NoLoadPaging} from "../../searchPages/searchUtils/no-load-paging.module";
 import {PagingModule} from "../../utils/paging.module";
+import {OrcidCoreModule} from "../orcid-core.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
     RouterModule, ErrorMessagesModule,
-    ResultPreviewModule, OrcidModule, NoLoadPaging, PagingModule
+    ResultPreviewModule, OrcidCoreModule, NoLoadPaging, PagingModule
   ],
   declarations: [
     searcMyOrcidResultsComponent

orcid/orcid-core.module.ts

@@ -0,0 +1,43 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+
+import {RouterModule} from '@angular/router';
+
+import {OrcidComponent} from './orcid.component';
+import {OrcidService} from './orcid.service';
+import {OrcidWorkComponent} from './orcid-work.component';
+import {AlertModalModule} from '../utils/modal/alertModal.module';
+import {ResultLandingService} from '../landingPages/result/resultLanding.service';
+import {LoadingModule} from '../utils/loading/loading.module';
+import {ResultLandingUtilsModule} from '../landingPages/landing-utils/resultLandingUtils.module';
+import {IconsModule} from '../utils/icons/icons.module';
+import {IconsService} from "../utils/icons/icons.service";
+import {orcid_add, orcid_bin} from "../utils/icons/icons";
+import {FullScreenModalModule} from "../utils/modal/full-screen-modal/full-screen-modal.module";
+import {LogServiceModule} from "../utils/log/LogService.module";
+import {OrcidRoutingModule} from "./orcid-routing.module";
+
+@NgModule({
+  imports: [
+    CommonModule, RouterModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule,
+    IconsModule, FullScreenModalModule, LogServiceModule
+  ],
+  declarations: [
+    OrcidComponent,
+    OrcidWorkComponent
+  ],
+  providers:[
+    OrcidService, ResultLandingService
+  ],
+  exports: [
+    OrcidComponent,
+    OrcidWorkComponent
+  ]
+})
+
+
+export class OrcidCoreModule{
+  constructor(private iconsService: IconsService) {
+    this.iconsService.registerIcons([orcid_add, orcid_bin])
+  }
+}

orcid/orcid.module.ts

@@ -1,43 +1,15 @@
 import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-
-import {RouterModule} from '@angular/router';
-
-import {OrcidComponent} from './orcid.component';
-import {OrcidService} from './orcid.service';
-import {OrcidWorkComponent} from './orcid-work.component';
-import {AlertModalModule} from '../utils/modal/alertModal.module';
-import {ResultLandingService} from '../landingPages/result/resultLanding.service';
-import {LoadingModule} from '../utils/loading/loading.module';
-import {ResultLandingUtilsModule} from '../landingPages/landing-utils/resultLandingUtils.module';
-import {IconsModule} from '../utils/icons/icons.module';
 import {IconsService} from "../utils/icons/icons.service";
 import {orcid_add, orcid_bin} from "../utils/icons/icons";
-import {FullScreenModalModule} from "../utils/modal/full-screen-modal/full-screen-modal.module";
-import {LogServiceModule} from "../utils/log/LogService.module";
 import {OrcidRoutingModule} from "./orcid-routing.module";
+import {OrcidCoreModule} from "./orcid-core.module";
+import {OrcidComponent} from "./orcid.component";
 
 @NgModule({
-  imports: [
+  imports: [OrcidCoreModule, OrcidRoutingModule],
-    CommonModule, RouterModule, OrcidRoutingModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule,
+  exports: [OrcidComponent]
-    IconsModule, FullScreenModalModule, LogServiceModule
-  ],
-  declarations: [
-    OrcidComponent,
-    OrcidWorkComponent
-  ],
-  providers:[
-    OrcidService, ResultLandingService
-  ],
-  exports: [
-    OrcidComponent,
-    OrcidWorkComponent
-  ]
 })
 
 
 export class OrcidModule{
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([orcid_add, orcid_bin])
-  }
 }

utils/result-preview/result-preview.module.ts

@@ -4,15 +4,15 @@ import {ResultPreviewComponent} from "./result-preview.component";
 import {RouterModule} from "@angular/router";
 import {ShowAuthorsModule} from "../authors/showAuthors.module";
 import {ResultLandingUtilsModule} from "../../landingPages/landing-utils/resultLandingUtils.module";
-import {OrcidModule} from "../../orcid/orcid.module";
 import {IconsModule} from "../icons/icons.module";
 import {IconsService} from "../icons/icons.service";
 import {cite, fire, landmark, link, link_to, quotes, rocket} from "../icons/icons";
 import {EntityActionsModule} from "../entity-actions/entity-actions.module";
 import {EntityMetadataModule} from "../../landingPages/landing-utils/entity-metadata.module";
+import {OrcidCoreModule} from "../../orcid/orcid-core.module";
 
 @NgModule({
-  imports: [CommonModule, RouterModule, ShowAuthorsModule, ResultLandingUtilsModule, OrcidModule, IconsModule, EntityActionsModule, EntityMetadataModule],
+  imports: [CommonModule, RouterModule, ShowAuthorsModule, ResultLandingUtilsModule, OrcidCoreModule, IconsModule, EntityActionsModule, EntityMetadataModule],
   declarations: [ResultPreviewComponent],
   exports: [ResultPreviewComponent]
 })