From 1d463ab4725cd72bc613edeba3656dd368ff13e2 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 3 Mar 2020 14:35:42 +0000 Subject: [PATCH] [Explore|Trunk] Search Pages: remove isRouteEnbaled Guard for publications, software, datasets, other search pages create URL resolver component and redirect to search outcomes page with the proper entity selected git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@58165 d315682c-612b-4755-9ff5-7f18f6832af3 --- explore/deploy/production-properties.json | 2 +- explore/src/app/app-routing.module.ts | 17 +++++++++-------- explore/src/app/app.component.ts | 2 +- explore/src/app/app.module.ts | 3 ++- ...dvancedSearchDataProviders-routing.module.ts | 3 +-- .../advancedSearchDatasets-routing.module.ts | 3 +-- ...dvancedSearchOrganizations-routing.module.ts | 3 +-- .../advancedSearchOrps-routing.module.ts | 3 +-- .../advancedSearchProjects-routing.module.ts | 3 +-- ...advancedSearchPublications-routing.module.ts | 3 +-- .../advancedSearchSoftware-routing.module.ts | 1 - .../searchResearchResults-routing.module.ts | 1 - .../searchDataProviders-routing.module.ts | 3 +-- .../simple/searchDatasets-routing.module.ts | 3 +-- .../searchOrganizations-routing.module.ts | 3 +-- .../simple/searchOrps-routing.module.ts | 3 +-- .../simple/searchProjects-routing.module.ts | 3 +-- .../simple/searchPublications-routing.module.ts | 3 +-- .../searchResearchResults-routing.module.ts | 1 - .../simple/searchSoftware-routing.module.ts | 3 +-- explore/src/assets/env-properties.json | 4 ++-- 21 files changed, 28 insertions(+), 42 deletions(-) diff --git a/explore/deploy/production-properties.json b/explore/deploy/production-properties.json index 1f242a56..ebadad4c 100644 --- a/explore/deploy/production-properties.json +++ b/explore/deploy/production-properties.json @@ -92,7 +92,7 @@ "showLastIndexInformationLink" : true, "widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "claimsInformationLink": "https://www.openaire.eu/linking", - "lastIndexUpdate": "2019-09-07", + "lastIndexUpdate": "2020-02-20", "indexInfoAPI": "http://services.openaire.eu/openaire/info/", "depositLearnHowPage": "/participate/deposit/learn-how", diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts index 0256c2db..3db4747c 100644 --- a/explore/src/app/app-routing.module.ts +++ b/explore/src/app/app-routing.module.ts @@ -6,6 +6,7 @@ import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/e import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; import { OpenaireErrorPageComponent } from './error/errorPage.component'; +import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component"; const routes: Routes = [ // Other Pages @@ -29,10 +30,10 @@ const routes: Routes = [ { path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/research-results', loadChildren: './searchPages/simple/searchResearchResults.module#OpenaireSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/other', loadChildren: './searchPages/simple/searchOrps.module#LibSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/find/publications', component: PageURLResolverComponent}, + { path: 'search/find/datasets', component: PageURLResolverComponent}, + { path: 'search/find/software', component: PageURLResolverComponent}, + { path: 'search/find/other', component: PageURLResolverComponent}, { path: 'search/find/projects', loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, @@ -40,10 +41,10 @@ const routes: Routes = [ // Advanced Search Pages { path: 'search/advanced/research-results', loadChildren: './searchPages/advanced/searchResearchResults.module#OpenaireAdvancedSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/other', loadChildren: './searchPages/advanced/advancedSearchOrps.module#LibAdvancedSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/advanced/publications', component: PageURLResolverComponent}, + { path: 'search/advanced/datasets', component: PageURLResolverComponent}, + { path: 'search/advanced/software', component: PageURLResolverComponent}, + { path: 'search/advanced/other', component: PageURLResolverComponent}, { path: 'search/advanced/organizations', loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/dataproviders', loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/projects', loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index 14de045d..d16aac30 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -95,7 +95,7 @@ export class AppComponent { { rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}), items: [ - new MenuItem("", "Research Outcomes", "", "/search/find/research-results", false, [], [], {}), + new MenuItem("", "Research Outcomes", "", "/search/find/research-results", false, [], ["/search/find/research-results"], {}), new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}), new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}), new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {}) diff --git a/explore/src/app/app.module.ts b/explore/src/app/app.module.ts index 3b88b10d..988d2b31 100755 --- a/explore/src/app/app.module.ts +++ b/explore/src/app/app.module.ts @@ -19,6 +19,7 @@ import { ErrorModule} from './openaireLibrary/error/error.module'; import { OpenaireErrorPageComponent } from './error/errorPage.component'; import { AppRoutingModule } from './app-routing.module'; import { HttpInterceptorService } from "./openaireLibrary/http-interceptor.service"; +import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component"; @NgModule({ @@ -34,7 +35,7 @@ import { HttpInterceptorService } from "./openaireLibrary/http-interceptor.servi AppRoutingModule, BrowserTransferStateModule ], - declarations: [ AppComponent, OpenaireErrorPageComponent], + declarations: [ AppComponent, OpenaireErrorPageComponent, PageURLResolverComponent], exports: [ AppComponent ], providers:[ /*{ diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts index febdaa83..2db1252c 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts @@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts index 9d6ac540..14fb032c 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard], data: { redirect: '/error', 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 13ecad75..deb98e89 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder]} diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts index d131f70d..02396cd2 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard], data: { redirect: '/error', 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 d1796128..791d46c7 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts index b755d0a9..84736bd5 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts index e352163d..738fac81 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts @@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts b/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts index 5a75fc79..35745adc 100644 --- a/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts +++ b/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts @@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ diff --git a/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts index 1da07378..35f05137 100644 --- a/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts b/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts index 8edc0a76..29b1b288 100644 --- a/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts @@ -6,14 +6,13 @@ import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properti import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts index 7e3a7096..8942d63f 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts @@ -5,14 +5,13 @@ import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.compone import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/simple/searchOrps-routing.module.ts b/explore/src/app/searchPages/simple/searchOrps-routing.module.ts index ff122a51..0d050398 100644 --- a/explore/src/app/searchPages/simple/searchOrps-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchOrps-routing.module.ts @@ -6,14 +6,13 @@ import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properti import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/explore/src/app/searchPages/simple/searchProjects-routing.module.ts b/explore/src/app/searchPages/simple/searchProjects-routing.module.ts index 1855ae07..98844efb 100644 --- a/explore/src/app/searchPages/simple/searchProjects-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchProjects-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard], data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/simple/searchPublications-routing.module.ts b/explore/src/app/searchPages/simple/searchPublications-routing.module.ts index 93ee9d16..661f1aff 100644 --- a/explore/src/app/searchPages/simple/searchPublications-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchPublications-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard], data: { redirect: '/error', 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 5a75fc79..35745adc 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts @@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ diff --git a/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts b/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts index 87bfd841..b090b130 100644 --- a/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts @@ -4,12 +4,11 @@ import { RouterModule } from '@angular/router'; import {OpenaireSearchSoftwareComponent} from './searchSoftware.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] } + { path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/assets/env-properties.json b/explore/src/assets/env-properties.json index 311c9fc1..2f4d72bd 100644 --- a/explore/src/assets/env-properties.json +++ b/explore/src/assets/env-properties.json @@ -8,8 +8,8 @@ "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", - "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", - "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", + "searchAPIURLLAst" : "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/", + "searchResourcesAPIURL" : "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources", "openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=", "csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports", "searchCrossrefAPIURL" : "https://api.crossref.org/works",