Merge from master

src/app/manageStakeholders/manageStakeholders.component.html

@@ -76,7 +76,7 @@
             <li class="uk-nav-divider"></li>
             <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
               <li [class.uk-active]="stakeholder.visibility === v.value">
-                <a (click)="changeStakeholderStatus(stakeholder, v.value);">
+                <a (click)="changeStakeholderStatus(stakeholder, v.value);hide(element)">
                   <div class="uk-flex uk-flex-middle">
                     <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
                     <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>

src/app/manageStakeholders/manageStakeholders.component.ts

@@ -251,8 +251,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
     let path = [
       stakeholder._id
     ];
-    this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => {
+    this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => {
-      stakeholder.visibility = visibility;
+      stakeholder.visibility = returnedElement.visibility;
       UIkit.notification(stakeholder.name+ '\'s status has been <b>successfully changed</b> to ' + stakeholder.visibility.toLowerCase(), {
         status: 'success',
         timeout: 6000,

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 04229ad0ed644a7fd5198a5dcbc40ab083508a11
+Subproject commit f1618b92e8739b4845955c9c4f02a2e1fc31242a

src/app/topic/indicators.component.html

@@ -50,7 +50,7 @@
                         </ng-container>
                         <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
                           <li>
-                            <a (click)="changeIndicatorStatus(number._id, indicator, v.value);">
+                            <a (click)="changeIndicatorStatus(number._id, indicator, v.value);hide(element)">
                               <div class="uk-flex uk-flex-middle">
                                 <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
                                 <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>

src/app/topic/indicators.component.ts

@@ -1029,8 +1029,8 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
       sectionId,
       indicator._id
     ];
-    this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => {
+    this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => {
-      indicator.visibility = visibility;
+      indicator.visibility = returnedElement.visibility;
       UIkit.notification('Indicator has been <b>successfully changed</b> to ' + indicator.visibility.toLowerCase(), {
         status: 'success',
         timeout: 6000,

src/app/utils/indicator-utils.ts

@@ -336,7 +336,10 @@ export class IndicatorUtils {
         if (key == "index_shortName") {
           replacedValue = stakeholder.index_shortName.toLowerCase();
         }
-
+        //if there is a parameter that is filtered and the value of the parameter changes, count the filter as applied
+        if(replacedValue !=indicatorPath.parameters[key]){
+          indicatorPath.filtersApplied++;
+        }
         replacedUrl = replacedUrl.split(ChartHelper.prefix + key + ChartHelper.suffix).join(replacedValue)
       });
     }
@@ -388,7 +391,7 @@ export class IndicatorUtils {
     let filterApplied:boolean = false;
     let queryIndex = 0;
     for (let queries of this.getQueryObjectName(newJsonObject)?newJsonObject[this.getDescriptionObjectName(newJsonObject)][this.getQueryObjectName(newJsonObject)]:newJsonObject[this.getDescriptionObjectName(newJsonObject)]) {
-
+      /*Chart with  Named Queries*/
       if(queries["query"]["name"] && !queries["query"]["select"]){
 
         if(queries["query"]["name"].indexOf("monitor.")==-1 || !queries["query"]["parameters"]){
@@ -459,43 +462,47 @@ export class IndicatorUtils {
       if (!queries["query"]["filters"] || queries["query"]["filters"].length == 0) {
         queries["query"]["filters"] = [];
       }
-      let field = queries["query"]["select"][0]["field"];
+      /*Chart with  proper json object*/
-      let filterString =  IndicatorFilterUtils.getFilter(field&&field.length > 0? field.split(".")[0]:"",filterType);
+      //apply the filter in any select fields
-      if(filterString){
+      for (let select of queries["query"]["select"]) {
-        let filter = JSON.parse(filterString);
+        let filterString =  IndicatorFilterUtils.getFilter(select["field"],filterType);
-        let filterposition = IndicatorFilterUtils.filterIndexOf(filter,queries["query"]["filters"])
+        if (filterString) {
-        if(filterposition){
+          let filter = JSON.parse(filterString);
-          if(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] != filter['groupFilters'][0]["values"][0].replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue)){
+          //check if filter already exists
-            //change filter value
+          let filterposition = IndicatorFilterUtils.filterIndexOf(filter, queries["query"]["filters"]);
-            // queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filter['groupFilters'][0]["values"][0].replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue);
+          if (filterposition) {
-            //add user filter value
+            if (queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] != filter['groupFilters'][0]["values"][0].replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue)) {
-            // queries["query"]["filters"].push(JSON.parse(filterString.replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue)));
+              //change filter value
-            // update colors
+              // queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filter['groupFilters'][0]["values"][0].replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue);
-            //if noit a pie, map and chart has more than one query
+              //add user filter value
-            //
+              // queries["query"]["filters"].push(JSON.parse(filterString.replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue)));
-            if(!newJsonObject.hasOwnProperty("mapDescription") && queries["type"]!="pie" && this.isComparingChart(newJsonObject, filter)) {
+              // update colors
-              let activeColors = ["#7CB5EC", "#434348", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"];
+              //if noit a pie, map and chart has more than one query
-              let inActiveColors = ["#E4EFFB", "#D8D8D9", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"];
+              //
-              if (!newJsonObject[this.getDescriptionObjectName(newJsonObject)]["colors"]) {
+              if (!newJsonObject.hasOwnProperty("mapDescription") && queries["type"] != "pie" && this.isComparingChart(newJsonObject, filter)) {
-                newJsonObject[this.getDescriptionObjectName(newJsonObject)]["colors"] = activeColors;
+                let activeColors = ["#7CB5EC", "#434348", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"];
+                let inActiveColors = ["#E4EFFB", "#D8D8D9", "#8bbc21", "#910000", "#1aadce", "#492970", "#f28f43", "#77a1e5", "#c42525", "#a6c96a"];
+                if (!newJsonObject[this.getDescriptionObjectName(newJsonObject)]["colors"]) {
+                  newJsonObject[this.getDescriptionObjectName(newJsonObject)]["colors"] = activeColors;
+                }
+                newJsonObject[this.getDescriptionObjectName(newJsonObject)]["colors"][queryIndex] = inActiveColors[queryIndex];
+                filterApplied = true;
+              } else if (filterType == "start_year" || filterType == "end_year") {
+                //if has date filter already
+                if (filterType == "start_year" && parseInt(filterValue) > parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])) {
+                  queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filterValue;
+                } else if (filterType == "end_year" && parseInt(filterValue) < parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])) {
+                  queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filterValue;
+                }
+                filterApplied = true;
               }
-              newJsonObject[this.getDescriptionObjectName(newJsonObject)]["colors"][queryIndex] = inActiveColors[queryIndex];
+            } else {
-              filterApplied = true;
-            }else if (filterType == "start_year" || filterType == "end_year") {
-            //if has date filter already
-               if(filterType == "start_year" && parseInt(filterValue) > parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])){
-                 queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filterValue;
-               }else if(filterType == "end_year" && parseInt(filterValue) < parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])) {
-                 queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filterValue;
-               }
               filterApplied = true;
             }
-          }else{
+          } else {
+            queries["query"]["filters"].push(JSON.parse(filterString.replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue)));
             filterApplied = true;
           }
-        }else {
-          queries["query"]["filters"].push(JSON.parse(filterString.replace(ChartHelper.prefix + filterType + ChartHelper.suffix, filterValue)));
-          filterApplied = true;
         }
       }
       queryIndex++;

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 85ad768a46df5e59843fa5d97780ab754d0429a0
+Subproject commit 936fac297322fa252af930cab3c0e69efe57c1a5

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit cb006f41395304e085d4ac012c7a031e46458f59
+Subproject commit 1866a893c6b467f5e26a9659e37acaf4071a7f6c

src/environments/environment.ts

@@ -55,16 +55,16 @@ export let properties: EnvProperties = {
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "80",
   registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-  loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_connect_login",
+  loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
-  userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo",
+  userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
-  logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout",
+  logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
   cookieDomain: ".di.uoa.gr",
   feedbackmail: "openaire.test@gmail.com",
   cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
   // monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
-  monitorServiceAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service",
+  monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service",
-  adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/",
+  adminToolsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/",
-  notificationsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/notification/",
+  notificationsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/notification/",
   adminToolsCommunity: "monitor",
   useHelpTexts: true,
   datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",