From dc616a7d13ec08b4ef6babbcf0ec8d807b9b6c4f Mon Sep 17 00:00:00 2001 From: Konstantina Galouni Date: Thu, 2 Feb 2023 10:29:26 +0100 Subject: [PATCH 1/2] Updated "README.md" --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1998f60..caec87f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Aggregator +# EOSC EXPLORE -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14. +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 14.2.3. ## Install packages From a9ba2d65f96588836f3e9781329c8d1473c9cb25 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 9 Mar 2023 10:54:03 +0200 Subject: [PATCH 2/2] [Library | develop & EOSC Explore | master]: Redirect to eosc search for any page except landing | If property adminToolsPortalType is eosc, open search links to OpenAIRE Explore in a new tab. 1. home.component.html: Commented everything. 2. home.component.ts: Commented everything and added redirect to EOSC search. 3. app.component.ts: Commented . 4. app-routing.module.ts: Removed unused routes | For any route other than landing, redirect to home page. 5. index.html: Removed BETA badge | Updated title from "Search OpenAIRE" to "Search EOSC". 6. errorPage.component.ts & relatedDatasourcesTab.component.ts & showAuthors.component.ts & search-tab.component.ts: If property adminToolsPortalType is eosc, open search page in OpenAIRE Explore in a new tab. 7. fos.component.ts & sdg.component.ts: If property adminToolsPortalType is eosc, open search page in OpenAIRE Explore in a new tab | If property adminToolsPortalType is eosc, do not show "feedback/suggest" link. 8. open-aire-jsonld-converter.service.ts: If property adminToolsPortalType is eosc, do not add fos and sdgs as doc.isPartOf. --- src/app/app-routing.module.ts | 63 ++--- src/app/app.component.ts | 8 +- src/app/home/home.component.html | 252 ++++++++--------- src/app/home/home.component.ts | 467 +++++++++++++++++-------------- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- src/index.html | 4 +- 7 files changed, 406 insertions(+), 392 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index fd0adef..7f707ab 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -43,51 +43,58 @@ const routes: Routes = [ }, { path: 'search/find', - loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule) }, { path: 'search/find/research-outcomes', - loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule) }, { path: 'search/find/projects', - loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule) }, { path: 'search/find/dataproviders', - loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule) }, { path: 'search/find/services', - loadChildren: () => import('./searchPages/simple/searchServices.module').then(m => m.LibSearchServicesModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/simple/searchServices.module').then(m => m.LibSearchServicesModule) }, { path: 'search/find/organizations', - loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule) }, { path: 'search/advanced/research-outcomes', - loadChildren: () => import('./searchPages/advanced/searchResearchResults.module').then(m => m.OpenaireAdvancedSearchResearchResultsModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/advanced/searchResearchResults.module').then(m => m.OpenaireAdvancedSearchResearchResultsModule) }, { path: 'search/advanced/organizations', - loadChildren: () => import('./searchPages/advanced/advancedSearchOrganizations.module').then(m => m.LibAdvancedSearchOrganizationsModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/advanced/advancedSearchOrganizations.module').then(m => m.LibAdvancedSearchOrganizationsModule) }, { path: 'search/advanced/dataproviders', - loadChildren: () => import('./searchPages/advanced/advancedSearchDataProviders.module').then(m => m.LibAdvancedSearchDataProvidersModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/advanced/advancedSearchDataProviders.module').then(m => m.LibAdvancedSearchDataProvidersModule) }, { path: 'search/advanced/services', - loadChildren: () => import('./searchPages/advanced/advancedSearchServices.module').then(m => m.LibAdvancedSearchServicesModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/advanced/advancedSearchServices.module').then(m => m.LibAdvancedSearchServicesModule) }, { path: 'search/advanced/projects', - loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule) - }, - { - path: 'project-report', - loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule) + redirectTo: '' + // loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule) }, { path: 'reload', @@ -120,36 +127,10 @@ export class AppRoutingModule { this.enabledRoutes[data['pages'][i]['route']] = data['pages'][i]['isEnabled']; } } - this.getOptionalRoutes(); } }, error => { // this.handleError('Error getting community information (e.g. pages,entities) for community with id: ' + this.communityId, error); })); } - getOptionalRoutes(){ - let optionalRoutes: Routes = [ - // Deposit Pages - { path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, - { path: 'participate/deposit-datasets-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, - { path: 'participate/deposit-subject-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, - { path: 'participate/deposit-publications', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, - { path: 'participate/deposit-publications-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, - - { path: 'participate/deposit/learn-how', loadChildren: () => import('./deposit/deposit.module').then(m => m.LibDepositModule)}, - { path: 'participate/deposit/search', loadChildren: () => import('./deposit/searchDataprovidersToDeposit.module').then(m => m.LibSearchDataprovidersToDepositModule)}, - // Linking Pages - { path: 'myclaims', loadChildren: () => import('./claims/myClaims/myClaims.module').then(m => m.LibMyClaimsModule)}, - { path: 'participate/claim', loadChildren: () => import('./claims/linking/linkingGeneric.module').then(m => m.LibLinkingGenericModule)}, - { path: 'participate/direct-claim', loadChildren: () => import('./claims/directLinking/directLinking.module').then(m => m.LibDirectLinkingModule)}, - {path: 'develop', loadChildren: () => import('./develop/develop.module').then(m => m.DevelopModule)} - ]; - for (var i = 0; i
- + + + +
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 4f695ca..f10560e 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,131 +1,131 @@ -
-
-
-
-
-
-
-
-
-
- - -
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-

