From 37f6c344e6b84d43c639d2b1cd497a04e3794b98 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Sun, 12 Jul 2020 14:40:41 +0000 Subject: [PATCH] [Trunk | Explore]: Remove IsRouteEnabled guard from landing and search pages (these pages should load even when not active - existing links from other pages). git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@59070 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../landingPages/dataProvider/dataProvider-routing.module.ts | 3 +-- .../app/landingPages/dataProvider/libDataProvider.module.ts | 3 +-- .../src/app/landingPages/dataset/dataset-routing.module.ts | 3 +-- explore/src/app/landingPages/dataset/libDataset.module.ts | 3 +-- .../htmlProjectReport/htmlProjectReport-routing.module.ts | 3 +-- .../htmlProjectReport/libHtmlProjectReport.module.ts | 3 +-- .../app/landingPages/organization/libOrganization.module.ts | 3 +-- .../landingPages/organization/organization-routing.module.ts | 3 +-- explore/src/app/landingPages/orp/libOrp.module.ts | 3 +-- explore/src/app/landingPages/orp/orp-routing.module.ts | 3 +-- explore/src/app/landingPages/project/libProject.module.ts | 3 +-- .../src/app/landingPages/project/project-routing.module.ts | 4 +--- .../src/app/landingPages/publication/libPublication.module.ts | 3 +-- .../landingPages/publication/publication-routing.module.ts | 4 +--- explore/src/app/landingPages/software/libSoftware.module.ts | 3 +-- .../src/app/landingPages/software/software-routing.module.ts | 3 +-- .../advanced/advancedSearchDataProviders.module.ts | 3 +-- .../app/searchPages/advanced/advancedSearchDatasets.module.ts | 3 +-- .../advanced/advancedSearchOrganizations.module.ts | 3 +-- .../src/app/searchPages/advanced/advancedSearchOrps.module.ts | 3 +-- .../app/searchPages/advanced/advancedSearchProjects.module.ts | 3 +-- .../searchPages/advanced/advancedSearchPublications.module.ts | 3 +-- .../app/searchPages/advanced/advancedSearchSoftware.module.ts | 3 +-- .../app/searchPages/advanced/searchResearchResults.module.ts | 3 +-- .../dataProviders/compatibleDataProviders-routing.module.ts | 3 +-- .../dataProviders/compatibleDataProviders.module.ts | 3 +-- .../compatibleDataProvidersTable-routing.module.ts | 3 +-- .../dataProviders/compatibleDataProvidersTable.module.ts | 3 +-- .../dataProviders/entityRegistries-routing.module.ts | 3 +-- .../app/searchPages/dataProviders/entityRegistries.module.ts | 3 +-- .../dataProviders/entityRegistriesTable-routing.module.ts | 3 +-- .../searchPages/dataProviders/entityRegistriesTable.module.ts | 3 +-- .../app/searchPages/dataProviders/journals-routing.module.ts | 3 +-- explore/src/app/searchPages/dataProviders/journals.module.ts | 3 +-- .../searchPages/dataProviders/journalsTable-routing.module.ts | 4 +--- .../src/app/searchPages/dataProviders/journalsTable.module.ts | 3 +-- .../src/app/searchPages/simple/searchDataProviders.module.ts | 3 +-- explore/src/app/searchPages/simple/searchDatasets.module.ts | 3 +-- .../src/app/searchPages/simple/searchOrganizations.module.ts | 3 +-- explore/src/app/searchPages/simple/searchOrps.module.ts | 3 +-- explore/src/app/searchPages/simple/searchProjects.module.ts | 3 +-- .../src/app/searchPages/simple/searchPublications.module.ts | 3 +-- .../app/searchPages/simple/searchResearchResults.module.ts | 3 +-- explore/src/app/searchPages/simple/searchSoftware.module.ts | 4 +--- 44 files changed, 44 insertions(+), 92 deletions(-) diff --git a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts index c9e1d332..4399ff01 100644 --- a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import { OpenaireDataProviderComponent } from './dataProvider.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts b/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts index e1b38198..2f08f120 100644 --- a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts +++ b/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts @@ -7,12 +7,11 @@ import { OpenaireDataProviderComponent } from './dataProvider.component'; import {DataProviderRoutingModule} from './dataProvider-routing.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [DataProviderModule, DataProviderRoutingModule], declarations:[OpenaireDataProviderComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireDataProviderComponent] }) export class LibDataProviderModule { } diff --git a/explore/src/app/landingPages/dataset/dataset-routing.module.ts b/explore/src/app/landingPages/dataset/dataset-routing.module.ts index e5a53a5c..adf08896 100644 --- a/explore/src/app/landingPages/dataset/dataset-routing.module.ts +++ b/explore/src/app/landingPages/dataset/dataset-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import { OpenaireDatasetComponent } from './dataset.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/dataset/libDataset.module.ts b/explore/src/app/landingPages/dataset/libDataset.module.ts index 0cec1847..661e425a 100644 --- a/explore/src/app/landingPages/dataset/libDataset.module.ts +++ b/explore/src/app/landingPages/dataset/libDataset.module.ts @@ -7,13 +7,12 @@ import { RouterModule } from '@angular/router'; import { OpenaireDatasetComponent } from './dataset.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {DatasetRoutingModule} from './dataset-routing.module'; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ imports: [DatasetRoutingModule, ResultLandingModule], declarations:[OpenaireDatasetComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireDatasetComponent] }) export class LibDatasetModule { } diff --git a/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts index 7d3895a8..0ae291f2 100644 --- a/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts +++ b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts @@ -4,11 +4,10 @@ import { RouterModule } from '@angular/router'; import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]} + { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]} ]) ] }) diff --git a/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts index 769370d8..b7e07733 100644 --- a/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts +++ b/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts @@ -7,14 +7,13 @@ import { RouterModule } from '@angular/router'; import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; @NgModule({ imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule], declarations:[OpenaireHtmlProjectReportComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireHtmlProjectReportComponent] }) export class LibHtmlProjectReportModule { } diff --git a/explore/src/app/landingPages/organization/libOrganization.module.ts b/explore/src/app/landingPages/organization/libOrganization.module.ts index 4fc9dfb2..53e969a9 100644 --- a/explore/src/app/landingPages/organization/libOrganization.module.ts +++ b/explore/src/app/landingPages/organization/libOrganization.module.ts @@ -7,14 +7,13 @@ import { RouterModule } from '@angular/router'; import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireOrganizationComponent } from './organization.component'; import {OrganizationRoutingModule} from './organization-routing.module'; @NgModule({ imports: [OrganizationModule, OrganizationRoutingModule], declarations:[OpenaireOrganizationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireOrganizationComponent] }) export class LibOrganizationModule { } diff --git a/explore/src/app/landingPages/organization/organization-routing.module.ts b/explore/src/app/landingPages/organization/organization-routing.module.ts index a8d3e704..22aac9b0 100644 --- a/explore/src/app/landingPages/organization/organization-routing.module.ts +++ b/explore/src/app/landingPages/organization/organization-routing.module.ts @@ -4,14 +4,13 @@ import { RouterModule } from '@angular/router'; import { OpenaireOrganizationComponent } from './organization.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/orp/libOrp.module.ts b/explore/src/app/landingPages/orp/libOrp.module.ts index fad0ec43..69a1b09f 100644 --- a/explore/src/app/landingPages/orp/libOrp.module.ts +++ b/explore/src/app/landingPages/orp/libOrp.module.ts @@ -7,13 +7,12 @@ import { RouterModule } from '@angular/router'; import { OpenaireOrpComponent } from './orp.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {OrpRoutingModule} from './orp-routing.module'; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ imports: [OrpRoutingModule, ResultLandingModule], declarations:[OpenaireOrpComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireOrpComponent] }) export class LibOrpModule { } diff --git a/explore/src/app/landingPages/orp/orp-routing.module.ts b/explore/src/app/landingPages/orp/orp-routing.module.ts index 8ac82b7b..c29ca7cb 100644 --- a/explore/src/app/landingPages/orp/orp-routing.module.ts +++ b/explore/src/app/landingPages/orp/orp-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import { OpenaireOrpComponent } from './orp.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/project/libProject.module.ts b/explore/src/app/landingPages/project/libProject.module.ts index 8e2dbd96..c2a0ba22 100644 --- a/explore/src/app/landingPages/project/libProject.module.ts +++ b/explore/src/app/landingPages/project/libProject.module.ts @@ -7,14 +7,13 @@ import { RouterModule } from '@angular/router'; import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireProjectComponent } from './project.component'; import {ProjectRoutingModule} from './project-routing.module'; @NgModule({ imports: [ProjectModule, ProjectRoutingModule], declarations:[OpenaireProjectComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireProjectComponent] }) export class LibProjectModule { } diff --git a/explore/src/app/landingPages/project/project-routing.module.ts b/explore/src/app/landingPages/project/project-routing.module.ts index 23d2efac..fddcba0e 100644 --- a/explore/src/app/landingPages/project/project-routing.module.ts +++ b/explore/src/app/landingPages/project/project-routing.module.ts @@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router'; import { OpenaireProjectComponent } from './project.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/publication/libPublication.module.ts b/explore/src/app/landingPages/publication/libPublication.module.ts index cb00d54e..7e510e2f 100644 --- a/explore/src/app/landingPages/publication/libPublication.module.ts +++ b/explore/src/app/landingPages/publication/libPublication.module.ts @@ -6,7 +6,6 @@ import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenairePublicationComponent } from './publication.component'; import {PublicationRoutingModule} from './publication-routing.module'; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @@ -14,7 +13,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res @NgModule({ imports: [PublicationRoutingModule, ResultLandingModule], declarations:[OpenairePublicationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenairePublicationComponent] }) export class LibPublicationModule { } diff --git a/explore/src/app/landingPages/publication/publication-routing.module.ts b/explore/src/app/landingPages/publication/publication-routing.module.ts index 629d8467..147ceb00 100644 --- a/explore/src/app/landingPages/publication/publication-routing.module.ts +++ b/explore/src/app/landingPages/publication/publication-routing.module.ts @@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router'; import {OpenairePublicationComponent } from './publication.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/software/libSoftware.module.ts b/explore/src/app/landingPages/software/libSoftware.module.ts index d534488c..7065214b 100644 --- a/explore/src/app/landingPages/software/libSoftware.module.ts +++ b/explore/src/app/landingPages/software/libSoftware.module.ts @@ -6,14 +6,13 @@ import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireSoftwareComponent } from './software.component'; import {SoftwareRoutingModule} from './software-routing.module'; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ imports: [SoftwareRoutingModule, ResultLandingModule], declarations:[OpenaireSoftwareComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireSoftwareComponent] }) export class LibSoftwareModule { } diff --git a/explore/src/app/landingPages/software/software-routing.module.ts b/explore/src/app/landingPages/software/software-routing.module.ts index 845f9fd3..f7ad55b8 100644 --- a/explore/src/app/landingPages/software/software-routing.module.ts +++ b/explore/src/app/landingPages/software/software-routing.module.ts @@ -4,12 +4,11 @@ import { RouterModule } from '@angular/router'; import {OpenaireSoftwareComponent } from './software.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder] } + { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] } ]) ] }) diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts index 94a260d7..a9760ce4 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts @@ -6,7 +6,6 @@ import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProv import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ @@ -19,7 +18,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireAdvancedSearchDataProvidersComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchDataProvidersComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts index d9a2d34f..d6bb45c0 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts @@ -6,7 +6,6 @@ import {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-rout import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; @NgModule({ @@ -18,7 +17,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP declarations: [ OpenaireAdvancedSearchDatasetsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchDatasetsComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts index eb04c28c..a9eabc41 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts @@ -6,7 +6,6 @@ import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganiza import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; @NgModule({ @@ -19,7 +18,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireAdvancedSearchOrganizationsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchOrganizationsComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts index d7b94ae3..b4b2d608 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts @@ -6,7 +6,6 @@ import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.modu import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; @@ -19,7 +18,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP declarations: [ OpenaireAdvancedSearchOrpsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchOrpsComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts index 9ff82ed6..a8c9edc1 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts @@ -5,7 +5,6 @@ import {FormsModule} from '@angular/forms'; import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module'; import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module"; @NgModule({ @@ -18,7 +17,7 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj declarations: [ OpenaireAdvancedSearchProjectsComponent ], - providers: [FreeGuard, IsRouteEnabled], + providers: [FreeGuard], exports: [ OpenaireAdvancedSearchProjectsComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts index 09ea81b8..0d2f393b 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts @@ -6,7 +6,6 @@ import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublicati import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; @NgModule({ @@ -18,7 +17,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP declarations: [ OpenaireAdvancedSearchPublicationsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchPublicationsComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts index d49fec84..89dee8c9 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts @@ -7,7 +7,6 @@ import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware. import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; @NgModule({ @@ -19,7 +18,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP declarations: [ OpenaireAdvancedSearchSoftwareComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchSoftwareComponent ] diff --git a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts index f4953976..795c61fa 100644 --- a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.com import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @NgModule({ @@ -19,7 +18,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchResearchResultsComponent ] diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts index 6221c85d..764e8905 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts index b7a95c6a..f2886521 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataPro import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @@ -22,7 +21,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchCompatibleDataprovidersComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireSearchCompatibleDataprovidersComponent ] diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts index d3d7b170..4475308a 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts index 495ccacf..249a8ec9 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts @@ -6,7 +6,6 @@ import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDa import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module'; @NgModule({ @@ -15,7 +14,7 @@ import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/search CompatibleDataProvidersTableModule, CompatibleDataProvidersTableRoutingModule - ], providers:[FreeGuard, IsRouteEnabled], + ], providers:[FreeGuard], declarations: [ OpenaireSearchCompatibleDataprovidersTableComponent ], diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts index b1baff2a..6219d879 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts @@ -4,12 +4,11 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts index 669bde88..3b0f1f0a 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts @@ -6,7 +6,6 @@ import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @@ -20,7 +19,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchEntityRegistriesComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireSearchEntityRegistriesComponent ] diff --git a/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts index d0f2250a..04198eb4 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts index 6cb59045..fa3a15c9 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts @@ -8,7 +8,6 @@ import { EntityRegistriesTableModule} from '../../openaireLibrary/searchPages/d import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ @@ -16,7 +15,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; EntityRegistriesTableRoutingModule, EntityRegistriesTableModule - ], providers:[FreeGuard, IsRouteEnabled], + ], providers:[FreeGuard], declarations: [ OpenaireSearchEntityRegistriesTableComponent ], diff --git a/explore/src/app/searchPages/dataProviders/journals-routing.module.ts b/explore/src/app/searchPages/dataProviders/journals-routing.module.ts index 5c433252..53556ba4 100644 --- a/explore/src/app/searchPages/dataProviders/journals-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/journals-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchJournalsComponent} from './journals.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/journals.module.ts b/explore/src/app/searchPages/dataProviders/journals.module.ts index 3694415d..42ae46d5 100644 --- a/explore/src/app/searchPages/dataProviders/journals.module.ts +++ b/explore/src/app/searchPages/dataProviders/journals.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchJournalsComponent} from './journals.component'; import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ imports: [ @@ -17,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchJournalsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireSearchJournalsComponent ] diff --git a/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts index 6f3aaf79..2991cf0b 100644 --- a/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts @@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchJournalsTableComponent} from './journalsTable.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' } , canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/journalsTable.module.ts b/explore/src/app/searchPages/dataProviders/journalsTable.module.ts index c821bd2b..d96f37d6 100644 --- a/explore/src/app/searchPages/dataProviders/journalsTable.module.ts +++ b/explore/src/app/searchPages/dataProviders/journalsTable.module.ts @@ -8,7 +8,6 @@ import {JournalsTableRoutingModule} from './journalsTable-routing.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module'; @NgModule({ @@ -16,7 +15,7 @@ import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProvid CommonModule, FormsModule, JournalsTableModule, JournalsTableRoutingModule - ], providers:[FreeGuard, IsRouteEnabled], + ], providers:[FreeGuard], declarations: [ OpenaireSearchJournalsTableComponent ], diff --git a/explore/src/app/searchPages/simple/searchDataProviders.module.ts b/explore/src/app/searchPages/simple/searchDataProviders.module.ts index 22cf3ede..f3902ea9 100644 --- a/explore/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/explore/src/app/searchPages/simple/searchDataProviders.module.ts @@ -5,7 +5,6 @@ import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.compon import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module'; @NgModule({ imports: [ @@ -16,7 +15,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule declarations: [ OpenaireSearchDataprovidersComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchDataprovidersComponent ] diff --git a/explore/src/app/searchPages/simple/searchDatasets.module.ts b/explore/src/app/searchPages/simple/searchDatasets.module.ts index 72ab159a..466e71ac 100644 --- a/explore/src/app/searchPages/simple/searchDatasets.module.ts +++ b/explore/src/app/searchPages/simple/searchDatasets.module.ts @@ -7,7 +7,6 @@ import {OpenaireSearchDatasetsComponent} from './searchDatasets.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; @@ -20,7 +19,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim declarations: [ OpenaireSearchDatasetsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchDatasetsComponent ] diff --git a/explore/src/app/searchPages/simple/searchOrganizations.module.ts b/explore/src/app/searchPages/simple/searchOrganizations.module.ts index e9749434..2b07d596 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.compone import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; @@ -20,7 +19,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchOrganizationsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchOrganizationsComponent ] diff --git a/explore/src/app/searchPages/simple/searchOrps.module.ts b/explore/src/app/searchPages/simple/searchOrps.module.ts index 486eb077..7b891e03 100644 --- a/explore/src/app/searchPages/simple/searchOrps.module.ts +++ b/explore/src/app/searchPages/simple/searchOrps.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchOrpsComponent} from './searchOrps.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; @@ -20,7 +19,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim declarations: [ OpenaireSearchOrpsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchOrpsComponent ] diff --git a/explore/src/app/searchPages/simple/searchProjects.module.ts b/explore/src/app/searchPages/simple/searchProjects.module.ts index 6624f7c5..d07e3e05 100644 --- a/explore/src/app/searchPages/simple/searchProjects.module.ts +++ b/explore/src/app/searchPages/simple/searchProjects.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchProjectsComponent} from './searchProjects.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module'; @NgModule({ imports: [ @@ -17,7 +16,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro declarations: [ OpenaireSearchProjectsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchProjectsComponent ] diff --git a/explore/src/app/searchPages/simple/searchPublications.module.ts b/explore/src/app/searchPages/simple/searchPublications.module.ts index 87222d53..12e07a31 100644 --- a/explore/src/app/searchPages/simple/searchPublications.module.ts +++ b/explore/src/app/searchPages/simple/searchPublications.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchPublicationsComponent} from './searchPublications.component import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; @NgModule({ @@ -19,7 +18,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim declarations: [ OpenaireSearchPublicationsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchPublicationsComponent ] diff --git a/explore/src/app/searchPages/simple/searchResearchResults.module.ts b/explore/src/app/searchPages/simple/searchResearchResults.module.ts index 41765a52..e50f83ad 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults.module.ts @@ -7,7 +7,6 @@ import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.com import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @NgModule({ @@ -19,7 +18,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchResearchResultsComponent ] diff --git a/explore/src/app/searchPages/simple/searchSoftware.module.ts b/explore/src/app/searchPages/simple/searchSoftware.module.ts index 629e811e..7ac9a01d 100644 --- a/explore/src/app/searchPages/simple/searchSoftware.module.ts +++ b/explore/src/app/searchPages/simple/searchSoftware.module.ts @@ -6,7 +6,6 @@ import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module'; import{OpenaireSearchSoftwareComponent} from './searchSoftware.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; @@ -17,8 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim declarations: [ OpenaireSearchSoftwareComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled - ], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchSoftwareComponent ]