From f0c37512c31236868f482798f80ff5977a1edbad Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 15 Nov 2023 17:34:15 +0200 Subject: [PATCH 1/3] [develop | DONE | FIXED] : show again enermaps tab in result landing --- landingPages/result/resultLanding.component.html | 12 ++++++------ landingPages/result/resultLanding.component.ts | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index ca097000..dd683993 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -297,13 +297,13 @@ + + - - @@ -328,14 +328,14 @@ + + +
- - -
1) { for (let relClass of this.resultLandingInfo.relatedClassFilters) { @@ -591,6 +587,9 @@ export class ResultLandingComponent { this.cdr.detectChanges(); if (contexts) { + if (this.communityId && this.communityId == "enermaps" && properties.enermapsURL) { + this.enermapsId = ParsingFunctions.getEnermapsConceptId(contexts); + } await this.promise; if(this.publicCommunities && this.publicCommunities.length > 0) { this.resultLandingInfo.contexts = contexts.filter(context => { From 5b0c207150b9e37a4a6d689379f1321c9fccfe85 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 15 Nov 2023 17:39:03 +0200 Subject: [PATCH 2/3] [develop | DONE | FIXED] : re-add properties for services --- utils/properties/environments/environment.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts index 67b8ea44..eee75682 100644 --- a/utils/properties/environments/environment.ts +++ b/utils/properties/environments/environment.ts @@ -38,6 +38,7 @@ export let common: EnvProperties = { searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", searchLinkToDataProvider: "/search/dataprovider?datasourceId=", + searchLinkToService: "/search/service?serviceId=", searchLinkToDataset: "/search/dataset?datasetId=", searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", @@ -45,6 +46,7 @@ export let common: EnvProperties = { searchLinkToAll: "/search/find/", searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", + searchLinkToServices: "/search/find/services", searchLinkToProjects: "/search/find/projects", searchLinkToDatasets: "/search/find/datasets", searchLinkToSoftware: "/search/find/software", @@ -60,6 +62,7 @@ export let common: EnvProperties = { searchLinkToAdvancedSoftware: "/search/advanced/software", searchLinkToAdvancedOrps: "/search/advanced/other", searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", + searchLinkToAdvancedServices: "/search/advanced/services", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", errorLink: '/error', From 58274c537b9a6cd89068a15ac54ed57e1d1f3d00 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 16 Nov 2023 11:36:41 +0200 Subject: [PATCH 3/3] [develop | DONE]: Move indicators.less into common assets --- monitor-admin/topic/indicators.component.less | 53 ------------------- monitor-admin/topic/indicators.component.ts | 3 +- 2 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 monitor-admin/topic/indicators.component.less diff --git a/monitor-admin/topic/indicators.component.less b/monitor-admin/topic/indicators.component.less deleted file mode 100644 index 627ab18a..00000000 --- a/monitor-admin/topic/indicators.component.less +++ /dev/null @@ -1,53 +0,0 @@ -@import (reference) "~src/assets/openaire-theme/less/_import-variables"; - -.number-preview { - border: @global-border-width solid @global-border; - background: transparent; - border-radius: @global-border-radius; - min-width: 100px; - min-height: 70px; -} - -.refresh-indicator { - background-color: @global-overlay-background; - border-radius: @global-border-radius; - position: absolute; - color: @global-inverse-color; - z-index: 1; -} - -.section { - padding: 60px 45px; - border-radius: @global-border-radius; - border: @global-border-width solid @global-border; - position: relative; - background: @global-inverse-color; - border-left: 5px @global-primary-background solid; - - .tools { - position: absolute; - top: 0; - left: 50%; - transform: translate(-50%, -100%); - max-width: 50px; - padding: 5px 10px; - background-image: @global-primary-gradient; - color: @global-inverse-color; - -webkit-clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%); - clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%); - display: none; - } - - &:hover { - .tools { - display: block; - - a { - color: currentColor; - &:hover { - text-decoration: none; - } - } - } - } -} diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts index d97f5f82..18d937de 100644 --- a/monitor-admin/topic/indicators.component.ts +++ b/monitor-admin/topic/indicators.component.ts @@ -51,8 +51,7 @@ declare var UIkit; @Component({ selector: 'indicators', - templateUrl: './indicators.component.html', - styleUrls: ['indicators.component.less'] + templateUrl: './indicators.component.html' }) export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit { filesToUpload: Array;