Welcome to EOSC Explore

-


- The in-context research discovery portal over the EOSC Exchange and the global map of science. -

-
-
The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.
-
-
- -
-
-
-
-
-
-
{{aggregator.graphSectionTitle}}
-

-

-
-
-
- Read more -
-
- Read less -
-
-
-
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
Share
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
Deposit your research -
+ + -
-
Deposit in a repository of your choice.
- Select an OpenAIRE compatible
- repository (2.0 +) so that your research is linked to your funding information. Use Zenodo, a - catch-all repository hosted by CERN to deposit all your research results (publications, data, - software, etc.) -
-
- Deposit
-
+ + + + + + + + + + + -
-
-
Share
+ + + + -
Link your work
+ -
-
Connect all your research.
- If you can't find your research results in OpenAIRE, don't worry! Use our Link Out service , that - reaches out to many
- external sources via APIs, to connect
- your research results and claim them to your project. -
-
- Link
-
-
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 86d1572..f452515 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,234 +1,267 @@ -import {ChangeDetectorRef, Component, ViewChild} from '@angular/core'; -import {Subscription, zip} from 'rxjs'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Location} from '@angular/common'; -import {Meta, Title} from '@angular/platform-browser'; -import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; -import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; -import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service'; -import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service'; -import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service'; -import {OpenaireEntities, SearchFields} from '../openaireLibrary/utils/properties/searchFields'; - -import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class'; -import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; -import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; -import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; -import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service'; -import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service"; -import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; -import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class"; -import {AggregatorInfo, PortalAggregators} from "../utils/aggregators"; -import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; -import {properties} from "../../environments/environment"; -import {portalProperties} from "../../environments/environment-aggregator"; +import {Component, Inject} from "@angular/core"; +import {DOCUMENT} from "@angular/common"; +import {Meta, Title} from "@angular/platform-browser"; @Component({ selector: 'home', templateUrl: 'home.component.html', }) export class HomeComponent { - public keyword:string = ""; - public searchFields:SearchFields = new SearchFields(); - public errorCodes:ErrorCodes = new ErrorCodes(); - public routerHelper:RouterHelper = new RouterHelper(); - showPublications: boolean = portalProperties.entities.publication.isEnabled; - showDatasets: boolean = portalProperties.entities.dataset.isEnabled; - showSoftware: boolean = portalProperties.entities.software.isEnabled; - showOrp: boolean = portalProperties.entities.other.isEnabled; - showOrganizations: boolean = portalProperties.entities.organization.isEnabled; - showProjects: boolean = portalProperties.entities.project.isEnabled; - showDataProviders: boolean = portalProperties.entities.datasource.isEnabled; - properties: EnvProperties = properties; - public readMore: boolean = false; - - private noOfFunders = 3; - public funders = []; - - subs: Subscription[] = []; - - resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = { - filter: null, - selected: true, - filterId: "resultbestaccessright", - value: "Open Access" - }; - selectedEntity = "all"; - disableSelect: boolean = true; - selectedEntitySimpleUrl; - selectedEntityAdvancedUrl; - resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"}; - public pageContents = null; - customFilter:SearchCustomFilter= null; - aggregator:AggregatorInfo; - - constructor ( - private route: ActivatedRoute, - private _router: Router, - private _searchResearchResultsService: SearchResearchResultsService, - private _searchDataprovidersService: SearchDataprovidersService, - private _searchProjectsService: SearchProjectsService, - private _searchOrganizationsService: SearchOrganizationsService, - private _refineFieldResultsService:RefineFieldResultsService, - private location: Location, private _piwikService:PiwikService, - private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService, - private helper: HelperService, private cdr: ChangeDetectorRef - ) { - this.aggregator = PortalAggregators.eoscInfo; - this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(); - let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide."; - let title = "OpenAIRE - Explore| " +this.aggregator.title; + constructor(@Inject(DOCUMENT) readonly document: Document, private _meta: Meta, private _title: Title) { + let title = "EOSC Explore"; this._title.setTitle(title); - this._meta.updateTag({content:description},"name='description'"); - this._meta.updateTag({content:description},"property='og:description'"); this._meta.updateTag({content:title},"property='og:title'"); - - } - private getPageContents() { - this.subs.push(this.helper.getPageHelpContents(this.properties, 'openaire', this._router.url).subscribe(contents => { - this.pageContents = contents; - })); + /** The Window object from Document defaultView */ + get window(): Window { + return this.document.defaultView; } - public ceil(num: number) { - return Math.ceil(num); - } - - public ngOnInit() { - this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false); - this.getPageContents(); - if(this.properties!=null){ - var url = this.properties.domain + this.properties.baseLink+this._router.url; - this._meta.updateTag({content:url},"property='og:url'"); - if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe()); - } - - //this.config.getCommunityInformation(this.properties, this.properties.adminToolsCommunity ).subscribe(data => { - this.subs.push(this.config.communityInformationState.subscribe(data => { - if(data) { - var showEntity = {}; - for (var i = 0; i < data['entities'].length; i++) { - - showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"]; - } - this.showPublications = !!showEntity["publication"]; - this.showDatasets = !!showEntity["dataset"]; - this.showSoftware = !!showEntity["software"]; - this.showOrp = !!showEntity["orp"]; - this.showProjects = !!showEntity["project"]; - this.showDataProviders = !!showEntity["datasource"]; - this.showOrganizations = !!showEntity["organization"]; - if(this.showPublications){ - this.resultTypes.values.push({name: OpenaireEntities.PUBLICATIONS , id:"publications",selected:false, number:0}); - } - if(this.showDatasets){ - this.resultTypes.values.push({name: OpenaireEntities.DATASETS , id:"datasets",selected:false, number:0}); - } - if(this.showSoftware){ - this.resultTypes.values.push({name: OpenaireEntities.SOFTWARE , id:"software",selected:false, number:0}); - } - if(this.showOrp){ - this.resultTypes.values.push({name: OpenaireEntities.OTHER , id:"other",selected:false, number:0}); - } - } - }, - error => { - this.handleError("Error getting community information", error); - } - )); + ngOnInit() { + // this.window.location.href = '...'; + if (typeof document !== 'undefined') { + this.window.open('https://search.eosc-portal.eu/search/all?q=*', "_self"); } - - } - public ngOnDestroy() { - for (let sub of this.subs) { - sub.unsubscribe(); - } - } - - private handleError(message: string, error) { - console.error("Home Page: "+message, error); - } - entityChanged($event){ - this.selectedEntity = $event.entity; - this.selectedEntitySimpleUrl = $event.simpleUrl; - this.selectedEntityAdvancedUrl = $event.advancedUrl; - } - goTo(simple:boolean){ - let url = (simple)?this.selectedEntitySimpleUrl:this.selectedEntityAdvancedUrl; - let parameterNames = []; - let parameterValues = []; - if (this.selectedEntity == "result") { - if (this.resultTypes) { - let values = []; - for(let value of this.resultTypes.values){ - if (value.selected) { - values.push(value.id); - } - } - if (values.length > 0 && values.length !=4) { - parameterNames.push("type"); - parameterValues.push(values.join(",")); - } - if (this.resultsQuickFilter) { - parameterNames.push("qf"); - parameterValues.push("" + this.resultsQuickFilter.selected); - } - } - }else if(this.selectedEntity == "all"){ - if (this.resultsQuickFilter) { - parameterNames.push("qf"); - parameterValues.push("true"); - } - } - if(this.keyword.length > 0) { - parameterNames.push("fv0"); - parameterValues.push(this.keyword); - parameterNames.push("f0"); - parameterValues.push("q"); - } - if(this.customFilter){ - parameterNames.push(this.customFilter.queryFieldName); - parameterValues.push(this.customFilter.valueId); - parameterNames.push("cf"); - parameterValues.push("true"); - } - this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)}); - } - getQueryParamsForAdvancedSearch(entity){ - let params = {}; - if (entity == "result") { - if (this.resultsQuickFilter) { - params["qf"] = "" + this.resultsQuickFilter.selected; - } - } - if(this.keyword.length > 0) { - params["fv0"] = "" + this.keyword; - params["f0"] = "q"; - } - if(this.customFilter){ - params = this.customFilter.getParameters(params); - } - return params; - } - - - isRouteAvailable(routeToCheck: string) { - for (let i = 0; i < this._router.config.length; i++) { - let routePath: string = this._router.config[i].path; - if (routePath == routeToCheck) { - return true; - } - } - return false; - } - - disableSelectChange(event: boolean) { - this.disableSelect = event; - this.cdr.detectChanges(); } } + + + + +// import {ChangeDetectorRef, Component, Inject, ViewChild} from '@angular/core'; +// import {Subscription, zip} from 'rxjs'; +// import {ActivatedRoute, Router} from '@angular/router'; +// import {DOCUMENT, Location} from '@angular/common'; +// import {Meta, Title} from '@angular/platform-browser'; +// import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; +// import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; +// import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service'; +// import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service'; +// import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service'; +// import {OpenaireEntities, SearchFields} from '../openaireLibrary/utils/properties/searchFields'; +// +// import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class'; +// import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; +// import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; +// import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +// import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service'; +// import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service"; +// import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; +// import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class"; +// import {AggregatorInfo, PortalAggregators} from "../utils/aggregators"; +// import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; +// import {properties} from "../../environments/environment"; +// import {portalProperties} from "../../environments/environment-aggregator"; +// +// @Component({ +// selector: 'home', +// templateUrl: 'home.component.html', +// }) +// export class HomeComponent { +// public keyword:string = ""; +// +// public searchFields:SearchFields = new SearchFields(); +// public errorCodes:ErrorCodes = new ErrorCodes(); +// public routerHelper:RouterHelper = new RouterHelper(); +// showPublications: boolean = portalProperties.entities.publication.isEnabled; +// showDatasets: boolean = portalProperties.entities.dataset.isEnabled; +// showSoftware: boolean = portalProperties.entities.software.isEnabled; +// showOrp: boolean = portalProperties.entities.other.isEnabled; +// showOrganizations: boolean = portalProperties.entities.organization.isEnabled; +// showProjects: boolean = portalProperties.entities.project.isEnabled; +// showDataProviders: boolean = portalProperties.entities.datasource.isEnabled; +// properties: EnvProperties = properties; +// public readMore: boolean = false; +// +// private noOfFunders = 3; +// public funders = []; +// +// subs: Subscription[] = []; +// +// resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = { +// filter: null, +// selected: true, +// filterId: "resultbestaccessright", +// value: "Open Access" +// }; +// selectedEntity = "all"; +// disableSelect: boolean = true; +// selectedEntitySimpleUrl; +// selectedEntityAdvancedUrl; +// resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"}; +// public pageContents = null; +// customFilter:SearchCustomFilter= null; +// aggregator:AggregatorInfo; +// +// constructor ( +// private route: ActivatedRoute, +// private _router: Router, +// private _searchResearchResultsService: SearchResearchResultsService, +// private _searchDataprovidersService: SearchDataprovidersService, +// private _searchProjectsService: SearchProjectsService, +// private _searchOrganizationsService: SearchOrganizationsService, +// private _refineFieldResultsService:RefineFieldResultsService, +// private location: Location, private _piwikService:PiwikService, +// private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService, +// private helper: HelperService, private cdr: ChangeDetectorRef +// ) { +// this.aggregator = PortalAggregators.eoscInfo; +// this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(); +// let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide."; +// let title = "OpenAIRE - Explore| " +this.aggregator.title; +// +// this._title.setTitle(title); +// this._meta.updateTag({content:description},"name='description'"); +// this._meta.updateTag({content:description},"property='og:description'"); +// this._meta.updateTag({content:title},"property='og:title'"); +// +// +// } +// +// private getPageContents() { +// this.subs.push(this.helper.getPageHelpContents(this.properties, 'openaire', this._router.url).subscribe(contents => { +// this.pageContents = contents; +// })); +// } +// +// public ceil(num: number) { +// return Math.ceil(num); +// } +// +// public ngOnInit() { +// this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false); +// this.getPageContents(); +// if(this.properties!=null){ +// var url = this.properties.domain + this.properties.baseLink+this._router.url; +// this._meta.updateTag({content:url},"property='og:url'"); +// if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ +// this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe()); +// } +// +// //this.config.getCommunityInformation(this.properties, this.properties.adminToolsCommunity ).subscribe(data => { +// this.subs.push(this.config.communityInformationState.subscribe(data => { +// if(data) { +// var showEntity = {}; +// for (var i = 0; i < data['entities'].length; i++) { +// +// showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"]; +// } +// this.showPublications = !!showEntity["publication"]; +// this.showDatasets = !!showEntity["dataset"]; +// this.showSoftware = !!showEntity["software"]; +// this.showOrp = !!showEntity["orp"]; +// this.showProjects = !!showEntity["project"]; +// this.showDataProviders = !!showEntity["datasource"]; +// this.showOrganizations = !!showEntity["organization"]; +// if(this.showPublications){ +// this.resultTypes.values.push({name: OpenaireEntities.PUBLICATIONS , id:"publications",selected:false, number:0}); +// } +// if(this.showDatasets){ +// this.resultTypes.values.push({name: OpenaireEntities.DATASETS , id:"datasets",selected:false, number:0}); +// } +// if(this.showSoftware){ +// this.resultTypes.values.push({name: OpenaireEntities.SOFTWARE , id:"software",selected:false, number:0}); +// } +// if(this.showOrp){ +// this.resultTypes.values.push({name: OpenaireEntities.OTHER , id:"other",selected:false, number:0}); +// } +// } +// }, +// error => { +// this.handleError("Error getting community information", error); +// } +// )); +// } +// +// } +// public ngOnDestroy() { +// for (let sub of this.subs) { +// sub.unsubscribe(); +// } +// } +// +// private handleError(message: string, error) { +// console.error("Home Page: "+message, error); +// } +// entityChanged($event){ +// this.selectedEntity = $event.entity; +// this.selectedEntitySimpleUrl = $event.simpleUrl; +// this.selectedEntityAdvancedUrl = $event.advancedUrl; +// } +// goTo(simple:boolean){ +// let url = (simple)?this.selectedEntitySimpleUrl:this.selectedEntityAdvancedUrl; +// let parameterNames = []; +// let parameterValues = []; +// if (this.selectedEntity == "result") { +// if (this.resultTypes) { +// let values = []; +// for(let value of this.resultTypes.values){ +// if (value.selected) { +// values.push(value.id); +// } +// } +// if (values.length > 0 && values.length !=4) { +// parameterNames.push("type"); +// parameterValues.push(values.join(",")); +// } +// if (this.resultsQuickFilter) { +// parameterNames.push("qf"); +// parameterValues.push("" + this.resultsQuickFilter.selected); +// } +// } +// }else if(this.selectedEntity == "all"){ +// if (this.resultsQuickFilter) { +// parameterNames.push("qf"); +// parameterValues.push("true"); +// } +// } +// if(this.keyword.length > 0) { +// parameterNames.push("fv0"); +// parameterValues.push(this.keyword); +// parameterNames.push("f0"); +// parameterValues.push("q"); +// } +// if(this.customFilter){ +// parameterNames.push(this.customFilter.queryFieldName); +// parameterValues.push(this.customFilter.valueId); +// parameterNames.push("cf"); +// parameterValues.push("true"); +// } +// this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)}); +// } +// getQueryParamsForAdvancedSearch(entity){ +// let params = {}; +// if (entity == "result") { +// if (this.resultsQuickFilter) { +// params["qf"] = "" + this.resultsQuickFilter.selected; +// } +// } +// if(this.keyword.length > 0) { +// params["fv0"] = "" + this.keyword; +// params["f0"] = "q"; +// } +// if(this.customFilter){ +// params = this.customFilter.getParameters(params); +// } +// return params; +// } +// +// +// isRouteAvailable(routeToCheck: string) { +// for (let i = 0; i < this._router.config.length; i++) { +// let routePath: string = this._router.config[i].path; +// if (routePath == routeToCheck) { +// return true; +// } +// } +// return false; +// } +// +// disableSelectChange(event: boolean) { +// this.disableSelect = event; +// this.cdr.detectChanges(); +// } +// } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e0c45b1..b25c6dd 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e0c45b1065a2456620f8b4774ab27ecc17b0bb87 +Subproject commit b25c6dd2f79dbfed406a05642f4036f2c7b842ee diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 996b485..a72ea0d 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 996b48573c7cc42a8c50ac447f1fd84c7f0836c4 +Subproject commit a72ea0d0c9d0b490de6c77a238d501ee75216960 diff --git a/src/index.html b/src/index.html index 2d005f6..3494e8b 100644 --- a/src/index.html +++ b/src/index.html @@ -40,10 +40,10 @@ - Search OpenAIRE + Search EOSC -
Beta instance
+