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] [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 => {