MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 23 Wiki Activity

[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
This commit is contained in:
konstantina.galouni 2020-07-12 14:40:41 +00:00
parent bb64c1368d
commit 37f6c344e6
44 changed files with 44 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
View File

@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
import { OpenaireDataProviderComponent } from './dataProvider.component'; import { OpenaireDataProviderComponent } from './dataProvider.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

3
explore/src/app/landingPages/dataProvider/libDataProvider.module.ts
View File

@ -7,12 +7,11 @@ import { OpenaireDataProviderComponent } from './dataProvider.component';
import {DataProviderRoutingModule} from './dataProvider-routing.module'; import {DataProviderRoutingModule} from './dataProvider-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [DataProviderModule, DataProviderRoutingModule], imports: [DataProviderModule, DataProviderRoutingModule],
declarations:[OpenaireDataProviderComponent], declarations:[OpenaireDataProviderComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenaireDataProviderComponent] exports:[OpenaireDataProviderComponent]
}) })
export class LibDataProviderModule { } export class LibDataProviderModule { }

3
explore/src/app/landingPages/dataset/dataset-routing.module.ts
View File

@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
import { OpenaireDatasetComponent } from './dataset.component'; import { OpenaireDatasetComponent } from './dataset.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

3
explore/src/app/landingPages/dataset/libDataset.module.ts
View File

@ -7,13 +7,12 @@ import { RouterModule } from '@angular/router';
import { OpenaireDatasetComponent } from './dataset.component'; import { OpenaireDatasetComponent } from './dataset.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {DatasetRoutingModule} from './dataset-routing.module'; import {DatasetRoutingModule} from './dataset-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({ @NgModule({
imports: [DatasetRoutingModule, ResultLandingModule], imports: [DatasetRoutingModule, ResultLandingModule],
declarations:[OpenaireDatasetComponent], declarations:[OpenaireDatasetComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenaireDatasetComponent] exports:[OpenaireDatasetComponent]
}) })
export class LibDatasetModule { } export class LibDatasetModule { }

3
explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
View File

@ -4,11 +4,10 @@ import { RouterModule } from '@angular/router';
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]} { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]}
]) ])
] ]
}) })

3
explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
View File

@ -7,14 +7,13 @@ import { RouterModule } from '@angular/router';
import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module'; import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
@NgModule({ @NgModule({
imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule], imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
declarations:[OpenaireHtmlProjectReportComponent], declarations:[OpenaireHtmlProjectReportComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenaireHtmlProjectReportComponent] exports:[OpenaireHtmlProjectReportComponent]
}) })
export class LibHtmlProjectReportModule { } export class LibHtmlProjectReportModule { }

3
explore/src/app/landingPages/organization/libOrganization.module.ts
View File

@ -7,14 +7,13 @@ import { RouterModule } from '@angular/router';
import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module'; import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireOrganizationComponent } from './organization.component'; import { OpenaireOrganizationComponent } from './organization.component';
import {OrganizationRoutingModule} from './organization-routing.module'; import {OrganizationRoutingModule} from './organization-routing.module';
@NgModule({ @NgModule({
imports: [OrganizationModule, OrganizationRoutingModule], imports: [OrganizationModule, OrganizationRoutingModule],
declarations:[OpenaireOrganizationComponent], declarations:[OpenaireOrganizationComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenaireOrganizationComponent] exports:[OpenaireOrganizationComponent]
}) })
export class LibOrganizationModule { } export class LibOrganizationModule { }

3
explore/src/app/landingPages/organization/organization-routing.module.ts
View File

@ -4,14 +4,13 @@ import { RouterModule } from '@angular/router';
import { OpenaireOrganizationComponent } from './organization.component'; import { OpenaireOrganizationComponent } from './organization.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

3
explore/src/app/landingPages/orp/libOrp.module.ts
View File

@ -7,13 +7,12 @@ import { RouterModule } from '@angular/router';
import { OpenaireOrpComponent } from './orp.component'; import { OpenaireOrpComponent } from './orp.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OrpRoutingModule} from './orp-routing.module'; import {OrpRoutingModule} from './orp-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({ @NgModule({
imports: [OrpRoutingModule, ResultLandingModule], imports: [OrpRoutingModule, ResultLandingModule],
declarations:[OpenaireOrpComponent], declarations:[OpenaireOrpComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenaireOrpComponent] exports:[OpenaireOrpComponent]
}) })
export class LibOrpModule { } export class LibOrpModule { }

