diff --git a/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts index ad438da3..fc70577e 100644 --- a/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts +++ b/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts @@ -4,13 +4,14 @@ import { OpenaireClaimsAdminComponent } from './claimsAdmin.component'; import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, ClaimsCuratorGuard], - data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) + data: {redirect: properties.errorLink, community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) ] }) export class ClaimsAdminRoutingModule { } diff --git a/explore/src/app/claims/directLinking/directLinking-routing.module.ts b/explore/src/app/claims/directLinking/directLinking-routing.module.ts index fa63dd33..7d260fcd 100644 --- a/explore/src/app/claims/directLinking/directLinking-routing.module.ts +++ b/explore/src/app/claims/directLinking/directLinking-routing.module.ts @@ -5,13 +5,14 @@ import { OpenaireDirectLinkingComponent } from './directLinking.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder]}, ]) diff --git a/explore/src/app/claims/linking/linking-routing.module.ts b/explore/src/app/claims/linking/linking-routing.module.ts index cb1438d0..469c7e26 100644 --- a/explore/src/app/claims/linking/linking-routing.module.ts +++ b/explore/src/app/claims/linking/linking-routing.module.ts @@ -4,13 +4,14 @@ import { OpenaireLinkingComponent } from './linkingGeneric.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder]}, ]) diff --git a/explore/src/app/claims/myClaims/myClaims-routing.module.ts b/explore/src/app/claims/myClaims/myClaims-routing.module.ts index 44adf9cb..5a5abeab 100644 --- a/explore/src/app/claims/myClaims/myClaims-routing.module.ts +++ b/explore/src/app/claims/myClaims/myClaims-routing.module.ts @@ -5,13 +5,14 @@ import {OpenaireMyClaimsComponent } from './myClaims.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireMyClaimsComponent, canActivate: [IsRouteEnabled, LoginGuard], - data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) + data: {redirect: properties.errorLink, community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) ] }) export class MyClaimsRoutingModule { } diff --git a/explore/src/app/deposit/deposit-routing.module.ts b/explore/src/app/deposit/deposit-routing.module.ts index 13517799..ce13f9f6 100644 --- a/explore/src/app/deposit/deposit-routing.module.ts +++ b/explore/src/app/deposit/deposit-routing.module.ts @@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router'; import { OpenaireDepositComponent } from './deposit.component'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard' +import {properties} from "../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireDepositComponent, canActivate: [IsRouteEnabled], data: { - redirect: '/error' + redirect: properties.errorLink }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts b/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts index 46c8b761..f5e87251 100644 --- a/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts +++ b/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts @@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router'; import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovidersToDeposit.component'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard' +import {properties} from "../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchDataprovidersToDepositComponent, canActivate: [IsRouteEnabled], data: { - redirect: '/error' + redirect: properties.errorLink }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index 4c24e24f..528bef53 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -136,7 +136,7 @@ -
+

Deposit your research.

@@ -147,7 +147,7 @@ Start Deposit
-
+

Link your work.

