From 51bd7efcbe10543c56145c71c7af970fb730e63e Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 13 Nov 2023 20:22:01 +0200
Subject: [PATCH 1/3] [develop | DONE | FIXED] entitiesSelection.component.ts:
 Added faircore4eosc in adminToolsPortalType check to include entities
 according to the configuration.

---
 searchPages/searchUtils/entitiesSelection.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts
index 9241f78e..d4df8e7b 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', 'eosc'].includes(this.properties.adminToolsPortalType))) {
+    if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc', 'faircore4eosc'].includes(this.properties.adminToolsPortalType))) {
       this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
         if (data) {
           let showEntity = {};

From f0c37512c31236868f482798f80ff5977a1edbad Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Wed, 15 Nov 2023 17:34:15 +0200
Subject: [PATCH 2/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 @@
                       <my-tab *ngIf="resultLandingInfo.bioentities && bioentitiesNum> 0"
                               [tabTitle]="'External Databases'" [tabId]="'bioentities'" [tabNumber]="bioentitiesNum">
                       </my-tab>
+                      <my-tab *ngIf="resultLandingInfo && (resultLandingInfo.measure || hasAltMetrics)"
+                              [tabTitle]="'Metrics'" [tabId]="'metrics'">
+                      </my-tab>
                       <my-tab *ngIf="enermapsId && properties.enermapsURL"
                               [tabTitle]="'Enermaps Tool'" [tabId]="'enermaps'"
                               customClass="portalTab">
                       </my-tab>
-                      <my-tab *ngIf="resultLandingInfo && (resultLandingInfo.measure || hasAltMetrics)"
-                              [tabTitle]="'Metrics'" [tabId]="'metrics'">
-                      </my-tab>
                     </my-tabs>
                   </div>
                 </div>
@@ -328,14 +328,14 @@
                       <ng-container *ngTemplateOutlet="bioentities_content"></ng-container>
                     </div>
                   </ng-container>
+                  <ng-container *ngIf="resultLandingInfo && ((resultLandingInfo.measure && (resultLandingInfo.measure.bip.length || resultLandingInfo.measure.counts.length)) || hasAltMetrics)">
+                    <ng-container *ngTemplateOutlet="metricsContent"></ng-container>
+                  </ng-container>
                   <ng-container *ngIf="enermapsId && properties.enermapsURL">
                     <div id="enermaps" class="landing-section">
                       <ng-container *ngTemplateOutlet="enermapsTool_content"></ng-container>
                     </div>
                   </ng-container>
-                  <ng-container *ngIf="resultLandingInfo && ((resultLandingInfo.measure && (resultLandingInfo.measure.bip.length || resultLandingInfo.measure.counts.length)) || hasAltMetrics)">
-                    <ng-container *ngTemplateOutlet="metricsContent"></ng-container>
-                  </ng-container>
                 </div>
                 <div class="uk-text-xsmall uk-hidden@m"><ng-container *ngTemplateOutlet="graph_and_feedback_template"></ng-container></div>
                 <helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts
index 9e1c8714..bc25c014 100644
--- a/landingPages/result/resultLanding.component.ts
+++ b/landingPages/result/resultLanding.component.ts
@@ -554,10 +554,6 @@ export class ResultLandingComponent {
             }
           }
         }
-        if (this.communityId && this.communityId == "enermaps" && properties.enermapsURL) {
-          this.enermapsId = ParsingFunctions.getEnermapsConceptId(this.resultLandingInfo.contexts);
-        }
-
         this.relatedClassFilters = [{"label": "All relations", "value": ""}];
         if (this.resultLandingInfo.relatedClassFilters.size > 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 <argirokokogiannaki@gmail.com>
Date: Wed, 15 Nov 2023 17:39:03 +0200
Subject: [PATCH 3/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',