3
explore/src/app/landingPages/orp/orp-routing.module.ts
View File

@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
import { OpenaireOrpComponent } from './orp.component'; import { OpenaireOrpComponent } from './orp.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

3
explore/src/app/landingPages/project/libProject.module.ts
View File

@ -7,14 +7,13 @@ import { RouterModule } from '@angular/router';
import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module'; import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireProjectComponent } from './project.component'; import { OpenaireProjectComponent } from './project.component';
import {ProjectRoutingModule} from './project-routing.module'; import {ProjectRoutingModule} from './project-routing.module';
@NgModule({ @NgModule({
imports: [ProjectModule, ProjectRoutingModule], imports: [ProjectModule, ProjectRoutingModule],
declarations:[OpenaireProjectComponent], declarations:[OpenaireProjectComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenaireProjectComponent] exports:[OpenaireProjectComponent]
}) })
export class LibProjectModule { } export class LibProjectModule { }

4
explore/src/app/landingPages/project/project-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import { OpenaireProjectComponent } from './project.component'; import { OpenaireProjectComponent } from './project.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

3
explore/src/app/landingPages/publication/libPublication.module.ts
View File

@ -6,7 +6,6 @@ import { SharedModule } from '../../shared/shared.module';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenairePublicationComponent } from './publication.component'; import { OpenairePublicationComponent } from './publication.component';
import {PublicationRoutingModule} from './publication-routing.module'; import {PublicationRoutingModule} from './publication-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@ -14,7 +13,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
@NgModule({ @NgModule({
imports: [PublicationRoutingModule, ResultLandingModule], imports: [PublicationRoutingModule, ResultLandingModule],
declarations:[OpenairePublicationComponent], declarations:[OpenairePublicationComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenairePublicationComponent] exports:[OpenairePublicationComponent]
}) })
export class LibPublicationModule { } export class LibPublicationModule { }

4
explore/src/app/landingPages/publication/publication-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import {OpenairePublicationComponent } from './publication.component'; import {OpenairePublicationComponent } from './publication.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

3
explore/src/app/landingPages/software/libSoftware.module.ts
View File

@ -6,14 +6,13 @@ import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireSoftwareComponent } from './software.component'; import { OpenaireSoftwareComponent } from './software.component';
import {SoftwareRoutingModule} from './software-routing.module'; import {SoftwareRoutingModule} from './software-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({ @NgModule({
imports: [SoftwareRoutingModule, ResultLandingModule], imports: [SoftwareRoutingModule, ResultLandingModule],
declarations:[OpenaireSoftwareComponent], declarations:[OpenaireSoftwareComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder],
exports:[OpenaireSoftwareComponent] exports:[OpenaireSoftwareComponent]
}) })
export class LibSoftwareModule { } export class LibSoftwareModule { }

3
explore/src/app/landingPages/software/software-routing.module.ts
View File

@ -4,12 +4,11 @@ import { RouterModule } from '@angular/router';
import {OpenaireSoftwareComponent } from './software.component'; import {OpenaireSoftwareComponent } from './software.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder] } { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
]) ])
] ]
}) })

3
explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
View File

