[develop | DONE | CHANGED]: Removed "PreviousRouteRecorder", "IsRouteEnabled", "PiwikService", "LoginGuard", "EmailService" from providers array declared in module.ts & removed import of "PiwikServiceModule".

This commit is contained in:
Konstantina Galouni 2024-02-28 16:49:50 +02:00
parent 17165e83ae
commit 463410a135
17 changed files with 19 additions and 60 deletions

View File

@ -5,9 +5,6 @@ import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module'; import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module';
import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module'; import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module';
import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard'; import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
@ -15,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
ClaimsAdminRoutingModule, ClaimsAdminRoutingModule,
ClaimsAdminModule ClaimsAdminModule
], ],
providers:[ClaimsCuratorGuard, PreviousRouteRecorder,IsRouteEnabled], providers:[ClaimsCuratorGuard],
declarations: [ declarations: [
OpenaireClaimsAdminComponent OpenaireClaimsAdminComponent
] ]

View File

@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module';
import { OpenaireDirectLinkingComponent } from './directLinking.component'; import { OpenaireDirectLinkingComponent } from './directLinking.component';
import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module'; import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module';
import {DirectLinkingRoutingModule} from './directLinking-routing.module'; import {DirectLinkingRoutingModule} from './directLinking-routing.module';
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
SharedModule, DirectLinkingModule, DirectLinkingRoutingModule SharedModule, DirectLinkingModule, DirectLinkingRoutingModule
], ],
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[],
declarations: [ declarations: [
OpenaireDirectLinkingComponent OpenaireDirectLinkingComponent
], exports:[OpenaireDirectLinkingComponent] ], exports:[OpenaireDirectLinkingComponent]

View File

@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module';
import {OpenaireLinkingComponent} from './linkingGeneric.component'; import {OpenaireLinkingComponent} from './linkingGeneric.component';
import {LinkingRoutingModule} from './linking-routing.module'; import {LinkingRoutingModule} from './linking-routing.module';
import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module'; import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module';
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
SharedModule, LinkingRoutingModule, LinkingGenericModule SharedModule, LinkingRoutingModule, LinkingGenericModule
], ],
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[],
declarations: [ declarations: [
OpenaireLinkingComponent OpenaireLinkingComponent
], exports:[ ], exports:[

View File

@ -4,10 +4,6 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module';
import { OpenaireMyClaimsComponent } from './myClaims.component'; import { OpenaireMyClaimsComponent } from './myClaims.component';
import { MyClaimsRoutingModule } from './myClaims-routing.module'; import { MyClaimsRoutingModule } from './myClaims-routing.module';
import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module'; import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module';
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
@ -16,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
MyClaimsModule MyClaimsModule
], ],
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[],
declarations: [ declarations: [
OpenaireMyClaimsComponent OpenaireMyClaimsComponent
] ]

View File

@ -4,11 +4,8 @@ import {RouterModule} from '@angular/router';
import {ContactComponent} from './contact.component'; import {ContactComponent} from './contact.component';
import {ContactRoutingModule} from "./contact-routing.module"; import {ContactRoutingModule} from "./contact-routing.module";
import {EmailService} from "../openaireLibrary/utils/email/email.service";
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module"; import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module"; import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module";
@ -25,9 +22,7 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
declarations: [ declarations: [
ContactComponent ContactComponent
], ],
providers: [ providers: [],
EmailService, PiwikService, IsRouteEnabled
],
exports: [ exports: [
ContactComponent ContactComponent
] ]

View File

@ -2,10 +2,6 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireDepositComponent} from "./deposit.component"; import {OpenaireDepositComponent} from "./deposit.component";
import {DepositRoutingModule} from "./deposit-routing.module"; import {DepositRoutingModule} from "./deposit-routing.module";
import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPage.module"; import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPage.module";
@ -24,7 +20,8 @@ import {CommunityService} from "../openaireLibrary/connect/community/community.s
exports: [ exports: [
OpenaireDepositComponent, OpenaireDepositComponent,
], ],
providers: [PreviousRouteRecorder, IsRouteEnabled, providers: [
ZenodoCommunitiesService, CommunityService] ZenodoCommunitiesService, CommunityService
]
}) })
export class LibDepositModule { } export class LibDepositModule { }

View File

