From 0c3c3b408b92ab3823f0044fc443322051e38be1 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 21 Jun 2022 14:39:27 +0300
Subject: [PATCH] Fix bug with dropdown after dragging event ends

---
 src/app/topic/indicators.component.html |  8 ++++----
 src/app/topic/indicators.component.ts   | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 9a99a44..d64f3e2 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -36,9 +36,9 @@
               <div *ngIf="indicator" [id]="indicator._id"
                    [ngClass]="getNumberClassBySize(indicator.width)">
                 <div class="uk-card uk-card-default uk-card-body uk-flex uk-flex-column uk-flex-center uk-position-relative">
-                  <div [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
+                  <div *ngIf="!dragging"
                       class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
-                    <a class="uk-link-reset uk-flex uk-flex-middle">
+                    <a class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
                       <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
                       <icon [flex]="true" name="more_vert"></icon>
                     </a>
@@ -137,9 +137,9 @@
             <ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
               <div *ngIf="indicator" [id]="indicator._id" [ngClass]="getChartClassBySize(indicator.width)">
                 <div class="uk-card uk-card-default uk-card-body uk-position-relative">
-                  <div [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
+                  <div *ngIf="!dragging"
                       class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
-                    <a class="uk-link-reset uk-flex uk-flex-middle">
+                    <a class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
                       <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
                       <icon [flex]="true" name="more_vert"></icon>
                     </a>
diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts
index 0677457..04ca1d4 100644
--- a/src/app/topic/indicators.component.ts
+++ b/src/app/topic/indicators.component.ts
@@ -75,13 +75,13 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   public indicator: Indicator;
   public index: number = -1;
   public editing: boolean = false;
+  public dragging: boolean = false;
   /** Caches */
   public safeUrls: Map<string, SafeResourceUrl> = new Map<string, SafeResourceUrl>([]);
   public numberResponses: Map<string, any> = new Map<string, any>();
   public numberResults: Map<string, number> = new Map<string, number>();
   /** Import / Export Indicators */
   importLoading: boolean = false;
-  exportLoading: boolean = false;
   @ViewChild('editChartModal', {static: true}) editChartModal: AlertModal;
   @ViewChild('editNumberModal', {static: true}) editNumberModal: AlertModal;
   @ViewChild('deleteModal', {static: true}) deleteModal: AlertModal;
@@ -182,6 +182,12 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
         this.reorderIndicators(list.current.id.toString().split('-')[1], type, reorder);
       };
       this.numbers.forEach((section) => {
+        this.subscriptions.push(UIkit.util.on(document, 'start', '#number-' + section._id, (): void => {
+          this.dragging = true;
+        }));
+        this.subscriptions.push(UIkit.util.on(document, 'stop', '#number-' + section._id, (): void => {
+          this.dragging = false;
+        }));
         this.subscriptions.push(UIkit.util.on(document, 'moved', '#number-' + section._id, (list): void => {
           callback(list, "number", 'moved');
         }));
@@ -1281,7 +1287,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   
   public exportIndicators() {
     this.editing = true;
-    this.exportLoading = true;
     let indicators = [];
     let index: number = 0;
     this.numbers.forEach(section => {
@@ -1329,7 +1334,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
     a.remove(); // remove the element
     
     this.editing = false;
-    this.exportLoading = false;
   }
   
   fileChangeEvent(fileInput: any, index) {
@@ -1364,7 +1368,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
         return;
       }
     }
-    // this.loading.open();
     
     this.makeFileRequest(this.properties.utilsService + '/upload?type=json', [], this.filesToUpload).then(async (result: string) => {