@ -6,7 +6,6 @@ import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProv
import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({ @NgModule({
@ -19,7 +18,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireAdvancedSearchDataProvidersComponent OpenaireAdvancedSearchDataProvidersComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchDataProvidersComponent OpenaireAdvancedSearchDataProvidersComponent
] ]

3
explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
View File

@ -6,7 +6,6 @@ import {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-rout
import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({ @NgModule({
@ -18,7 +17,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP
declarations: [ declarations: [
OpenaireAdvancedSearchDatasetsComponent OpenaireAdvancedSearchDatasetsComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchDatasetsComponent OpenaireAdvancedSearchDatasetsComponent
] ]

3
explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
View File

@ -6,7 +6,6 @@ import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganiza
import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
@NgModule({ @NgModule({
@ -19,7 +18,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireAdvancedSearchOrganizationsComponent OpenaireAdvancedSearchOrganizationsComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchOrganizationsComponent OpenaireAdvancedSearchOrganizationsComponent
] ]

3
explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts
View File

@ -6,7 +6,6 @@ import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.modu
import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@ -19,7 +18,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP
declarations: [ declarations: [
OpenaireAdvancedSearchOrpsComponent OpenaireAdvancedSearchOrpsComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchOrpsComponent OpenaireAdvancedSearchOrpsComponent
] ]

3
explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts
View File

@ -5,7 +5,6 @@ import {FormsModule} from '@angular/forms';
import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module'; import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module"; import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module";
@NgModule({ @NgModule({
@ -18,7 +17,7 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj
declarations: [ declarations: [
OpenaireAdvancedSearchProjectsComponent OpenaireAdvancedSearchProjectsComponent
], ],
providers: [FreeGuard, IsRouteEnabled], providers: [FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchProjectsComponent OpenaireAdvancedSearchProjectsComponent
] ]

3
explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts
View File

@ -6,7 +6,6 @@ import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublicati
import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({ @NgModule({
@ -18,7 +17,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP
declarations: [ declarations: [
OpenaireAdvancedSearchPublicationsComponent OpenaireAdvancedSearchPublicationsComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchPublicationsComponent OpenaireAdvancedSearchPublicationsComponent
] ]

3
explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
View File

@ -7,7 +7,6 @@ import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({ @NgModule({
@ -19,7 +18,7 @@ import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchP
declarations: [ declarations: [
OpenaireAdvancedSearchSoftwareComponent OpenaireAdvancedSearchSoftwareComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchSoftwareComponent OpenaireAdvancedSearchSoftwareComponent
] ]

3
explore/src/app/searchPages/advanced/searchResearchResults.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.com
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
@NgModule({ @NgModule({
@ -19,7 +18,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
declarations: [ declarations: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
] ]

3
explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
View File

@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataPro
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.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 { CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@ -22,7 +21,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchCompatibleDataprovidersComponent OpenaireSearchCompatibleDataprovidersComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireSearchCompatibleDataprovidersComponent OpenaireSearchCompatibleDataprovidersComponent
] ]

3
explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
View File

@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts
View File

@ -6,7 +6,6 @@ import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDa
import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module'; import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module'; import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module';
@NgModule({ @NgModule({
@ -15,7 +14,7 @@ import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/search
CompatibleDataProvidersTableModule, CompatibleDataProvidersTableModule,
CompatibleDataProvidersTableRoutingModule CompatibleDataProvidersTableRoutingModule
], providers:[FreeGuard, IsRouteEnabled], ], providers:[FreeGuard],
declarations: [ declarations: [
OpenaireSearchCompatibleDataprovidersTableComponent OpenaireSearchCompatibleDataprovidersTableComponent
], ],

3
explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts
View File

@ -4,12 +4,11 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/dataProviders/entityRegistries.module.ts
View File

@ -6,7 +6,6 @@ import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module';
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.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 {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@ -20,7 +19,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchEntityRegistriesComponent OpenaireSearchEntityRegistriesComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireSearchEntityRegistriesComponent OpenaireSearchEntityRegistriesComponent
] ]

3
explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts
View File

@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts
View File

@ -8,7 +8,6 @@ import { EntityRegistriesTableModule} from '../../openaireLibrary/searchPages/d
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
@ -16,7 +15,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
EntityRegistriesTableRoutingModule, EntityRegistriesTableRoutingModule,
EntityRegistriesTableModule EntityRegistriesTableModule
], providers:[FreeGuard, IsRouteEnabled], ], providers:[FreeGuard],
declarations: [ declarations: [
OpenaireSearchEntityRegistriesTableComponent OpenaireSearchEntityRegistriesTableComponent
], ],

3
explore/src/app/searchPages/dataProviders/journals-routing.module.ts
View File

@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchJournalsComponent} from './journals.component'; import{OpenaireSearchJournalsComponent} from './journals.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/dataProviders/journals.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchJournalsComponent} from './journals.component';
import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.module'; import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({ @NgModule({
imports: [ imports: [
@ -17,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchJournalsComponent OpenaireSearchJournalsComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireSearchJournalsComponent OpenaireSearchJournalsComponent
] ]

4
explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchJournalsTableComponent} from './journalsTable.component'; import{OpenaireSearchJournalsTableComponent} from './journalsTable.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire' redirect: '/error', community : 'openaire'
} , canDeactivate: [PreviousRouteRecorder] } } , canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/dataProviders/journalsTable.module.ts
View File

@ -8,7 +8,6 @@ import {JournalsTableRoutingModule} from './journalsTable-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module'; import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module';
@NgModule({ @NgModule({
@ -16,7 +15,7 @@ import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProvid
CommonModule, FormsModule, CommonModule, FormsModule,
JournalsTableModule, JournalsTableRoutingModule JournalsTableModule, JournalsTableRoutingModule
], providers:[FreeGuard, IsRouteEnabled], ], providers:[FreeGuard],
declarations: [ declarations: [
OpenaireSearchJournalsTableComponent OpenaireSearchJournalsTableComponent
], ],

3
explore/src/app/searchPages/simple/searchDataProviders.module.ts
View File

@ -5,7 +5,6 @@ import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.compon
import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module'; import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module';
@NgModule({ @NgModule({
imports: [ imports: [
@ -16,7 +15,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule
declarations: [ declarations: [
OpenaireSearchDataprovidersComponent OpenaireSearchDataprovidersComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchDataprovidersComponent OpenaireSearchDataprovidersComponent
] ]

3
explore/src/app/searchPages/simple/searchDatasets.module.ts
View File

@ -7,7 +7,6 @@ import {OpenaireSearchDatasetsComponent} from './searchDatasets.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@ -20,7 +19,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim
declarations: [ declarations: [
OpenaireSearchDatasetsComponent OpenaireSearchDatasetsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchDatasetsComponent OpenaireSearchDatasetsComponent
] ]

3
explore/src/app/searchPages/simple/searchOrganizations.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.compone
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
@ -20,7 +19,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
declarations: [ declarations: [
OpenaireSearchOrganizationsComponent OpenaireSearchOrganizationsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchOrganizationsComponent OpenaireSearchOrganizationsComponent
] ]

3
explore/src/app/searchPages/simple/searchOrps.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchOrpsComponent} from './searchOrps.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@ -20,7 +19,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim
declarations: [ declarations: [
OpenaireSearchOrpsComponent OpenaireSearchOrpsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchOrpsComponent OpenaireSearchOrpsComponent
] ]

3
explore/src/app/searchPages/simple/searchProjects.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchProjectsComponent} from './searchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module'; import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module';
@NgModule({ @NgModule({
imports: [ imports: [
@ -17,7 +16,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro
declarations: [ declarations: [
OpenaireSearchProjectsComponent OpenaireSearchProjectsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchProjectsComponent OpenaireSearchProjectsComponent
] ]

3
explore/src/app/searchPages/simple/searchPublications.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchPublicationsComponent} from './searchPublications.component
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({ @NgModule({
@ -19,7 +18,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim
declarations: [ declarations: [
OpenaireSearchPublicationsComponent OpenaireSearchPublicationsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchPublicationsComponent OpenaireSearchPublicationsComponent
] ]

3
explore/src/app/searchPages/simple/searchResearchResults.module.ts
View File

@ -7,7 +7,6 @@ import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.com
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
@NgModule({ @NgModule({
@ -19,7 +18,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
declarations: [ declarations: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchResearchResultsComponent OpenaireSearchResearchResultsComponent
] ]

4
explore/src/app/searchPages/simple/searchSoftware.module.ts
View File

@ -6,7 +6,6 @@ import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module';
import{OpenaireSearchSoftwareComponent} from './searchSoftware.component'; import{OpenaireSearchSoftwareComponent} from './searchSoftware.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@ -17,8 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim
declarations: [ declarations: [
OpenaireSearchSoftwareComponent OpenaireSearchSoftwareComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled providers:[FreeGuard,PreviousRouteRecorder],
],
exports: [ exports: [
OpenaireSearchSoftwareComponent OpenaireSearchSoftwareComponent
] ]