[Connect|Trunk]

Enermaps Integration:
- add property for enermaps url
- use proper id for the images

App:
-Set properly the redirect url (status manager)




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@60784 d315682c-612b-4755-9ff5-7f18f6832af3

src/app/app.component.ts

@@ -268,7 +268,7 @@ export class AppComponent {
         this.router.navigate(['/user-info'], {
           queryParams: {
             "errorCode": LoginErrorCodes.NOT_LOGIN,
-            "redirectUrl": this.router.url
+            "redirectUrl": location.pathname+ location.search + location.hash
           }
         });
       } else {

src/app/community/community.component.html

@@ -504,7 +504,7 @@
                 <div class="uk-width-expand uk-padding">
                   <search-tab [fetch]="fetchFeaturedDatasets" [resultType]="'dataset'"
                                [properties]="properties" customTitle="Featured Datasets"
-                              [showImpactFactors]="false" [showImage]="true">
+                              [showImpactFactors]="false" [showEnermaps]="true">
                   </search-tab>
                 </div>
               </div>
@@ -558,7 +558,7 @@
                       [tabTitle]="'Ontology Mapping'"  [tabId]="'mapping'">
                 <ng-container *ngTemplateOutlet="mapping_tab;"></ng-container>
               </my-tab>
-              <my-tab *ngIf="properties.environment == 'development' && communityId == 'enermaps' &&
+              <my-tab *ngIf="properties.environment != 'production' && communityId == 'enermaps' &&
               fetchFeaturedDatasets.searchUtils.totalResults > 0 && isEntityEnabled('dataset')"
                       [tabTitle]="'Featured datasets'"  [tabId]="'enermaps'" [tabNumber]="fetchFeaturedDatasets.searchUtils.totalResults">
                 <ng-container *ngTemplateOutlet="enermaps_tab;"></ng-container>

src/app/community/community.component.ts

@@ -291,7 +291,7 @@ export class CommunityComponent {
         (this.fetchFeaturedDatasets.searchUtils.status == this.errorCodes.DONE && this.fetchFeaturedDatasets.searchUtils.totalResults > 0)
       )
     ) {
-      this.fetchFeaturedDatasets.getResultsForCommunity("dataset", this.communityId, page, size, this.properties, "enermaps::selection");
+      this.fetchFeaturedDatasets.getAllResultsForCommunity("dataset", this.communityId, page, size, this.properties, "enermaps::selection");
     }
     this.reloadFeaturedDatasets = false;
   }
@@ -309,6 +309,8 @@ export class CommunityComponent {
       fetch = this.fetchOrps;
     } else if (resultType == "dataset" && contextId) {
       fetch = this.fetchFeaturedDatasets;
+      this.fetchFeaturedDatasets.getAllResultsForCommunity("dataset", this.communityId, 0, 0, this.properties, contextId);
+      return;
     }
     fetch.getNumForCommunity(resultType, this.communityId, this.properties, contextId);
   }

src/environments/environment.ts

@@ -20,6 +20,7 @@ export let properties: EnvProperties = {
   statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/',
   statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
   useNewStatistisTool: true,
+  enermapsURL:"http://enermaps.idiap.ch",
   impactFactorsAPIURL: 'https://bip-api.imsi.athenarc.gr/paper/scores/batch/',
   claimsAPIURL: 'http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/',
   searchAPIURLLAst: 'https://beta.services.openaire.eu/search/v2/api/',