MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

[Trunk | Connect]: 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-connect-portal/trunk@59100 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2020-07-13 22:56:30 +00:00
parent eaeb18c978
commit 8364098d10
43 changed files with 52 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,12 +4,11 @@ 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' redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

6
src/app/landingPages/dataProvider/libDataProvider.module.ts
View File

@ -1,18 +1,14 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module'; import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
import { OpenaireDataProviderComponent } from './dataProvider.component'; 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
src/app/landingPages/dataset/dataset-routing.module.ts
View File

@ -4,12 +4,11 @@ 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' redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

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

@ -2,13 +2,12 @@ import { NgModule} from '@angular/core';
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
src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
View File

@ -4,13 +4,12 @@ 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], { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],
data: { data: {
redirect: '/error' redirect: '/error'
},canDeactivate: [PreviousRouteRecorder]} },canDeactivate: [PreviousRouteRecorder]}

8
src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
View File

@ -1,20 +1,14 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
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 { }

8
src/app/landingPages/organization/libOrganization.module.ts
View File

@ -1,20 +1,14 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
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
src/app/landingPages/organization/organization-routing.module.ts
View File

@ -4,13 +4,12 @@ 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' redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

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

@ -1,7 +1,6 @@
import {NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
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 {OpenaireOrpComponent} from './orp.component'; import {OpenaireOrpComponent} from './orp.component';
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";
@ -14,7 +13,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
OpenaireOrpComponent OpenaireOrpComponent
], ],
providers: [ providers: [
FreeGuard, PreviousRouteRecorder, IsRouteEnabled FreeGuard, PreviousRouteRecorder
], ],
exports: [ exports: [
OpenaireOrpComponent OpenaireOrpComponent

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

@ -4,12 +4,11 @@ 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' redirect: '/error'
}, },
canDeactivate: [PreviousRouteRecorder] canDeactivate: [PreviousRouteRecorder]

8
src/app/landingPages/project/libProject.module.ts
View File

@ -1,20 +1,14 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
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 { }

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

@ -4,12 +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' redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

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

@ -1,7 +1,6 @@
import { NgModule} from '@angular/core'; import { NgModule} from '@angular/core';
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";
@ -9,7 +8,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 { }

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

@ -4,12 +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' redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

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

@ -1,14 +1,13 @@
import { NgModule} from '@angular/core'; import { NgModule} from '@angular/core';
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
src/app/landingPages/software/software-routing.module.ts
View File

@ -4,13 +4,12 @@ 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], data: { { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
},canDeactivate: [PreviousRouteRecorder] } },canDeactivate: [PreviousRouteRecorder] }
]) ])

5
src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
View File

@ -2,9 +2,6 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
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';
@ -12,7 +9,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

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

@ -6,7 +6,6 @@ import { AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-rou
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
] ]

4
src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
View File

@ -4,13 +4,11 @@ import {RouterModule} from '@angular/router';
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 {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: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

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

@ -6,7 +6,6 @@ import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.
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 {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
OpenaireAdvancedSearchOrpsComponent OpenaireAdvancedSearchOrpsComponent
], ],
providers: [ providers: [
FreeGuard, IsRouteEnabled FreeGuard
], ],
exports: [ exports: [
OpenaireAdvancedSearchOrpsComponent OpenaireAdvancedSearchOrpsComponent

4
src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
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 {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: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
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
] ]

1
src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
View File

@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.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: [

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

@ -6,7 +6,6 @@ import {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-rout
import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.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: [
OpenaireAdvancedSearchSoftwareComponent OpenaireAdvancedSearchSoftwareComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers:[FreeGuard],
exports: [ exports: [
OpenaireAdvancedSearchSoftwareComponent OpenaireAdvancedSearchSoftwareComponent
] ]

1
src/app/searchPages/advanced/searchResearchResults-routing.module.ts
View File

@ -5,7 +5,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';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([

3
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
] ]

8
src/app/searchPages/find/libSearch.module.ts
View File

@ -1,22 +1,16 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
import { RouterModule } from '@angular/router';
import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module'; import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module';
import { OpenaireSearchComponent } from './search.component'; import { OpenaireSearchComponent } from './search.component';
import { MainSearchRoutingModule } from './mainSearch-routing.module'; import { MainSearchRoutingModule } from './mainSearch-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 {SearchAllModule} from "../../openaireLibrary/searchPages/find/searchAll.module"; import {SearchAllModule} from "../../openaireLibrary/searchPages/find/searchAll.module";
@NgModule({ @NgModule({
imports: [MainSearchRoutingModule, MainSearchModule, SearchAllModule], imports: [MainSearchRoutingModule, MainSearchModule, SearchAllModule],
declarations:[OpenaireSearchComponent], declarations:[OpenaireSearchComponent],
exports:[OpenaireSearchComponent], exports:[OpenaireSearchComponent],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
}) })
export class LibMainSearchModule { } export class LibMainSearchModule { }

4
src/app/searchPages/find/mainSearch-routing.module.ts
View File

@ -4,14 +4,12 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchComponent} from './search.component'; import{OpenaireSearchComponent} from './search.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: OpenaireSearchComponent } // { path: '', component: OpenaireSearchComponent }
{ path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] } { path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
]) ])
] ]

