From d351c5b00a7d01d576db0f51eec3406df537bca8 Mon Sep 17 00:00:00 2001 From: Konstantina Galouni Date: Mon, 13 Jul 2020 23:11:10 +0000 Subject: [PATCH] [Trunk | Monitor Dashboard]: Remove IsRouteEnabled guard from landing 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-monitor-portal/trunk/monitor_dashboard@59102 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../dataProvider/libDataProvider.module.ts | 6 +----- .../search/landingPages/dataset/libDataset.module.ts | 10 +++++----- .../htmlProjectReport/libHtmlProjectReport.module.ts | 3 +-- .../organization/libOrganization.module.ts | 4 +--- src/app/search/landingPages/orp/libOrp.module.ts | 3 +-- .../search/landingPages/project/libProject.module.ts | 3 +-- .../landingPages/publication/libPublication.module.ts | 3 +-- .../search/landingPages/software/libSoftware.module.ts | 3 +-- 8 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/app/search/landingPages/dataProvider/libDataProvider.module.ts b/src/app/search/landingPages/dataProvider/libDataProvider.module.ts index 6df274f..4a9d158 100644 --- a/src/app/search/landingPages/dataProvider/libDataProvider.module.ts +++ b/src/app/search/landingPages/dataProvider/libDataProvider.module.ts @@ -1,18 +1,14 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; import { DataProviderModule } from '../../../openaireLibrary/landingPages/dataProvider/dataProvider.module'; import { MonitorDataProviderComponent } from './dataProvider.component'; import {DataProviderRoutingModule} from './dataProvider-routing.module'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [DataProviderModule, DataProviderRoutingModule], declarations:[MonitorDataProviderComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[MonitorDataProviderComponent] }) export class LibDataProviderModule { } diff --git a/src/app/search/landingPages/dataset/libDataset.module.ts b/src/app/search/landingPages/dataset/libDataset.module.ts index d51316c..3a1e3e5 100644 --- a/src/app/search/landingPages/dataset/libDataset.module.ts +++ b/src/app/search/landingPages/dataset/libDataset.module.ts @@ -2,13 +2,13 @@ import { NgModule} from '@angular/core'; import { MonitorDatasetComponent } from './dataset.component'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard'; import {DatasetRoutingModule} from './dataset-routing.module'; import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module"; + @NgModule({ - imports: [DatasetRoutingModule, ResultLandingModule], - declarations:[MonitorDatasetComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[MonitorDatasetComponent] + imports: [DatasetRoutingModule, ResultLandingModule], + declarations:[MonitorDatasetComponent], + providers:[FreeGuard, PreviousRouteRecorder], + exports:[MonitorDatasetComponent] }) export class LibDatasetModule { } diff --git a/src/app/search/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/src/app/search/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts index 93ef3cd..fe57223 100644 --- a/src/app/search/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts +++ b/src/app/search/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts @@ -2,14 +2,13 @@ import {NgModule} from '@angular/core'; import {HtmlProjectReportModule} from '../../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard'; import {MonitorHtmlProjectReportComponent} from './htmlProjectReport.component'; import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; @NgModule({ imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule], declarations:[MonitorHtmlProjectReportComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[MonitorHtmlProjectReportComponent] }) export class LibHtmlProjectReportModule { } diff --git a/src/app/search/landingPages/organization/libOrganization.module.ts b/src/app/search/landingPages/organization/libOrganization.module.ts index a9b1b99..c9d7fdf 100644 --- a/src/app/search/landingPages/organization/libOrganization.module.ts +++ b/src/app/search/landingPages/organization/libOrganization.module.ts @@ -1,16 +1,14 @@ -//import {MaterialModule} from '@angular/material'; import {NgModule} from '@angular/core'; import {OrganizationModule} from '../../../openaireLibrary/landingPages/organization/organization.module'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard'; import {MonitorOrganizationComponent} from './organization.component'; import {OrganizationRoutingModule} from './organization-routing.module'; @NgModule({ imports: [OrganizationModule, OrganizationRoutingModule], declarations:[MonitorOrganizationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[MonitorOrganizationComponent] }) export class LibOrganizationModule { } diff --git a/src/app/search/landingPages/orp/libOrp.module.ts b/src/app/search/landingPages/orp/libOrp.module.ts index 8f93d06..466282d 100644 --- a/src/app/search/landingPages/orp/libOrp.module.ts +++ b/src/app/search/landingPages/orp/libOrp.module.ts @@ -1,7 +1,6 @@ import {NgModule} from '@angular/core'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard'; import {MonitorOrpComponent} from './orp.component'; import {OrpRoutingModule} from './orp-routing.module'; import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module"; @@ -14,7 +13,7 @@ import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/ MonitorOrpComponent ], providers: [ - FreeGuard, PreviousRouteRecorder, IsRouteEnabled + FreeGuard, PreviousRouteRecorder ], exports: [ MonitorOrpComponent diff --git a/src/app/search/landingPages/project/libProject.module.ts b/src/app/search/landingPages/project/libProject.module.ts index 5a33d1d..a68dcbb 100644 --- a/src/app/search/landingPages/project/libProject.module.ts +++ b/src/app/search/landingPages/project/libProject.module.ts @@ -2,14 +2,13 @@ import {NgModule} from '@angular/core'; import {ProjectModule} from '../../../openaireLibrary/landingPages/project/project.module'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard'; import {MonitorProjectComponent} from './project.component'; import {ProjectRoutingModule} from './project-routing.module'; @NgModule({ imports: [ProjectModule, ProjectRoutingModule], declarations:[MonitorProjectComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[MonitorProjectComponent] }) export class LibProjectModule { } diff --git a/src/app/search/landingPages/publication/libPublication.module.ts b/src/app/search/landingPages/publication/libPublication.module.ts index 04701d5..8dad335 100644 --- a/src/app/search/landingPages/publication/libPublication.module.ts +++ b/src/app/search/landingPages/publication/libPublication.module.ts @@ -1,7 +1,6 @@ import { NgModule} from '@angular/core'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard'; import { MonitorPublicationComponent } from './publication.component'; import {PublicationRoutingModule} from './publication-routing.module'; import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module"; @@ -9,7 +8,7 @@ import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/ @NgModule({ imports: [PublicationRoutingModule, ResultLandingModule], declarations:[MonitorPublicationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[MonitorPublicationComponent] }) export class LibPublicationModule { } diff --git a/src/app/search/landingPages/software/libSoftware.module.ts b/src/app/search/landingPages/software/libSoftware.module.ts index df9797d..0d7af46 100644 --- a/src/app/search/landingPages/software/libSoftware.module.ts +++ b/src/app/search/landingPages/software/libSoftware.module.ts @@ -1,14 +1,13 @@ import { NgModule} from '@angular/core'; import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard'; import { MonitorSoftwareComponent } from './software.component'; import {SoftwareRoutingModule} from './software-routing.module'; import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ imports: [SoftwareRoutingModule, ResultLandingModule], declarations:[MonitorSoftwareComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[MonitorSoftwareComponent] }) export class LibSoftwareModule { }