@ -6,8 +6,6 @@ import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovi
import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.module'; import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.module';
import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/searchDataprovidersToDeposit.module'; import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/searchDataprovidersToDeposit.module';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
import {CommunityService} from '../openaireLibrary/connect/community/community.service'; import {CommunityService} from '../openaireLibrary/connect/community/community.service';
@ -24,6 +22,6 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s
exports: [ exports: [
OpenaireSearchDataprovidersToDepositComponent, OpenaireSearchDataprovidersToDepositComponent,
], ],
providers: [PreviousRouteRecorder, IsRouteEnabled, CommunityService] providers: [CommunityService]
}) })
export class LibSearchDataprovidersToDepositModule { } export class LibSearchDataprovidersToDepositModule { }

View File

@ -5,8 +5,6 @@ import {RouterModule} from '@angular/router';
import {FundersComponent} from './funders.component'; import {FundersComponent} from './funders.component';
import {FundersRoutingModule} from "./funders-routing.module"; import {FundersRoutingModule} from "./funders-routing.module";
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
@ -33,9 +31,7 @@ import {GroupedRequestsServiceModule} from "../openaireLibrary/services/groupedR
declarations: [ declarations: [
FundersComponent FundersComponent
], ],
providers: [ providers: [],
PiwikService, IsRouteEnabled
],
exports: [ exports: [
FundersComponent FundersComponent
] ]

View File

@ -10,12 +10,10 @@ import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvi
import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module'; import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module';
import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module'; import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module'; import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
import { PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
import {HelperModule} from '../openaireLibrary/utils/helper/helper.module'; import {HelperModule} from '../openaireLibrary/utils/helper/helper.module';
import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module'; import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module"; import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module";
@ -36,7 +34,6 @@ import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-util
RefineFieldResultsServiceModule, RefineFieldResultsServiceModule,
DataProvidersServiceModule, SearchResearchResultsServiceModule, DataProvidersServiceModule, SearchResearchResultsServiceModule,
ProjectsServiceModule, OrganizationsServiceModule, ProjectsServiceModule, OrganizationsServiceModule,
PiwikServiceModule,
HomeRoutingModule, HomeRoutingModule,
HelperModule, HelperModule,
SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule
@ -44,9 +41,7 @@ import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-util
declarations: [ declarations: [
HomeComponent HomeComponent
], ],
providers:[ providers:[],
PreviousRouteRecorder
],
exports: [ exports: [
HomeComponent HomeComponent
] ]

View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
@NgModule({ @NgModule({
@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
declarations: [ declarations: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
] ]

View File

@ -5,8 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module'; import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module';
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({ @NgModule({
@ -18,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchCompatibleDataprovidersComponent OpenaireSearchCompatibleDataprovidersComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchCompatibleDataprovidersComponent OpenaireSearchCompatibleDataprovidersComponent
] ]

View File

@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms';
import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module'; import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module';
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@ -17,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchEntityRegistriesComponent OpenaireSearchEntityRegistriesComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchEntityRegistriesComponent OpenaireSearchEntityRegistriesComponent
] ]

View File

@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms';
import{ JournalsRoutingModule} from './journals-routing.module'; import{ JournalsRoutingModule} from './journals-routing.module';
import{OpenaireSearchJournalsComponent} from './journals.component'; import{OpenaireSearchJournalsComponent} from './journals.component';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({ @NgModule({
imports: [ imports: [
@ -14,7 +13,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchJournalsComponent OpenaireSearchJournalsComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchJournalsComponent OpenaireSearchJournalsComponent
] ]

View File

@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module'; import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module';
@NgModule({ @NgModule({
imports: [ imports: [
@ -14,7 +13,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule
declarations: [ declarations: [
OpenaireSearchDataprovidersComponent OpenaireSearchDataprovidersComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchDataprovidersComponent OpenaireSearchDataprovidersComponent
] ]

View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
@ -18,7 +17,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchOrganizationsComponent OpenaireSearchOrganizationsComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchOrganizationsComponent OpenaireSearchOrganizationsComponent
] ]

View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; import{ SearchProjectsRoutingModule} from './searchProjects-routing.module';
import{OpenaireSearchProjectsComponent} from './searchProjects.component'; import{OpenaireSearchProjectsComponent} from './searchProjects.component';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module'; import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module';
@NgModule({ @NgModule({
imports: [ imports: [
@ -15,7 +14,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro
declarations: [ declarations: [
OpenaireSearchProjectsComponent OpenaireSearchProjectsComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchProjectsComponent OpenaireSearchProjectsComponent
] ]

View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
@NgModule({ @NgModule({
@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
declarations: [ declarations: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
], ],
providers:[PreviousRouteRecorder], providers:[],
exports: [ exports: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
] ]