From 15daa488f82d00e96ab7b839fb07441f5452bceb Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 24 Sep 2019 12:42:17 +0000 Subject: [PATCH] [Aggregator| Trunk] update the aggregator according to the changes made in library components: result landing component result search & advance search page user info from API - not cookie remove isRouteenabled clean up modules git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@57127 d315682c-612b-4755-9ff5-7f18f6832af3 --- angular.json | 86 +------------------ src/app/app.component.ts | 18 ++-- src/app/home/home.component.html | 2 +- src/app/home/home.component.ts | 19 ++-- src/app/home/home.module.ts | 13 ++- .../dataProvider-routing.module.ts | 3 +- .../dataProvider/libDataProvider.module.ts | 6 +- .../dataset/dataset-routing.module.ts | 3 +- .../landingPages/dataset/dataset.component.ts | 2 +- .../landingPages/dataset/libDataset.module.ts | 12 +-- .../htmlProjectReport-routing.module.ts | 10 +-- .../libHtmlProjectReport.module.ts | 14 +-- .../organization/libOrganization.module.ts | 14 +-- .../organization-routing.module.ts | 10 +-- src/app/landingPages/orp/libOrp.module.ts | 19 ++-- .../landingPages/orp/orp-routing.module.ts | 10 +-- src/app/landingPages/orp/orp.component.ts | 2 +- .../landingPages/project/libProject.module.ts | 14 +-- .../project/project-routing.module.ts | 9 +- .../publication/libPublication.module.ts | 16 ++-- .../publication/publication-routing.module.ts | 9 +- .../publication/publication.component.ts | 2 +- .../software/libSoftware.module.ts | 16 ++-- .../software/software-routing.module.ts | 9 +- .../software/software.component.ts | 2 +- ...ancedSearchDataProviders-routing.module.ts | 10 +-- .../advancedSearchDataProviders.module.ts | 16 ++-- .../advancedSearchDatasets-routing.module.ts | 9 +- .../advancedSearchDatasets.component.ts | 5 +- .../advanced/advancedSearchDatasets.module.ts | 23 ++--- ...ancedSearchOrganizations-routing.module.ts | 9 +- .../advancedSearchOrganizations.module.ts | 19 ++-- .../advancedSearchOrps-routing.module.ts | 9 +- .../advanced/advancedSearchOrps.component.ts | 3 +- .../advanced/advancedSearchOrps.module.ts | 23 ++--- .../advancedSearchProjects-routing.module.ts | 4 +- .../advanced/advancedSearchProjects.module.ts | 21 ++--- ...vancedSearchPublications-routing.module.ts | 10 +-- .../advancedSearchPublications.component.ts | 3 +- .../advancedSearchPublications.module.ts | 20 ++--- .../advancedSearchSoftware.component.ts | 3 +- .../advanced/advancedSearchSoftware.module.ts | 19 ++-- src/app/searchPages/find/libSearch.module.ts | 16 ++-- .../find/mainSearch-routing.module.ts | 8 +- .../searchDataProviders-routing.module.ts | 9 +- .../simple/searchDataProviders.module.ts | 12 +-- .../simple/searchDatasets-routing.module.ts | 12 ++- .../simple/searchDatasets.component.ts | 4 +- .../simple/searchDatasets.module.ts | 17 ++-- .../searchOrganizations-routing.module.ts | 12 +-- .../simple/searchOrganizations.module.ts | 15 ++-- .../simple/searchOrps-routing.module.ts | 12 ++- .../simple/searchOrps.component.ts | 4 +- .../searchPages/simple/searchOrps.module.ts | 19 ++-- .../simple/searchProjects-routing.module.ts | 9 +- .../simple/searchProjects.module.ts | 16 ++-- .../searchPublications-routing.module.ts | 9 +- .../simple/searchPublications.component.ts | 6 +- .../simple/searchPublications.module.ts | 17 ++-- .../simple/searchSoftware-routing.module.ts | 7 +- .../simple/searchSoftware.component.ts | 4 +- .../simple/searchSoftware.module.ts | 19 ++-- src/assets/env-properties.json | 4 +- 63 files changed, 279 insertions(+), 478 deletions(-) diff --git a/angular.json b/angular.json index 2a18586..dd429b3 100644 --- a/angular.json +++ b/angular.json @@ -19,50 +19,11 @@ "assets": [ "src/assets", "src/robots.txt", + "src/sitemap.xml", { - "glob": "sitemap.xml", + "glob": "**/*", "input": "src/sitemaps", "output": "/" - }, - { - "glob": "sitemap.xml", - "input": "src/sitemaps", - "output": "/assets" - }, - { - "glob": "**/*", - "input": "src/sitemaps/publication", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/dataset", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/software", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/other", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/project", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/organization", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/dataprovider", - "output": "/" } ], "styles": [ @@ -129,50 +90,11 @@ "assets": [ "src/assets", "src/robots.txt", + "src/sitemap.xml", { - "glob": "sitemap.xml", + "glob": "**/*", "input": "src/sitemaps", "output": "/" - }, - { - "glob": "sitemap.xml", - "input": "src/sitemaps", - "output": "/assets" - }, - { - "glob": "**/*", - "input": "src/sitemaps/publication", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/dataset", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/software", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/other", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/project", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/organization", - "output": "/" - }, - { - "glob": "**/*", - "input": "src/sitemaps/dataprovider", - "output": "/" } ] } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 97e5eee..273c51b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,6 +6,8 @@ import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class"; import {FilterInfo, PortalAggregators} from "./utils/aggregators"; +import {UserManagementService} from "./openaireLibrary/services/user-management.service"; +import {User} from "./openaireLibrary/login/utils/helper.class"; @Component({ //changeDetection: ChangeDetectionStrategy.Default, @@ -15,8 +17,8 @@ import {FilterInfo, PortalAggregators} from "./utils/aggregators"; `], template: ` -
@@ -43,7 +45,7 @@ export class AppComponent { menuItems: RootMenuItem [] = [ {rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []}, { - rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], [], {}), + rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], null, {}), items: [new MenuItem("", "Publications", "", "/search/find/publications", false, [], [], {}), new MenuItem("", "Research Data", "", "/search/find/datasets", false, [], [], {}), new MenuItem("", "Software", "", "/search/find/software", false, [], [], {}), @@ -58,9 +60,10 @@ export class AppComponent { properties: EnvProperties; - + user: User; + loginCheck: boolean = false; constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, - private router: Router) { + private router: Router, private userManagementService: UserManagementService) { router.events.forEach((event) => { @@ -91,6 +94,11 @@ export class AppComponent { .then(es => { this.propertiesService.setEnvProperties(es); this.properties = this.propertiesService.envSpecific; + this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { + this.user = user; + this.loginCheck = true; + console.log(this.user) + }); }, error => { console.log("App couldn't fetch properties"); console.log(error); diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index a57509d..5f349fb 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -86,7 +86,7 @@ linked together for an integrated research search + class="uk-text-large"> linked together for an integrated discovery of scientific output
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 25931ec..d5204e3 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -4,11 +4,9 @@ import {Location} from '@angular/common'; import "rxjs/add/observable/zip"; import {Meta, Title} from '@angular/platform-browser'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; -import {SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service'; import {FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class'; import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service'; -import {SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service'; import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service'; import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service'; import {SearchFields} from '../openaireLibrary/utils/properties/searchFields'; @@ -21,8 +19,8 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service'; import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {StringUtils} from "../openaireLibrary/utils/string-utils.class"; -import {SearchSoftwareService} from "../openaireLibrary/services/searchSoftware.service"; -import {SearchOrpsService} from "../openaireLibrary/services/searchOrps.service"; +import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service"; + import {FilterInfo, PortalAggregators} from "../utils/aggregators"; @Component({ @@ -71,12 +69,9 @@ export class HomeComponent { constructor( private route: ActivatedRoute, private _router: Router, - private _searchPublicationsService: SearchPublicationsService, + private _searchResearchResultsService: SearchResearchResultsService, private _searchDataprovidersService: SearchDataprovidersService, private _searchProjectsService: SearchProjectsService, - private _searchDatasetsService: SearchDatasetsService, - private _searchSoftwareService: SearchSoftwareService, - private _searchOrpsService: SearchOrpsService, private _searchOrganizationsService: SearchOrganizationsService, private _refineFieldResultsService: RefineFieldResultsService, private location: Location, private _piwikService: PiwikService, @@ -179,7 +174,7 @@ export class HomeComponent { refineQuery= "&fq="+StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId ))); } if (this.showPublications) { - this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties,refineQuery).subscribe( + this.subPub = this._searchResearchResultsService.numOfSearchResults("publication","", this.properties,refineQuery).subscribe( data => { if (data && data > 0) { this.publicationsSize = NumberUtils.roundNumber(data); @@ -193,7 +188,7 @@ export class HomeComponent { ); } if (this.showDatasets) { - this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties,refineQuery).subscribe( + this.subData = this._searchResearchResultsService.numOfSearchResults("dataset","", this.properties,refineQuery).subscribe( data => { if (data && data > 0) { this.datasetsSize = NumberUtils.roundNumber(data); @@ -207,7 +202,7 @@ export class HomeComponent { ); } if (this.showSoftware) { - this.subSoft = this._searchSoftwareService.numOfSearchSoftware("", this.properties,refineQuery).subscribe( + this.subSoft = this._searchResearchResultsService.numOfSearchResults("software","", this.properties,refineQuery).subscribe( data => { if (data && data > 0) { this.softwareSize = NumberUtils.roundNumber(data); @@ -221,7 +216,7 @@ export class HomeComponent { ); } if (this.showOrp) { - this.subOrp = this._searchOrpsService.numOfSearchOrps("", this.properties,refineQuery).subscribe( + this.subOrp = this._searchResearchResultsService.numOfSearchResults("other","", this.properties,refineQuery).subscribe( data => { if (data && data > 0) { this.otherSize = NumberUtils.roundNumber(data); diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index bdd6559..5b3084d 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -7,9 +7,9 @@ import{HomeRoutingModule} from './home-routing.module'; import{HomeComponent} from './home.component'; import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module'; -import { DatasetsServiceModule} from '../openaireLibrary/services/datasetsService.module'; +import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module'; import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module'; -import { PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module'; +// import { PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module'; import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module'; import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module'; import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module'; @@ -24,17 +24,16 @@ import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2js import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module'; -import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module"; -import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module"; +// import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module"; +// import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module"; // import {AggregatorNavBarComponent} from "../utils/aggregatorNavBar.component"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, RefineFieldResultsServiceModule, - DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule, - PublicationsServiceModule, - OrganizationsServiceModule, SoftwareServiceModule, OrpsServiceModule, + DataProvidersServiceModule, SearchResearchResultsServiceModule, ProjectsServiceModule, + OrganizationsServiceModule, SearchFormModule, PiwikServiceModule, HomeRoutingModule, diff --git a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts index bf44b5e..357c8ab 100644 --- a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import { OpenaireDataProviderComponent } from './dataProvider.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: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: { redirect: '/error' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/src/app/landingPages/dataProvider/libDataProvider.module.ts b/src/app/landingPages/dataProvider/libDataProvider.module.ts index e1b3819..d6f8f93 100644 --- a/src/app/landingPages/dataProvider/libDataProvider.module.ts +++ b/src/app/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 { OpenaireDataProviderComponent } 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:[OpenaireDataProviderComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireDataProviderComponent] }) export class LibDataProviderModule { } diff --git a/src/app/landingPages/dataset/dataset-routing.module.ts b/src/app/landingPages/dataset/dataset-routing.module.ts index 523905e..58caa2c 100644 --- a/src/app/landingPages/dataset/dataset-routing.module.ts +++ b/src/app/landingPages/dataset/dataset-routing.module.ts @@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router'; import { OpenaireDatasetComponent } 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' @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: { redirect: '/error' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/src/app/landingPages/dataset/dataset.component.ts b/src/app/landingPages/dataset/dataset.component.ts index 2b879fe..b6428ce 100644 --- a/src/app/landingPages/dataset/dataset.component.ts +++ b/src/app/landingPages/dataset/dataset.component.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-dataset', - template: ``, + template: ``, }) export class OpenaireDatasetComponent{ constructor ( ) { diff --git a/src/app/landingPages/dataset/libDataset.module.ts b/src/app/landingPages/dataset/libDataset.module.ts index f167d67..48a0269 100644 --- a/src/app/landingPages/dataset/libDataset.module.ts +++ b/src/app/landingPages/dataset/libDataset.module.ts @@ -1,19 +1,13 @@ -//import {MaterialModule} from '@angular/material'; 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 { DatasetModule } from '../../openaireLibrary/landingPages/dataset/dataset.module'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; import { OpenaireDatasetComponent } 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'; @NgModule({ - imports: [DatasetModule, DatasetRoutingModule], + imports: [ResultLandingModule, DatasetRoutingModule], declarations:[OpenaireDatasetComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireDatasetComponent] }) export class LibDatasetModule { } diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts index 7d3895a..b3003f1 100644 --- a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts +++ b/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; +import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.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: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]} + { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]} ]) ] }) diff --git a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts index 769370d..c779678 100644 --- a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts +++ b/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts @@ -1,20 +1,14 @@ -//import {MaterialModule} from '@angular/material'; -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 {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 { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; +import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component'; import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; @NgModule({ imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule], declarations:[OpenaireHtmlProjectReportComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireHtmlProjectReportComponent] }) export class LibHtmlProjectReportModule { } diff --git a/src/app/landingPages/organization/libOrganization.module.ts b/src/app/landingPages/organization/libOrganization.module.ts index 4fc9dfb..545ad62 100644 --- a/src/app/landingPages/organization/libOrganization.module.ts +++ b/src/app/landingPages/organization/libOrganization.module.ts @@ -1,20 +1,14 @@ -//import {MaterialModule} from '@angular/material'; -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 {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 { OpenaireOrganizationComponent } from './organization.component'; +import {OpenaireOrganizationComponent} from './organization.component'; import {OrganizationRoutingModule} from './organization-routing.module'; @NgModule({ imports: [OrganizationModule, OrganizationRoutingModule], declarations:[OpenaireOrganizationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireOrganizationComponent] }) export class LibOrganizationModule { } diff --git a/src/app/landingPages/organization/organization-routing.module.ts b/src/app/landingPages/organization/organization-routing.module.ts index 22ddbae..66a2282 100644 --- a/src/app/landingPages/organization/organization-routing.module.ts +++ b/src/app/landingPages/organization/organization-routing.module.ts @@ -1,17 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import { OpenaireOrganizationComponent } from './organization.component'; +import {OpenaireOrganizationComponent} from './organization.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: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: { redirect: '/error' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/src/app/landingPages/orp/libOrp.module.ts b/src/app/landingPages/orp/libOrp.module.ts index 813c5e6..8f6bac8 100644 --- a/src/app/landingPages/orp/libOrp.module.ts +++ b/src/app/landingPages/orp/libOrp.module.ts @@ -1,19 +1,14 @@ -//import {MaterialModule} from '@angular/material'; -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 { OrpModule } from '../../openaireLibrary/landingPages/orp/orp.module'; -import { OpenaireOrpComponent } from './orp.component'; +import {NgModule} from '@angular/core'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; +import {OpenaireOrpComponent} from './orp.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {OrpRoutingModule} from './orp-routing.module'; - @NgModule({ - imports: [OrpModule, OrpRoutingModule], + +@NgModule({ + imports: [ResultLandingModule, OrpRoutingModule], declarations:[OpenaireOrpComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireOrpComponent] }) export class LibOrpModule { } diff --git a/src/app/landingPages/orp/orp-routing.module.ts b/src/app/landingPages/orp/orp-routing.module.ts index 7f27ac5..32fc886 100644 --- a/src/app/landingPages/orp/orp-routing.module.ts +++ b/src/app/landingPages/orp/orp-routing.module.ts @@ -1,16 +1,14 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireOrpComponent } from './orp.component'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {OpenaireOrpComponent} from './orp.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: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: { redirect: '/error' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/src/app/landingPages/orp/orp.component.ts b/src/app/landingPages/orp/orp.component.ts index 8fc9bd8..30e454f 100644 --- a/src/app/landingPages/orp/orp.component.ts +++ b/src/app/landingPages/orp/orp.component.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-orp', - template: ``, + template: ``, }) export class OpenaireOrpComponent{ constructor ( ) { diff --git a/src/app/landingPages/project/libProject.module.ts b/src/app/landingPages/project/libProject.module.ts index 8e2dbd9..179a4fe 100644 --- a/src/app/landingPages/project/libProject.module.ts +++ b/src/app/landingPages/project/libProject.module.ts @@ -1,20 +1,14 @@ -//import {MaterialModule} from '@angular/material'; -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 {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 { OpenaireProjectComponent } from './project.component'; +import {OpenaireProjectComponent} from './project.component'; import {ProjectRoutingModule} from './project-routing.module'; @NgModule({ imports: [ProjectModule, ProjectRoutingModule], declarations:[OpenaireProjectComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireProjectComponent] }) export class LibProjectModule { } diff --git a/src/app/landingPages/project/project-routing.module.ts b/src/app/landingPages/project/project-routing.module.ts index 7590211..c4ca2a3 100644 --- a/src/app/landingPages/project/project-routing.module.ts +++ b/src/app/landingPages/project/project-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import { OpenaireProjectComponent } from './project.component'; +import {OpenaireProjectComponent} from './project.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: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: { redirect: '/error' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/src/app/landingPages/publication/libPublication.module.ts b/src/app/landingPages/publication/libPublication.module.ts index 8a8eae2..302dc5a 100644 --- a/src/app/landingPages/publication/libPublication.module.ts +++ b/src/app/landingPages/publication/libPublication.module.ts @@ -1,20 +1,14 @@ -//import {MaterialModule} from '@angular/material'; -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 { PublicationModule } from '../../openaireLibrary/landingPages/publication/publication.module'; +import {NgModule} from '@angular/core'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.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'; @NgModule({ - imports: [PublicationModule, PublicationRoutingModule], + imports: [ResultLandingModule, PublicationRoutingModule], declarations:[OpenairePublicationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenairePublicationComponent] }) export class LibPublicationModule { } diff --git a/src/app/landingPages/publication/publication-routing.module.ts b/src/app/landingPages/publication/publication-routing.module.ts index 177f1b8..9064b2a 100644 --- a/src/app/landingPages/publication/publication-routing.module.ts +++ b/src/app/landingPages/publication/publication-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import {OpenairePublicationComponent } from './publication.component'; +import {OpenairePublicationComponent} from './publication.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: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: { redirect: '/error' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/src/app/landingPages/publication/publication.component.ts b/src/app/landingPages/publication/publication.component.ts index bbc9929..343c5e9 100644 --- a/src/app/landingPages/publication/publication.component.ts +++ b/src/app/landingPages/publication/publication.component.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-publication', template: ` - `, + `, }) export class OpenairePublicationComponent { constructor() { diff --git a/src/app/landingPages/software/libSoftware.module.ts b/src/app/landingPages/software/libSoftware.module.ts index 2d11fad..18553aa 100644 --- a/src/app/landingPages/software/libSoftware.module.ts +++ b/src/app/landingPages/software/libSoftware.module.ts @@ -1,19 +1,15 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; -import { RouterModule } from '@angular/router'; -import { SoftwareModule } from '../../openaireLibrary/landingPages/software/software.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.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'; + @NgModule({ - imports: [SoftwareModule, SoftwareRoutingModule], + imports: [ResultLandingModule, SoftwareRoutingModule], declarations:[OpenaireSoftwareComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard, PreviousRouteRecorder], exports:[OpenaireSoftwareComponent] }) export class LibSoftwareModule { } diff --git a/src/app/landingPages/software/software-routing.module.ts b/src/app/landingPages/software/software-routing.module.ts index 845f9fd..7af66cd 100644 --- a/src/app/landingPages/software/software-routing.module.ts +++ b/src/app/landingPages/software/software-routing.module.ts @@ -1,15 +1,14 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import {OpenaireSoftwareComponent } from './software.component'; +import {OpenaireSoftwareComponent} from './software.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: OpenaireSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder] } + { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] } ]) ] }) diff --git a/src/app/landingPages/software/software.component.ts b/src/app/landingPages/software/software.component.ts index d3673ef..1dbdad9 100644 --- a/src/app/landingPages/software/software.component.ts +++ b/src/app/landingPages/software/software.component.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-software', - template: ``, + template: ``, }) export class OpenaireSoftwareComponent{ constructor ( ) { diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts index b417d3e..533fe9b 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts @@ -1,16 +1,14 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; +import {NgModule} from '@angular/core'; +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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts index 03ab04b..1ea91f3 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts @@ -1,14 +1,12 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module'; -import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; -import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module'; +import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module'; +import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; +import {AdvancedSearchDataProvidersModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.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: [ @@ -20,7 +18,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; declarations: [ OpenaireAdvancedSearchDataProvidersComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchDataProvidersComponent ] diff --git a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts index 9d6e86f..0c2f540 100644 --- a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; +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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/src/app/searchPages/advanced/advancedSearchDatasets.component.ts index 4f85a24..73fe09c 100644 --- a/src/app/searchPages/advanced/advancedSearchDatasets.component.ts +++ b/src/app/searchPages/advanced/advancedSearchDatasets.component.ts @@ -6,9 +6,8 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators"; @Component({ selector: 'openaire-advanced-search-datasets', - template: ` - - + template: ` + ` }) diff --git a/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/src/app/searchPages/advanced/advancedSearchDatasets.module.ts index 3df2c85..00e1eeb 100644 --- a/src/app/searchPages/advanced/advancedSearchDatasets.module.ts +++ b/src/app/searchPages/advanced/advancedSearchDatasets.module.ts @@ -1,27 +1,22 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module'; -import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; - - - import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module'; +import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; +import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; @NgModule({ imports: [ CommonModule, FormsModule, - AdvancedSearchDatasetsModule, + AdvancedSearchResearchResultsModule, AdvancedSearchDatasetsRoutingModule ], declarations: [ OpenaireAdvancedSearchDatasetsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchDatasetsComponent ] diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts index b10a478..14d2db2 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; +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' },canDeactivate: [PreviousRouteRecorder]} diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts index 6bccbcc..562cc56 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts +++ b/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts @@ -1,15 +1,10 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module'; -import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; - +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module'; +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'; - - import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module'; +import {AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module'; @NgModule({ imports: [ @@ -21,7 +16,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; declarations: [ OpenaireAdvancedSearchOrganizationsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchOrganizationsComponent ] diff --git a/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts index 2541291..59be22e 100644 --- a/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; +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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/advanced/advancedSearchOrps.component.ts b/src/app/searchPages/advanced/advancedSearchOrps.component.ts index 0485eae..7512aca 100644 --- a/src/app/searchPages/advanced/advancedSearchOrps.component.ts +++ b/src/app/searchPages/advanced/advancedSearchOrps.component.ts @@ -7,8 +7,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators"; @Component({ selector: 'openaire-advanced-search-orps', template: ` - - + ` }) diff --git a/src/app/searchPages/advanced/advancedSearchOrps.module.ts b/src/app/searchPages/advanced/advancedSearchOrps.module.ts index 8d8d313..e9dda23 100644 --- a/src/app/searchPages/advanced/advancedSearchOrps.module.ts +++ b/src/app/searchPages/advanced/advancedSearchOrps.module.ts @@ -1,27 +1,22 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module'; -import { OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; - - - import {AdvancedSearchOrpsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchOrps.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module'; +import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; +import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; @NgModule({ imports: [ CommonModule, FormsModule, - AdvancedSearchOrpsModule, + AdvancedSearchResearchResultsModule, AdvancedSearchOrpsRoutingModule ], declarations: [ OpenaireAdvancedSearchOrpsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchOrpsComponent ] diff --git a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts index fead163..00a1ef6 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts @@ -4,13 +4,11 @@ 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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/src/app/searchPages/advanced/advancedSearchProjects.module.ts index 4949aa8..8b10d2f 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects.module.ts +++ b/src/app/searchPages/advanced/advancedSearchProjects.module.ts @@ -1,15 +1,10 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module'; -import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; - - - import {AdvancedSearchProjectsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module'; +import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; +import {AdvancedSearchProjectsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; @NgModule({ imports: [ @@ -21,7 +16,7 @@ import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.c declarations: [ OpenaireAdvancedSearchProjectsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchProjectsComponent ] diff --git a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts index 90b2c55..54dc255 100644 --- a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts @@ -1,16 +1,14 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; +import {NgModule} from '@angular/core'; +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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/advanced/advancedSearchPublications.component.ts b/src/app/searchPages/advanced/advancedSearchPublications.component.ts index a82396c..26fa98f 100644 --- a/src/app/searchPages/advanced/advancedSearchPublications.component.ts +++ b/src/app/searchPages/advanced/advancedSearchPublications.component.ts @@ -7,8 +7,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators"; @Component({ selector: 'openaire-advanced-search-publications', template: ` - - + ` }) diff --git a/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/src/app/searchPages/advanced/advancedSearchPublications.module.ts index 3b92f3d..1e4eab0 100644 --- a/src/app/searchPages/advanced/advancedSearchPublications.module.ts +++ b/src/app/searchPages/advanced/advancedSearchPublications.module.ts @@ -1,27 +1,25 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module'; -import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; +import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module'; +import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; - import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' +import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; @NgModule({ imports: [ CommonModule, FormsModule, - AdvancedSearchPublicationsModule, + AdvancedSearchResearchResultsModule, AdvancedSearchPublicationsRoutingModule ], declarations: [ OpenaireAdvancedSearchPublicationsComponent ], - providers:[FreeGuard, IsRouteEnabled], + providers:[FreeGuard], exports: [ OpenaireAdvancedSearchPublicationsComponent ] diff --git a/src/app/searchPages/advanced/advancedSearchSoftware.component.ts b/src/app/searchPages/advanced/advancedSearchSoftware.component.ts index 8ea7e3d..8f26316 100644 --- a/src/app/searchPages/advanced/advancedSearchSoftware.component.ts +++ b/src/app/searchPages/advanced/advancedSearchSoftware.component.ts @@ -6,8 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators"; @Component({ selector: 'openaire-advanced-search-software', template: ` - - + ` }) diff --git a/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/src/app/searchPages/advanced/advancedSearchSoftware.module.ts index f379f3d..961984d 100644 --- a/src/app/searchPages/advanced/advancedSearchSoftware.module.ts +++ b/src/app/searchPages/advanced/advancedSearchSoftware.module.ts @@ -1,20 +1,17 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module'; -import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; +import {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module'; +import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; +import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.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: [ CommonModule, FormsModule, - AdvancedSearchSoftwareModule, + AdvancedSearchResearchResultsModule, AdvancedSearchSoftwareRoutingModule ], diff --git a/src/app/searchPages/find/libSearch.module.ts b/src/app/searchPages/find/libSearch.module.ts index 84fef82..77099fd 100644 --- a/src/app/searchPages/find/libSearch.module.ts +++ b/src/app/searchPages/find/libSearch.module.ts @@ -1,17 +1,15 @@ -//import {MaterialModule} from '@angular/material'; -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 {NgModule} from '@angular/core'; import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module'; -import { OpenaireSearchComponent } from './search.component'; -import { MainSearchRoutingModule } from './mainSearch-routing.module'; +import {OpenaireSearchComponent} from './search.component'; +import {MainSearchRoutingModule} from './mainSearch-routing.module'; +import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard"; +import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; @NgModule({ imports: [ MainSearchRoutingModule, MainSearchModule], declarations:[OpenaireSearchComponent], - exports:[OpenaireSearchComponent] + exports:[OpenaireSearchComponent], + providers: [FreeGuard, PreviousRouteRecorder] }) export class LibMainSearchModule { } diff --git a/src/app/searchPages/find/mainSearch-routing.module.ts b/src/app/searchPages/find/mainSearch-routing.module.ts index 193e0c1..7803231 100644 --- a/src/app/searchPages/find/mainSearch-routing.module.ts +++ b/src/app/searchPages/find/mainSearch-routing.module.ts @@ -2,14 +2,14 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchComponent} from './search.component'; -// import {FreeGuard} from'../../login/freeGuard.guard'; -// import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; +import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard"; +import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; + @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchComponent } - // { path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } + { path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/src/app/searchPages/simple/searchDataProviders-routing.module.ts index 916c9f8..f2f3912 100644 --- a/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ b/src/app/searchPages/simple/searchDataProviders-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; +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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/simple/searchDataProviders.module.ts b/src/app/searchPages/simple/searchDataProviders.module.ts index fbfaf1e..333de4d 100644 --- a/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/src/app/searchPages/simple/searchDataProviders.module.ts @@ -1,12 +1,12 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; 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 {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module'; + @NgModule({ imports: [ CommonModule, FormsModule, @@ -16,7 +16,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule declarations: [ OpenaireSearchDataprovidersComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchDataprovidersComponent ] diff --git a/src/app/searchPages/simple/searchDatasets-routing.module.ts b/src/app/searchPages/simple/searchDatasets-routing.module.ts index 9222baf..be5b36b 100644 --- a/src/app/searchPages/simple/searchDatasets-routing.module.ts +++ b/src/app/searchPages/simple/searchDatasets-routing.module.ts @@ -1,19 +1,17 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; +import {OpenaireSearchDatasetsComponent} from './searchDatasets.component'; +import {EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; 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' }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/src/app/searchPages/simple/searchDatasets.component.ts b/src/app/searchPages/simple/searchDatasets.component.ts index 027959d..be313e6 100644 --- a/src/app/searchPages/simple/searchDatasets.component.ts +++ b/src/app/searchPages/simple/searchDatasets.component.ts @@ -6,9 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators"; @Component({ selector: 'openaire-search-datasets', template: ` - - - + ` }) diff --git a/src/app/searchPages/simple/searchDatasets.module.ts b/src/app/searchPages/simple/searchDatasets.module.ts index 3116a59..2fa5023 100644 --- a/src/app/searchPages/simple/searchDatasets.module.ts +++ b/src/app/searchPages/simple/searchDatasets.module.ts @@ -1,26 +1,25 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ SearchDatasetsRoutingModule} from './searchDatasets-routing.module'; -import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; +import {SearchDatasetsRoutingModule} from './searchDatasets-routing.module'; +import {OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import {SearchDatasetsModule} from '../../openaireLibrary/searchPages/simple/searchDatasets.module'; +import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.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: [ CommonModule, FormsModule, - SearchDatasetsModule , SearchDatasetsRoutingModule + SearchResearchResultsModule , SearchDatasetsRoutingModule ], declarations: [ OpenaireSearchDatasetsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchDatasetsComponent ] diff --git a/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/src/app/searchPages/simple/searchOrganizations-routing.module.ts index 2bbcd87..6090ac5 100644 --- a/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ b/src/app/searchPages/simple/searchOrganizations-routing.module.ts @@ -1,18 +1,14 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; - +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {OpenaireSearchOrganizationsComponent} from './searchOrganizations.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: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard], data: { redirect: '/error' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/simple/searchOrganizations.module.ts b/src/app/searchPages/simple/searchOrganizations.module.ts index f56c7c4..2b0f0d2 100644 --- a/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/src/app/searchPages/simple/searchOrganizations.module.ts @@ -1,15 +1,14 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; -import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; +import {SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; +import {OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.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'; @NgModule({ imports: [ @@ -20,7 +19,7 @@ import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simp declarations: [ OpenaireSearchOrganizationsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchOrganizationsComponent ] diff --git a/src/app/searchPages/simple/searchOrps-routing.module.ts b/src/app/searchPages/simple/searchOrps-routing.module.ts index a3c7f06..42b826e 100644 --- a/src/app/searchPages/simple/searchOrps-routing.module.ts +++ b/src/app/searchPages/simple/searchOrps-routing.module.ts @@ -1,19 +1,17 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireSearchOrpsComponent} from './searchOrps.component'; -import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; +import {OpenaireSearchOrpsComponent} from './searchOrps.component'; +import {EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; 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' }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/src/app/searchPages/simple/searchOrps.component.ts b/src/app/searchPages/simple/searchOrps.component.ts index 07d02e9..04221dc 100644 --- a/src/app/searchPages/simple/searchOrps.component.ts +++ b/src/app/searchPages/simple/searchOrps.component.ts @@ -6,9 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators"; @Component({ selector: 'openaire-search-orps', template: ` - - - + ` }) diff --git a/src/app/searchPages/simple/searchOrps.module.ts b/src/app/searchPages/simple/searchOrps.module.ts index dcbdf00..07c4427 100644 --- a/src/app/searchPages/simple/searchOrps.module.ts +++ b/src/app/searchPages/simple/searchOrps.module.ts @@ -1,26 +1,23 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchOrpsRoutingModule} from './searchOrps-routing.module'; -import{OpenaireSearchOrpsComponent} from './searchOrps.component'; - -import {SearchOrpsModule} from '../../openaireLibrary/searchPages/simple/searchOrps.module'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {SearchOrpsRoutingModule} from './searchOrps-routing.module'; +import {OpenaireSearchOrpsComponent} from './searchOrps.component'; +import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.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: [ CommonModule, FormsModule, - SearchOrpsModule , SearchOrpsRoutingModule + SearchResearchResultsModule , SearchOrpsRoutingModule ], declarations: [ OpenaireSearchOrpsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchOrpsComponent ] diff --git a/src/app/searchPages/simple/searchProjects-routing.module.ts b/src/app/searchPages/simple/searchProjects-routing.module.ts index 7d3ae07..e0c54ef 100644 --- a/src/app/searchPages/simple/searchProjects-routing.module.ts +++ b/src/app/searchPages/simple/searchProjects-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireSearchProjectsComponent} from './searchProjects.component'; +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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/simple/searchProjects.module.ts b/src/app/searchPages/simple/searchProjects.module.ts index b526ef9..c841500 100644 --- a/src/app/searchPages/simple/searchProjects.module.ts +++ b/src/app/searchPages/simple/searchProjects.module.ts @@ -1,14 +1,14 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; -import{OpenaireSearchProjectsComponent} from './searchProjects.component'; +import {SearchProjectsRoutingModule} from './searchProjects-routing.module'; +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' -import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module'; +import {SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module'; + @NgModule({ imports: [ CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule @@ -17,7 +17,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/se declarations: [ OpenaireSearchProjectsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchProjectsComponent ] diff --git a/src/app/searchPages/simple/searchPublications-routing.module.ts b/src/app/searchPages/simple/searchPublications-routing.module.ts index 58ba0db..f61ad3a 100644 --- a/src/app/searchPages/simple/searchPublications-routing.module.ts +++ b/src/app/searchPages/simple/searchPublications-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; +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' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/src/app/searchPages/simple/searchPublications.component.ts b/src/app/searchPages/simple/searchPublications.component.ts index 713800b..72f524a 100644 --- a/src/app/searchPages/simple/searchPublications.component.ts +++ b/src/app/searchPages/simple/searchPublications.component.ts @@ -5,10 +5,8 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators"; @Component({ selector: 'openaire-search-publications', - template: ` - - - + template: ` + ` }) diff --git a/src/app/searchPages/simple/searchPublications.module.ts b/src/app/searchPages/simple/searchPublications.module.ts index 0209c7c..557fddf 100644 --- a/src/app/searchPages/simple/searchPublications.module.ts +++ b/src/app/searchPages/simple/searchPublications.module.ts @@ -1,18 +1,17 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module'; -import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; +import {SearchPublicationsRoutingModule} from './searchPublications-routing.module'; +import {OpenaireSearchPublicationsComponent} from './searchPublications.component'; -import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.module'; +import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.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: [ - CommonModule, FormsModule, SearchPublicationsModule, + CommonModule, FormsModule, SearchResearchResultsModule, SearchPublicationsRoutingModule @@ -20,7 +19,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' declarations: [ OpenaireSearchPublicationsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + providers:[FreeGuard,PreviousRouteRecorder], exports: [ OpenaireSearchPublicationsComponent ] diff --git a/src/app/searchPages/simple/searchSoftware-routing.module.ts b/src/app/searchPages/simple/searchSoftware-routing.module.ts index 87bfd84..6344bf2 100644 --- a/src/app/searchPages/simple/searchSoftware-routing.module.ts +++ b/src/app/searchPages/simple/searchSoftware-routing.module.ts @@ -1,15 +1,14 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +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/src/app/searchPages/simple/searchSoftware.component.ts b/src/app/searchPages/simple/searchSoftware.component.ts index d5d917a..c98b21a 100644 --- a/src/app/searchPages/simple/searchSoftware.component.ts +++ b/src/app/searchPages/simple/searchSoftware.component.ts @@ -6,9 +6,7 @@ import {ActivatedRoute} from "@angular/router"; @Component({ selector: 'openaire-search-software', template: ` - - - + ` }) diff --git a/src/app/searchPages/simple/searchSoftware.module.ts b/src/app/searchPages/simple/searchSoftware.module.ts index aef096f..393aafd 100644 --- a/src/app/searchPages/simple/searchSoftware.module.ts +++ b/src/app/searchPages/simple/searchSoftware.module.ts @@ -1,24 +1,21 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; -import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module'; -import{OpenaireSearchSoftwareComponent} from './searchSoftware.component'; +import {SearchSoftwareRoutingModule} from './searchSoftware-routing.module'; +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' - - -import { SearchSoftwareModule} from '../../openaireLibrary/searchPages/simple/searchSoftware.module'; +import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; @NgModule({ imports: [ - CommonModule, FormsModule, SearchSoftwareModule, SearchSoftwareRoutingModule + CommonModule, FormsModule, SearchResearchResultsModule, SearchSoftwareRoutingModule ], declarations: [ OpenaireSearchSoftwareComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled + providers:[FreeGuard,PreviousRouteRecorder ], exports: [ OpenaireSearchSoftwareComponent diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index bdfd2c9..b73955b 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -16,7 +16,7 @@ "searchDataciteAPIURL" : "https://api.datacite.org/works", "searchOrcidURL" : "https://pub.orcid.org/v2.1/", - + "orcidURL" : "https://orcid.org/", "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/", "doiURL" : "https://dx.doi.org/", "cordisURL" : "http://cordis.europa.eu/projects/", @@ -39,7 +39,7 @@ "piwikSiteId" : "6", "loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", - + "userInfoUrl" : "http://rudie.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", "cookieDomain" :".di.uoa.gr",