From 64b0e163fa1231154019e63a626fddf77a7ce421 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". --- landingPages/result/resultLanding.component.html | 4 ++-- landingPages/result/resultLanding.component.ts | 3 ++- searchPages/searchUtils/entitiesSelection.component.ts | 2 +- utils/properties/env-properties.ts | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 7d697502..ae640db0 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -369,7 +369,7 @@
-
@@ -379,7 +379,7 @@
-
1 && (properties.adminToolsPortalType == 'explore' || properties.adminToolsPortalType == 'eosc') && (properties.environment == 'beta' || properties.environment == 'development') && (!viewAll || viewAll=='egiNotebook')"> 0) diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts index 21c6c349..97e7981f 100644 --- a/searchPages/searchUtils/entitiesSelection.component.ts +++ b/searchPages/searchUtils/entitiesSelection.component.ts @@ -40,7 +40,7 @@ export class EntitiesSelectionComponent { /** TODO change conditions base on PortalType instead of customFilter */ ngOnInit() { - if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator'].includes(this.properties.adminToolsPortalType))) { + if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc'].includes(this.properties.adminToolsPortalType))) { this.subscriptions.push(this.config.communityInformationState.subscribe(data => { if (data) { let showEntity = {}; diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index dcc85cd0..e710c8c4 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -1,6 +1,6 @@ export type Environment = "development" | "test" | "beta" | "production"; -export type Dashboard = "explore" | "connect" | "monitor"; -export type PortalType = "explore" | "connect" | "community" | "monitor" | "aggregator"; +export type Dashboard = "explore" | "connect" | "monitor" | "aggregator"; +export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc"; export interface EnvProperties { environment?: Environment;