From 7ba7798abbf420f0cae5557576a0942743ec19ea Mon Sep 17 00:00:00 2001
From: Konstantinos Triantafyllou <k.triantafyllou@di.uoa.gr>
Date: Tue, 12 May 2020 11:05:53 +0000
Subject: [PATCH] [Monitor Dashaboard | Fix some bugs with indicators saving]

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58683 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/monitor/monitor.component.html        |  3 +-
 src/app/monitor/monitor.component.ts          | 13 +------
 .../stakeholder/stakeholder.component.html    |  2 +-
 src/app/stakeholder/stakeholder.component.ts  |  8 ----
 src/app/topic/indicators.component.html       |  9 ++++-
 src/app/topic/indicators.component.ts         | 38 ++++++++++++++-----
 .../utils/subscribe/subscribe.component.ts    |  9 +++--
 src/assets/theme-assets/dashboard-custom.css  |  4 ++
 8 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index cfd8634..397347c 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -66,8 +66,7 @@
                        [activeSubItem]="activeSubCategory?activeSubCategory.alias:null" [showHeader]=false
     ></dashboard-sidebar>
     <div *ngIf="activeSubCategory"
-         id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false"
-         (clickOutside)="toggleOpen($event)">
+         id="page_content">
       <div id="page_content_inner">
         <!--      <div>
                 Filters
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index ce08b27..4c24b2b 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -14,7 +14,6 @@ import {StakeholderService} from "../services/stakeholder.service";
 import {Category, ChartHelper, IndicatorPath, Stakeholder, SubCategory, Topic} from "../utils/entities/stakeholder";
 import {StatisticsService} from "../utils/services/statistics.service";
 import {IndicatorUtils, StakeholderUtils} from "../utils/indicator-utils";
-import {StakeholderCreator} from "../utils/entities/stakeholderCreator";
 import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
 import {FormBuilder, FormControl} from "@angular/forms";
 import {IDeactivateComponent} from "../openaireLibrary/utils/can-exit.guard";
@@ -172,22 +171,14 @@ export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent
     return this.layoutService.open;
   }
   
-  public toggleOpen(event = null) {
-    if (!event) {
-      this.layoutService.setOpen(!this.open);
-    } else if (event && event['value'] === true) {
-      this.layoutService.setOpen(false);
-    }
-  }
-  
   private getPageContents() {
-    this.helper.getPageHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => {
+    this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
       this.pageContents = contents;
     })
   }
   
   private getDivContents() {
-    this.helper.getDivHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => {
+    this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
       this.divContents = contents;
     })
   }
diff --git a/src/app/stakeholder/stakeholder.component.html b/src/app/stakeholder/stakeholder.component.html
index 553c12d..95fc45b 100644
--- a/src/app/stakeholder/stakeholder.component.html
+++ b/src/app/stakeholder/stakeholder.component.html
@@ -62,7 +62,7 @@
     </ul>
   </div>
 </aside>
-<div id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false" (clickOutside)="toggleOpen($event)">
+<div id="page_content">
   <div id="page_content_inner">
     <h4 class="uk-text-bold">
       Customise your Monitor Dashboard!
diff --git a/src/app/stakeholder/stakeholder.component.ts b/src/app/stakeholder/stakeholder.component.ts
index 7574dea..b78a101 100644
--- a/src/app/stakeholder/stakeholder.component.ts
+++ b/src/app/stakeholder/stakeholder.component.ts
@@ -90,14 +90,6 @@ export class StakeholderComponent implements OnInit, OnDestroy, IDeactivateCompo
     return this.layoutService.open;
   }
   
-  public toggleOpen(event = null) {
-    if (!event) {
-      this.layoutService.setOpen(!this.open);
-    } else if (event && event['value'] === true) {
-      this.layoutService.setOpen(false);
-    }
-  }
-  
   private buildTopic(topic: Topic) {
     let topics = this.stakeholder.topics.filter(element => element._id !== topic._id);
     this.form = this.fb.group({
diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index d149de8..29e886a 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -1,5 +1,4 @@
-<div id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false"
-     (clickOutside)="toggleOpen($event)">
+<div id="page_content">
   <div class="uk-padding-small md-bg-white" uk-grid>
     <div *ngIf="filters" class="uk-width-2-3@m uk-width-1-1 uk-child-width-1-3@m uk-child-width-1-1" uk-grid>
       <div>
@@ -260,6 +259,12 @@
                       </i>
                       <div>{{(indicator.isActive) ? 'Active' : 'Inactive'}}</div>
                     </div>
+                    <iframe *ngIf="indicator.indicatorPaths[i].source !== 'image'"
+                            [src]="indicator.indicatorPaths[i].safeResourceUrl"
+                            class="uk-width-1-1 uk-height-medium"></iframe>
+                    <div *ngIf="indicator.indicatorPaths[i].source === 'image'">
+                      <img class="uk-width-1-1 uk-height-medium" [src]="indicator.indicatorPaths[i].url">
+                    </div>
                   </div>
                 </div>
               </div>
diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts
index 3d7a05a..b014984 100644
--- a/src/app/topic/indicators.component.ts
+++ b/src/app/topic/indicators.component.ts
@@ -1,4 +1,14 @@
-import {AfterViewInit, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild} from "@angular/core";
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild
+} from "@angular/core";
 import {Indicator, IndicatorPath, IndicatorType, Section, Stakeholder} from "../utils/entities/stakeholder";
 import {IndicatorUtils} from "../utils/indicator-utils";
 import {FormArray, FormBuilder, FormControl, FormGroup, Validators} from "@angular/forms";
@@ -69,6 +79,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
               private statisticsService: StatisticsService,
               private fb: FormBuilder,
               private router: Router,
+              private cdr: ChangeDetectorRef,
               private sanitizer: DomSanitizer) {
   }
   
@@ -141,14 +152,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
     UIkit.dropdown(element).hide();
   }
   