4
src/app/searchPages/simple/searchDataProviders-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.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: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

25
src/app/searchPages/simple/searchDataProviders.module.ts
View File

@ -1,30 +1,29 @@
import { NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import {CommonModule} from '@angular/common';
import { FormsModule } from '@angular/forms'; import {FormsModule} from '@angular/forms';
import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
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/simple/searchDataProviders.module'; import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module';
import {SearchPageTableViewModule} from '../../openaireLibrary/searchPages/searchUtils/searchPageTableView.module'; import {SearchPageTableViewModule} from '../../openaireLibrary/searchPages/searchUtils/searchPageTableView.module';
//import {DataProvidersServiceModule} from '../../openaireLibrary/services/dataProvidersService.module'; import {SearchFormModule} from '../../openaireLibrary/searchPages/searchUtils/searchForm.module';
import {SearchFormModule} from '../../openaireLibrary/searchPages/searchUtils/searchForm.module';
import {SearchDataprovidersServiceModule} from '../../openaireLibrary/connect/contentProviders/searchDataprovidersService.module'; import {SearchDataprovidersServiceModule} from '../../openaireLibrary/connect/contentProviders/searchDataprovidersService.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
SearchDataProvidersModule, SearchDataProvidersRoutingModule, SearchDataProvidersModule, SearchDataProvidersRoutingModule,
SearchPageTableViewModule, /*DataProvidersServiceModule,*/ SearchFormModule, SearchDataprovidersServiceModule SearchPageTableViewModule, SearchFormModule, SearchDataprovidersServiceModule
], ],
declarations: [ declarations: [
OpenaireSearchDataprovidersComponent OpenaireSearchDataprovidersComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers: [FreeGuard, PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchDataprovidersComponent OpenaireSearchDataprovidersComponent
] ]
}) })
export class LibSearchDataProvidersModule { } export class LibSearchDataProvidersModule {}

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

@ -6,13 +6,12 @@ import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properti
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: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},

3
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
] ]

4
src/app/searchPages/simple/searchOrganizations-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.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: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
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/simple/searchOrganizations.module'; import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module';
@ -20,7 +19,7 @@ import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simp
declarations: [ declarations: [
OpenaireSearchOrganizationsComponent OpenaireSearchOrganizationsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchOrganizationsComponent OpenaireSearchOrganizationsComponent
] ]

4
src/app/searchPages/simple/searchOrps-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import {OpenaireSearchOrpsComponent} from './searchOrps.component'; 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'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
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";
@NgModule({ @NgModule({
@ -19,7 +18,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim
OpenaireSearchOrpsComponent OpenaireSearchOrpsComponent
], ],
providers: [ providers: [
FreeGuard, PreviousRouteRecorder, IsRouteEnabled FreeGuard, PreviousRouteRecorder
], ],
exports: [ exports: [
OpenaireSearchOrpsComponent OpenaireSearchOrpsComponent

4
src/app/searchPages/simple/searchProjects-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchProjectsComponent} from './searchProjects.component'; 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'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
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/simple/searchProjects.module'; import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module';
import { SearchPageTableViewModule} from '../../openaireLibrary/searchPages/searchUtils/searchPageTableView.module'; import { SearchPageTableViewModule} from '../../openaireLibrary/searchPages/searchUtils/searchPageTableView.module';
@ -24,7 +23,7 @@ import {SearchProjectsServiceModule} from '../../openaireLibrary/connect/project
declarations: [ declarations: [
OpenaireSearchProjectsComponent OpenaireSearchProjectsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchProjectsComponent OpenaireSearchProjectsComponent
] ]

4
src/app/searchPages/simple/searchPublications-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; 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'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { { path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard], data: {
redirect: '/error' redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] } }, canDeactivate: [PreviousRouteRecorder] }

3
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({
@ -20,7 +19,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim
declarations: [ declarations: [
OpenaireSearchPublicationsComponent OpenaireSearchPublicationsComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard,PreviousRouteRecorder],
exports: [ exports: [
OpenaireSearchPublicationsComponent OpenaireSearchPublicationsComponent
] ]

3
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
src/app/searchPages/simple/searchSoftware-routing.module.ts
View File

@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
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'
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder], data: { { path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder], data: {
redirect: '/error' redirect: '/error'
} } } }

3
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,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sim
declarations: [ declarations: [
OpenaireSearchSoftwareComponent OpenaireSearchSoftwareComponent
], ],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled providers:[FreeGuard,PreviousRouteRecorder
], ],
exports: [ exports: [
OpenaireSearchSoftwareComponent OpenaireSearchSoftwareComponent