From 1500084e78b05cbb69dfa993311e62992d5221a2 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 16 May 2022 17:14:50 +0300 Subject: [PATCH] [Aggregator & Library | new-theme]: [Bug fix] Set properly "dashboard" and "adminToolsPortalType" properties and show "Check compatible EOSC services" button in eosc portal too. 1. env-properties.ts: a. In Dashboard type added "aggregator". b. In PortalType added "funder", "ri", "project", "organization", "aggregator", "eosc". 2. environments/: Set "dashboard" property to "aggregator" and only for eosc set "adminToolsPortalType" property to "eosc". 3. entitiesSelection.component.ts: Added check if adminToolsPortalType is "eosc". 4. resultLanding.component.ts: In method "hasRightSidebarInfo()" check if adminToolsPortalType is "eosc" to show "Check compatible EOSC services" button. 5. resultLanding.component.html: Show "Check compatible EOSC services" for adminToolsPortalType "explore" or "eosc". --- src/app/openaireLibrary | 2 +- src/environments/environment.beta.ts | 2 +- src/environments/environment.eosc.ts | 4 ++-- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4242a65..64b0e16 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4242a65199dcef141c844a5dda5116317d528045 +Subproject commit 64b0e163fa1231154019e63a626fddf77a7ce421 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index d6ea154..16e8eb3 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -3,7 +3,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "beta", adminToolsPortalType: "aggregator", - dashboard: "explore", + dashboard: "aggregator", enablePiwikTrack: true, useCache: false, useLongCache: true, diff --git a/src/environments/environment.eosc.ts b/src/environments/environment.eosc.ts index c8ba771..908c2bb 100644 --- a/src/environments/environment.eosc.ts +++ b/src/environments/environment.eosc.ts @@ -2,8 +2,8 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "production", - adminToolsPortalType: "aggregator", - dashboard: "explore", + adminToolsPortalType: "eosc", + dashboard: "aggregator", enablePiwikTrack: true, useCache: false, useLongCache: true, diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 6b8a4c3..01c77f6 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,7 +3,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "production", adminToolsPortalType: "aggregator", - dashboard: "explore", + dashboard: "aggregator", enablePiwikTrack: true, useCache: false, useLongCache: true, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 03a028b..efedffb 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -7,8 +7,8 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "development", - adminToolsPortalType: "aggregator", - dashboard: "explore", + adminToolsPortalType: "eosc", + dashboard: "aggregator", enablePiwikTrack: false, useCache: true, useLongCache: true,