-  public toggleOpen(event = null) {
-    if (!event) {
-      this.layoutService.setOpen(!this.open);
-    } else if (event && event['value'] === true) {
-      this.layoutService.setOpen(false);
-    }
-  }
-  
   public changeGrid(value) {
     this.grid = value;
   }
@@ -206,6 +209,13 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
       this.filters.value.privacy),
       this.filters.value.chartType
     );
+    this.displayCharts.forEach(section => {
+      section.indicators.forEach(indicator => {
+        indicator.indicatorPaths.forEach(indicatorPath => {
+          indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath);
+        });
+      })
+    });
   }
   
   filterNumbers() {
@@ -391,7 +401,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
       });
       this.indicator.indicatorPaths.forEach(indicatorPath => {
         this.addIndicatorPath(this.getUrlByStakeHolder(indicatorPath), this.getParametersAsFormArray(indicatorPath));
-        indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath)
+        indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath);
       });
     } else {
       this.indicator = new Indicator('', '', 'chart', 'small', false, false, []);
@@ -422,6 +432,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   saveIndicator() {
     if (this.indicator.type === 'chart') {
       this.indicator = this.indicatorUtils.generateIndicatorByForm(this.indicatorFb.value, this.indicator.indicatorPaths);
+      this.section = this.charts.find(section => section._id === this.section._id);
     }
     let path = [
       this.stakeholder._id,
@@ -483,6 +494,11 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   
   deleteIndicatorOpen(section: Section, indicatorId: string, type: string = 'chart') {
     this.section = section;
+    if(type === 'chart') {
+      this.index = this.charts.find(value => value._id == section._id).indicators.findIndex(value => value._id == indicatorId);
+    } else {
+      this.index = this.numbers.find(value => value._id == section._id).indicators.findIndex(value => value._id == indicatorId);
+    }
     this.indicator = section.indicators.find(value => value._id == indicatorId);
     this.deleteModal.alertTitle = 'Delete indicator';
     this.deleteModal.cancelButtonText = 'No';
@@ -502,8 +518,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
     this.stakeholderService.deleteElement(this.properties.monitorServiceAPIURL, path).subscribe(() => {
       if (this.indicator.type === 'chart') {
         this.charts.find(section => section._id === this.section._id).indicators.splice(this.index, 1);
+        this.filterCharts();
       } else {
         this.numbers.find(section => section._id === this.section._id).indicators.splice(this.index, 1);
+        this.filterNumbers();
       }
     });
   }
diff --git a/src/app/utils/subscribe/subscribe.component.ts b/src/app/utils/subscribe/subscribe.component.ts
index b41ec31..7c6884e 100644
--- a/src/app/utils/subscribe/subscribe.component.ts
+++ b/src/app/utils/subscribe/subscribe.component.ts
@@ -77,7 +77,7 @@ export class SubscribeComponent {
               this.subscribed = false;
             } else {
               if (this.communityId) {
-                this._subscribeService.isSubscribedToCommunity(this.properties, this.communityId, email).subscribe(
+                this._subscribeService.isSubscribedToCommunity(this.properties, this.communityId).subscribe(
                   res => {
                     this.subscribed = res;
                     if (this.subscribed) {
@@ -133,7 +133,7 @@ export class SubscribeComponent {
     } else {
       this.loading = true;
       this.showLoginAlert = false;
-      this._subscribeService.subscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe(
+      this._subscribeService.subscribeToCommunity(this.properties, this.communityId).subscribe(
         res => {
           this.loading = false;
           if (res.status && res.status != 200) {
@@ -152,7 +152,8 @@ export class SubscribeComponent {
               this.subscribeEvent.emit({
                 value: "ok"
               });
-              this._emailService.sendEmail(this.properties.adminToolsAPIURL + "/notifyForNewSubscribers/" + this.communityId, Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers, email)).subscribe(
+              this._emailService.sendEmail(this.properties,
+                Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers, email, this.properties.adminPortalURL)).subscribe(
                 res => {
                   //console.log("The email has been sent successfully!")
                 },
@@ -188,7 +189,7 @@ export class SubscribeComponent {
     } else {
       this.loading = true;
       //this.properties.adminToolsAPIURL
-      this._subscribeService.unSubscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe(
+      this._subscribeService.unSubscribeToCommunity(this.properties, this.communityId).subscribe(
         res => {
           this.loading = false;
           if (res.status && res.status != 200) {
diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css
index f6d92b1..e7d93f1 100644
--- a/src/assets/theme-assets/dashboard-custom.css
+++ b/src/assets/theme-assets/dashboard-custom.css
@@ -373,6 +373,10 @@ body.dashboard {
   display: none;
 }
 
+.dashboard .section:not(.list-view) {
+  border: white solid 1px;
+}
+
 .dashboard .section:not(.list-view):hover {
   border: var(--secondary-color) solid 1px;
 }