[angular-16-irish-monitor]: Merge from develop(2)

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"

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

monitor-admin/topic/indicators.component.less

@@ -1,54 +0,0 @@
-@import (reference) "~src/assets/openaire-theme/less/_import-variables";
-@import (optional) "~src/assets/extend-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;
-        }
-      }
-    }
-  }
-}

monitor-admin/topic/indicators.component.ts

@@ -48,8 +48,7 @@ declare var UIkit;
 
 @Component({
   selector: 'indicators',
-  templateUrl: './indicators.component.html',
+  templateUrl: './indicators.component.html'
-  styleUrls: ['indicators.component.less']
 })
 export class IndicatorsComponent extends IndicatorStakeholderBaseComponent implements OnInit, OnChanges, AfterViewInit {
   filesToUpload: Array<File>;

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',