@@ -306,4 +306,4 @@ href="https://www.openaire.eu/contact-us" target="_blank">Contact us
- \ No newline at end of file + diff --git a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts index c93f988a..c6155835 100644 --- a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import { OpenaireDataProviderComponent } from './dataProvider.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireDataProviderComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/landingPages/dataset/dataset-routing.module.ts b/explore/src/app/landingPages/dataset/dataset-routing.module.ts index b987e556..643183ef 100644 --- a/explore/src/app/landingPages/dataset/dataset-routing.module.ts +++ b/explore/src/app/landingPages/dataset/dataset-routing.module.ts @@ -2,13 +2,14 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDatasetComponent } from './dataset.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireDatasetComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/landingPages/organization/organization-routing.module.ts b/explore/src/app/landingPages/organization/organization-routing.module.ts index 8e18f9db..70f8f0c1 100644 --- a/explore/src/app/landingPages/organization/organization-routing.module.ts +++ b/explore/src/app/landingPages/organization/organization-routing.module.ts @@ -3,6 +3,7 @@ import { RouterModule } from '@angular/router'; import { OpenaireOrganizationComponent } from './organization.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @@ -10,7 +11,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR imports: [ RouterModule.forChild([ { path: '', component: OpenaireOrganizationComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/landingPages/orp/orp-routing.module.ts b/explore/src/app/landingPages/orp/orp-routing.module.ts index c45bd396..fb399309 100644 --- a/explore/src/app/landingPages/orp/orp-routing.module.ts +++ b/explore/src/app/landingPages/orp/orp-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import { OpenaireOrpComponent } from './orp.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireOrpComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/landingPages/project/project-routing.module.ts b/explore/src/app/landingPages/project/project-routing.module.ts index 0611d881..db65850e 100644 --- a/explore/src/app/landingPages/project/project-routing.module.ts +++ b/explore/src/app/landingPages/project/project-routing.module.ts @@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router'; import { OpenaireProjectComponent } from './project.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireProjectComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/landingPages/publication/publication-routing.module.ts b/explore/src/app/landingPages/publication/publication-routing.module.ts index a8796544..dbccb6d4 100644 --- a/explore/src/app/landingPages/publication/publication-routing.module.ts +++ b/explore/src/app/landingPages/publication/publication-routing.module.ts @@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router'; import {OpenairePublicationComponent } from './publication.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenairePublicationComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/landingPages/result/result-routing.module.ts b/explore/src/app/landingPages/result/result-routing.module.ts index 9b72a94f..666fcc64 100644 --- a/explore/src/app/landingPages/result/result-routing.module.ts +++ b/explore/src/app/landingPages/result/result-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import {OpenaireResultComponent } from './result.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireResultComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index bd6e1418..ac2c67d0 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit bd6e14180158a86345ffdcd099e8031d4a092809 +Subproject commit ac2c67d0cafc16172dcf14fc286f97504dfce346 diff --git a/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts b/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts index d8220f82..232b8c5e 100644 --- a/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts +++ b/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; import {OpenaireMyOrcidLinksComponent} from "./myOrcidLinks.component"; import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireMyOrcidLinksComponent, canActivate: [LoginGuard], data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/orcid/orcid-routing.module.ts b/explore/src/app/orcid/orcid-routing.module.ts index 79c020bf..a2cb0053 100644 --- a/explore/src/app/orcid/orcid-routing.module.ts +++ b/explore/src/app/orcid/orcid-routing.module.ts @@ -4,13 +4,14 @@ import { RouterModule } from '@angular/router'; import {OpenaireOrcidComponent} from './orcid.component'; import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard"; +import {properties} from "../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireOrcidComponent, canActivate: [LoginGuard], data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts index 2e05f6ba..c48b4ecc 100644 --- a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts +++ b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts @@ -5,6 +5,7 @@ import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousR import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component"; import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard"; import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ @@ -12,7 +13,7 @@ import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard"; // { path: '', component: OpenaireSearchMyResultsInOrcidComponent, canActivate: [IsRouteEnabled], data: { { path: '', component: OpenaireSearchRecommendedResultsForOrcidComponent, canActivate: [LoginGuard], data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts index 751e2072..a362bd01 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @@ -9,7 +10,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR imports: [ RouterModule.forChild([ { path: '', component: OpenaireAdvancedSearchDataProvidersComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts index dd489d45..87c76784 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireAdvancedSearchOrganizationsComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' },canDeactivate: [PreviousRouteRecorder]} ]) diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts index 9e51ebf4..d56921e6 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireAdvancedSearchProjectsComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts b/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts index de0ce513..f2a372d6 100644 --- a/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts +++ b/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchResearchResultsComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts index c9b098f1..6b5fe828 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchCompatibleDataprovidersComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts index 2b51d889..b99e0c97 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts @@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchEntityRegistriesComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/dataProviders/journals-routing.module.ts b/explore/src/app/searchPages/dataProviders/journals-routing.module.ts index bb35eac4..e39e892b 100644 --- a/explore/src/app/searchPages/dataProviders/journals-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/journals-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchJournalsComponent} from './journals.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchJournalsComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts index 2e2beb73..d7e35936 100644 --- a/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchDataprovidersComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts index 7aeb2240..daaa416c 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts @@ -4,6 +4,7 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @@ -11,7 +12,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchOrganizationsComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/simple/searchProjects-routing.module.ts b/explore/src/app/searchPages/simple/searchProjects-routing.module.ts index e829a2b0..4f12af6d 100644 --- a/explore/src/app/searchPages/simple/searchProjects-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchProjects-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchProjectsComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts b/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts index bac0a53a..215f5f5f 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts @@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireSearchResearchResultsComponent, data: { - redirect: '/error', community : 'openaire' + redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/userEmailPreferences/mailPrefs-routing.module.ts b/explore/src/app/userEmailPreferences/mailPrefs-routing.module.ts index e3095e2b..981c0364 100644 --- a/explore/src/app/userEmailPreferences/mailPrefs-routing.module.ts +++ b/explore/src/app/userEmailPreferences/mailPrefs-routing.module.ts @@ -5,13 +5,14 @@ import {OpenaireMailPrefsComponent } from './mailPrefs.component'; import {LoginGuard} from '../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'; +import {properties} from "../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ { path: '', component: OpenaireMailPrefsComponent, canActivate: [IsRouteEnabled, LoginGuard], - data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) + data: {redirect: properties.errorLink, community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) ] }) export class MailPrefsRoutingModule { } diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index f3c62393..ec5bc9c2 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -105,6 +105,7 @@ export let properties: EnvProperties = { searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + errorLink: '/error', lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts index b4f5828f..78e948bf 100644 --- a/explore/src/environments/environment.prod.ts +++ b/explore/src/environments/environment.prod.ts @@ -110,6 +110,7 @@ export let properties: EnvProperties = { searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + errorLink: '/error', lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts index 8b8c0371..8053b894 100644 --- a/explore/src/environments/environment.test.ts +++ b/explore/src/environments/environment.test.ts @@ -109,6 +109,7 @@ export let properties: EnvProperties = { searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + errorLink: '/error', lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: false, diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index a6c7b434..c8aa2a4d 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -111,7 +111,7 @@ export let properties: EnvProperties = { searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - + errorLink: '/error', lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",