From 644e884b0006f3b20da000f1a249e6089c16a544 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 19 May 2022 18:35:59 +0300 Subject: [PATCH] [Aggregator & Library | new-theme]: Hide datasources in eosc & Do not show compatibility "Not yet registered" in services. 1. app.component.ts: [Bug fix] Add services search page in menu items if "service" entity is enabled (not datasource". 2. aggregators.ts: Added "datasource" entity and "/search/find/datasources" page in disabled list for eosc. 3. result-preview.component.html: a. Do not show "Not yet registered" compatibility label in services. b. For eosc, show in datasources "Not yet registered in OpenAIRE". 4. quick-selections.component.ts: Changed uk-child-width-auto@l to uk-child-width-auto@m (not nice in medium screens for 2 types). 5. newSearchPage.component.ts: "Include" filter name for services changed to "Other Services" --- src/app/app.component.ts | 2 +- src/app/openaireLibrary | 2 +- src/app/utils/aggregators.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a588111..94cae37 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -143,7 +143,7 @@ export class AppComponent { this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.RESULTS, "", properties.searchLinkToResults, false, [], ["/search/find/research-outcomes"], params)); this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.PROJECTS, "", properties.searchLinkToProjects, false, ["project"], ["/search/find/projects"], params)); this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.DATASOURCES, "", properties.searchLinkToDataProviders, false, ["datasource"], ["/search/find/dataproviders"], params)); - this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.SERVICES, "", properties.searchLinkToServices, false, ["datasource"], ["/search/find/services"], params)); + this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.SERVICES, "", properties.searchLinkToServices, false, ["service"], ["/search/find/services"], params)); this.menuItems[1].items.push(new MenuItem("", OpenaireEntities.ORGANIZATIONS, "", properties.searchLinkToOrganizations, false, ["organization"], ["/search/find/organizations"], params)); } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 6caba7a..a491254 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 6caba7a15528071c6c40d250c4d21480d7b0512c +Subproject commit a4912542c0ef603e471ec8b972da6577887b0fb4 diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index a51e65a..8250e2e 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -188,8 +188,9 @@ border-bottom:1px solid #ced4da; "canada": {pages: ["/search/find/services"], entities: ["software", "service"]}, "italy": {pages: ["/search/find/services"], entities: ["service"]}, "greece": {pages: ["/search/find/services"], entities: ["service"]}, - "eosc": {pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop"] - , entities: []} + "eosc": {pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop", + "/search/find/datasources"] + , entities: ["datasource"]} }; static defaultAggregator: AggregatorInfo = PortalAggregators.list[0];