From 86b23610c7898178642bb2600a8dc953df5e1930 Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Wed, 13 May 2020 07:57:00 +0000
Subject: [PATCH] [Connect|Trunk]

Update properties:
	stats url

Community curators update class to uk-display-inline-block

Statistics: call createChartUrlMap() after communityName is initialized



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58686 d315682c-612b-4755-9ff5-7f18f6832af3
---
 deploy/beta-properties.json                | 6 +++---
 deploy/prepareDeploy.sh                    | 1 +
 deploy/production-properties.json          | 2 +-
 src/app/curators/curators.component.html   | 2 +-
 src/app/statistics/statistics.component.ts | 3 ++-
 src/assets/env-properties.json             | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json
index 6a3ddd1..380f2e0 100644
--- a/deploy/beta-properties.json
+++ b/deploy/beta-properties.json
@@ -9,8 +9,8 @@
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
   "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
-  "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/",
-  "useNewStatistisTool":false,
+  "statisticsFrameNewAPIURL": "https://stats.madgik.di.uoa.gr/stats-api/",
+  "useNewStatistisTool":true,
   "impactFactorsAPIURL" :"https://bip-api.imsi.athenarc.gr/paper/scores/batch/",
   "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
   "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",
@@ -117,7 +117,7 @@
   "reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
 
   "admins" : ["rcd-helpdesk@openaire.eu"],
-  "lastIndexUpdate": "2020-03-26",
+  "lastIndexUpdate": "2020-05-06",
   "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/",
   "altMetricsAPIURL": "https://api.altmetric.com/v1/doi/",
   "b2noteAPIURL": "http://b2note-dev.bsc.es/api/",
diff --git a/deploy/prepareDeploy.sh b/deploy/prepareDeploy.sh
index 0963a37..2d24a1f 100755
--- a/deploy/prepareDeploy.sh
+++ b/deploy/prepareDeploy.sh
@@ -26,6 +26,7 @@
 # read -n1 ans
 # echo -n "Pressed";
 # pico ../src/index.html;
+# pico ../src/app/utils/customization/customization.component.ts;
 # echo -n 'Check Robots.txt: For test and beta add "Diasallow /", for production remove it!';
 # echo -n "Press key:";
 # read -n1 ans
diff --git a/deploy/production-properties.json b/deploy/production-properties.json
index ceba10f..c150b6c 100644
--- a/deploy/production-properties.json
+++ b/deploy/production-properties.json
@@ -9,7 +9,7 @@
   "framesAPIURL" : "https://www.openaire.eu/stats3/",
   "statisticsAPIURL" : "https://services.openaire.eu/stats-api/",
   "statisticsFrameAPIURL":"https://www.openaire.eu/stats/",
-  "statisticsFrameNewAPIURL": "",
+  "statisticsFrameNewAPIURL": "https://services.openaire.eu/stats/",
   "useNewStatistisTool":false,
   "impactFactorsAPIURL" :"https://bip-api.imsi.athenarc.gr/paper/scores/batch/",
   "claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
diff --git a/src/app/curators/curators.component.html b/src/app/curators/curators.component.html
index c7e912c..765de24 100644
--- a/src/app/curators/curators.component.html
+++ b/src/app/curators/curators.component.html
@@ -90,7 +90,7 @@
     </span>
     <div class="uk-width-expand uk-padding-remove uk-overflow-auto">
       <div class="uk-height-max-medium">
-      <span *ngFor="let curator of curators.slice(0,numberOfCurators) let i=index;" class="space uk-inline-block uk-text-top">
+      <span *ngFor="let curator of curators.slice(0,numberOfCurators) let i=index;" class="space uk-display-inline-block">
 <!--      <span>-->
         <!--        <img *ngIf="curator.photo && curator.photo !== ''" class="uk-border-circle curator-photo"-->
         <!--             src="{{downloadUrl + curator.photo}}" alt="Curator Photo">-->
diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts
index 2ad23db..e5994a5 100644
--- a/src/app/statistics/statistics.component.ts
+++ b/src/app/statistics/statistics.component.ts
@@ -106,6 +106,7 @@ export class StatisticsComponent {
                 }
                 this.communityName = community.shortTitle;
                 this.createStatisticsObjects();
+                this.createChartUrlMap();
               });
             // console.log(" Stats! "+ this.properties.statisticsAPIURL);
 
@@ -154,7 +155,7 @@ export class StatisticsComponent {
       .subscribe(
         res => {
           this.statisticsDisplay = res;
-          this.createChartUrlMap();
+
           this.getCommunityInfo();
           this.status = this.errorCodes.DONE;
 
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index a7dd5f5..b9adf4d 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -9,8 +9,8 @@
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
   "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
-  "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/",
-  "useNewStatistisTool":false,
+  "statisticsFrameNewAPIURL": "https://stats.madgik.di.uoa.gr/stats-api/",
+  "useNewStatistisTool":true,
   "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/",
   "searchResourcesAPIURL"     : "https://beta.services.openaire.eu/search/v2/api/resources",