From 463410a135b251602379104b0c15954edd264b3e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 28 Feb 2024 16:49:50 +0200 Subject: [PATCH] [develop | DONE | CHANGED]: Removed "PreviousRouteRecorder", "IsRouteEnabled", "PiwikService", "LoginGuard", "EmailService" from providers array declared in module.ts & removed import of "PiwikServiceModule". --- explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts | 5 +---- .../src/app/claims/directLinking/directLinking.module.ts | 5 +---- explore/src/app/claims/linking/linkingGeneric.module.ts | 5 +---- explore/src/app/claims/myClaims/myClaims.module.ts | 6 +----- explore/src/app/contact/contact.module.ts | 7 +------ explore/src/app/deposit/deposit.module.ts | 9 +++------ .../app/deposit/searchDataprovidersToDeposit.module.ts | 4 +--- explore/src/app/funders/funders.module.ts | 6 +----- explore/src/app/home/home.module.ts | 7 +------ .../searchPages/advanced/searchResearchResults.module.ts | 3 +-- .../dataProviders/compatibleDataProviders.module.ts | 4 +--- .../searchPages/dataProviders/entityRegistries.module.ts | 3 +-- .../src/app/searchPages/dataProviders/journals.module.ts | 3 +-- .../app/searchPages/simple/searchDataProviders.module.ts | 3 +-- .../app/searchPages/simple/searchOrganizations.module.ts | 3 +-- .../src/app/searchPages/simple/searchProjects.module.ts | 3 +-- .../searchPages/simple/searchResearchResults.module.ts | 3 +-- 17 files changed, 19 insertions(+), 60 deletions(-) diff --git a/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts index 2e155ce7..9557f899 100644 --- a/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts +++ b/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts @@ -5,9 +5,6 @@ import { OpenaireClaimsAdminComponent } from './claimsAdmin.component'; import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module'; import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module'; import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - @NgModule({ imports: [ @@ -15,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; ClaimsAdminRoutingModule, ClaimsAdminModule ], - providers:[ClaimsCuratorGuard, PreviousRouteRecorder,IsRouteEnabled], + providers:[ClaimsCuratorGuard], declarations: [ OpenaireClaimsAdminComponent ] diff --git a/explore/src/app/claims/directLinking/directLinking.module.ts b/explore/src/app/claims/directLinking/directLinking.module.ts index 8c9f752b..5d868817 100644 --- a/explore/src/app/claims/directLinking/directLinking.module.ts +++ b/explore/src/app/claims/directLinking/directLinking.module.ts @@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module'; import { OpenaireDirectLinkingComponent } from './directLinking.component'; import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.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({ imports: [ SharedModule, DirectLinkingModule, DirectLinkingRoutingModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[], declarations: [ OpenaireDirectLinkingComponent ], exports:[OpenaireDirectLinkingComponent] diff --git a/explore/src/app/claims/linking/linkingGeneric.module.ts b/explore/src/app/claims/linking/linkingGeneric.module.ts index c9911f63..d96698f8 100644 --- a/explore/src/app/claims/linking/linkingGeneric.module.ts +++ b/explore/src/app/claims/linking/linkingGeneric.module.ts @@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module'; import {OpenaireLinkingComponent} from './linkingGeneric.component'; import {LinkingRoutingModule} from './linking-routing.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({ imports: [ SharedModule, LinkingRoutingModule, LinkingGenericModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[], declarations: [ OpenaireLinkingComponent ], exports:[ diff --git a/explore/src/app/claims/myClaims/myClaims.module.ts b/explore/src/app/claims/myClaims/myClaims.module.ts index c36ec56e..89648a75 100644 --- a/explore/src/app/claims/myClaims/myClaims.module.ts +++ b/explore/src/app/claims/myClaims/myClaims.module.ts @@ -4,10 +4,6 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module'; import { OpenaireMyClaimsComponent } from './myClaims.component'; import { MyClaimsRoutingModule } from './myClaims-routing.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({ imports: [ @@ -16,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; MyClaimsModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[], declarations: [ OpenaireMyClaimsComponent ] diff --git a/explore/src/app/contact/contact.module.ts b/explore/src/app/contact/contact.module.ts index 3e5b0f26..0aec009d 100644 --- a/explore/src/app/contact/contact.module.ts +++ b/explore/src/app/contact/contact.module.ts @@ -4,11 +4,8 @@ import {RouterModule} from '@angular/router'; import {ContactComponent} from './contact.component'; import {ContactRoutingModule} from "./contact-routing.module"; -import {EmailService} from "../openaireLibrary/utils/email/email.service"; 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 {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module"; @@ -25,9 +22,7 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; declarations: [ ContactComponent ], - providers: [ - EmailService, PiwikService, IsRouteEnabled - ], + providers: [], exports: [ ContactComponent ] diff --git a/explore/src/app/deposit/deposit.module.ts b/explore/src/app/deposit/deposit.module.ts index 79e96a68..23acd51f 100644 --- a/explore/src/app/deposit/deposit.module.ts +++ b/explore/src/app/deposit/deposit.module.ts @@ -2,10 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; 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 {DepositRoutingModule} from "./deposit-routing.module"; import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPage.module"; @@ -24,7 +20,8 @@ import {CommunityService} from "../openaireLibrary/connect/community/community.s exports: [ OpenaireDepositComponent, ], - providers: [PreviousRouteRecorder, IsRouteEnabled, - ZenodoCommunitiesService, CommunityService] + providers: [ + ZenodoCommunitiesService, CommunityService + ] }) export class LibDepositModule { } diff --git a/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts b/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts index b1647561..7ac30a07 100644 --- a/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts +++ b/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts @@ -6,8 +6,6 @@ import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovi import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.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 {CommunityService} from '../openaireLibrary/connect/community/community.service'; @@ -24,6 +22,6 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s exports: [ OpenaireSearchDataprovidersToDepositComponent, ], - providers: [PreviousRouteRecorder, IsRouteEnabled, CommunityService] + providers: [CommunityService] }) export class LibSearchDataprovidersToDepositModule { } diff --git a/explore/src/app/funders/funders.module.ts b/explore/src/app/funders/funders.module.ts index e95a5a5f..0f84d4aa 100644 --- a/explore/src/app/funders/funders.module.ts +++ b/explore/src/app/funders/funders.module.ts @@ -5,8 +5,6 @@ import {RouterModule} from '@angular/router'; import {FundersComponent} from './funders.component'; import {FundersRoutingModule} from "./funders-routing.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 {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; @@ -33,9 +31,7 @@ import {GroupedRequestsServiceModule} from "../openaireLibrary/services/groupedR declarations: [ FundersComponent ], - providers: [ - PiwikService, IsRouteEnabled - ], + providers: [], exports: [ FundersComponent ] diff --git a/explore/src/app/home/home.module.ts b/explore/src/app/home/home.module.ts index 0116ef4e..793d519a 100644 --- a/explore/src/app/home/home.module.ts +++ b/explore/src/app/home/home.module.ts @@ -10,12 +10,10 @@ import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvi import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module'; import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.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 {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module"; @@ -36,7 +34,6 @@ import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-util RefineFieldResultsServiceModule, DataProvidersServiceModule, SearchResearchResultsServiceModule, ProjectsServiceModule, OrganizationsServiceModule, - PiwikServiceModule, HomeRoutingModule, HelperModule, SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule @@ -44,9 +41,7 @@ import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-util declarations: [ HomeComponent ], - providers:[ - PreviousRouteRecorder - ], + providers:[], exports: [ HomeComponent ] diff --git a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts index 9462486c..3d216071 100644 --- a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @NgModule({ @@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchResearchResultsComponent ] diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts index 6232991c..33037524 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts @@ -5,8 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ @@ -18,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchCompatibleDataprovidersComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchCompatibleDataprovidersComponent ] diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts index 2fa4b58c..c9f143fe 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'; import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @@ -17,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchEntityRegistriesComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchEntityRegistriesComponent ] diff --git a/explore/src/app/searchPages/dataProviders/journals.module.ts b/explore/src/app/searchPages/dataProviders/journals.module.ts index 072aacf8..1db3b814 100644 --- a/explore/src/app/searchPages/dataProviders/journals.module.ts +++ b/explore/src/app/searchPages/dataProviders/journals.module.ts @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'; import{ JournalsRoutingModule} from './journals-routing.module'; import{OpenaireSearchJournalsComponent} from './journals.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ imports: [ @@ -14,7 +13,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchJournalsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchJournalsComponent ] diff --git a/explore/src/app/searchPages/simple/searchDataProviders.module.ts b/explore/src/app/searchPages/simple/searchDataProviders.module.ts index b27cf5af..85af92f6 100644 --- a/explore/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/explore/src/app/searchPages/simple/searchDataProviders.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module'; @NgModule({ imports: [ @@ -14,7 +13,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule declarations: [ OpenaireSearchDataprovidersComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchDataprovidersComponent ] diff --git a/explore/src/app/searchPages/simple/searchOrganizations.module.ts b/explore/src/app/searchPages/simple/searchOrganizations.module.ts index 9218a4ab..0450a4ea 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; @@ -18,7 +17,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchOrganizationsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchOrganizationsComponent ] diff --git a/explore/src/app/searchPages/simple/searchProjects.module.ts b/explore/src/app/searchPages/simple/searchProjects.module.ts index 8b746aa4..47223420 100644 --- a/explore/src/app/searchPages/simple/searchProjects.module.ts +++ b/explore/src/app/searchPages/simple/searchProjects.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module'; @NgModule({ imports: [ @@ -15,7 +14,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro declarations: [ OpenaireSearchProjectsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchProjectsComponent ] diff --git a/explore/src/app/searchPages/simple/searchResearchResults.module.ts b/explore/src/app/searchPages/simple/searchResearchResults.module.ts index b1d52c78..24fd7dab 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @NgModule({ @@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[PreviousRouteRecorder], + providers:[], exports: [ OpenaireSearchResearchResultsComponent ]