From d7b77a0492b109362e7ff1c7bf7f03fa4a5d238a Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Fri, 20 Nov 2020 04:21:11 +0300
Subject: [PATCH] tweaks and npm update...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 Viewer/features/sharp.js       |  4 ++--
 Viewer/features/ui-progress.js | 10 ++++++++--
 Viewer/package-lock.json       | 14 +++++++-------
 Viewer/package.json            |  4 ++--
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Viewer/features/sharp.js b/Viewer/features/sharp.js
index 70e0d579..dce9b473 100755
--- a/Viewer/features/sharp.js
+++ b/Viewer/features/sharp.js
@@ -603,12 +603,12 @@ var SharpActions = actions.Actions({
 
 			// XXX this seems to be called prematurely...
 			abort.cleanup(function(reason, res){
-				console.log('!!!!!!',
+				console.log('### ABORT:\n    ',
 					logger && logger.log.length,
 					reason, res)
 				/*
 				logger 
-					&& logger.emit('done')
+					&& logger.emit('close')
 					&& reason == 'aborted'
 						&& logger.emit(res)
 				//*/
diff --git a/Viewer/features/ui-progress.js b/Viewer/features/ui-progress.js
index b8a7bfd9..50d19741 100755
--- a/Viewer/features/ui-progress.js
+++ b/Viewer/features/ui-progress.js
@@ -128,6 +128,7 @@ var ProgressActions = actions.Actions({
 					.append($('<span class="close">&times;</span>')
 						.on('click', function(){ 
 							var cache = (that.__progress_cache || {})[text]
+							// XXX do we need both close and done callbacks???
 							cache.onclose
 								&& cache.onclose() 
 							widget.trigger('progressClose') }))
@@ -143,6 +144,7 @@ var ProgressActions = actions.Actions({
 								var cache = (that.__progress_cache || {})[text]
 								cache.timeout 
 									&& clearTimeout(cache.timeout)
+								// XXX do we need both close and done callbacks???
 								cache.ondone
 									&& cache.ondone()
 								delete (that.__progress_cache || {})[text]
@@ -175,6 +177,7 @@ var ProgressActions = actions.Actions({
 			// auto-close...
 			if(value && value >= (max || 0)){
 				widget.attr('close-timeout', 
+					// XXX BUG: this appears to get triggered after we close progress...
 					JSON.stringify(setTimeout(function(){ 
 						widget.trigger('progressClose') 
 					}, this.config['progress-done-delay'] || 1000))) }
@@ -209,10 +212,13 @@ var ProgressActions = actions.Actions({
 				'skipped',
 				'removed',
 			]
+			var close = [
+				'close',
+				'end',
+			]
 
 			// close...
-			// XXX is the right keyword...
-			if(status == 'done' && rest.length == 0){
+			if(close.includes(status)){
 				this.showProgress(path, 'close', logger)
 
 			// report progress...
diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json
index fd1e68d4..f9a5f8d5 100755
--- a/Viewer/package-lock.json
+++ b/Viewer/package-lock.json
@@ -1112,16 +1112,16 @@
       }
     },
     "ig-object": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.3.0.tgz",
-      "integrity": "sha512-8I3w0Gqv96cx1Eirqrvtuh4Pq8X4U3tAexj4nMwceNu4jzZF1wg9FP3Im5ZZ99kQSk7CWl4tjSGe/aS5IXEoMw=="
+      "version": "5.4.9",
+      "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.4.9.tgz",
+      "integrity": "sha512-dmwTla11Kme9pSq7hUjHVNNnbJGg1fQZCm3bquuuTIj5KlI1OLgka14fAhjWOf3kGtHJ2x5Nznvd7yxka26OzQ=="
     },
     "ig-types": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-3.6.0.tgz",
-      "integrity": "sha512-zLy40mWfYXPeCw82zoAapgUUvpGvF0GNSZTAEX1s/qpAP2YYR9SnvP8QEJ1N/LqyNSpSC3q+axsBVYEqIgW2fg==",
+      "version": "3.7.12",
+      "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-3.7.12.tgz",
+      "integrity": "sha512-Qp5N79XLq+BvLyxJAn/JNVwt+IWmedQdHBUCImeZ57MJiX6e2I/EZ79D16xU4r866RAEwFFBSsm7q9RWoVNuBg==",
       "requires": {
-        "ig-object": "^5.3.0",
+        "ig-object": "^5.4.2",
         "object-run": "^1.0.1"
       }
     },
diff --git a/Viewer/package.json b/Viewer/package.json
index 6360df52..849c348e 100755
--- a/Viewer/package.json
+++ b/Viewer/package.json
@@ -31,8 +31,8 @@
     "ig-actions": "^3.24.11",
     "ig-argv": "^2.15.0",
     "ig-features": "^3.4.2",
-    "ig-object": "^5.3.0",
-    "ig-types": "^3.6.0",
+    "ig-object": "^5.4.9",
+    "ig-types": "^3.7.12",
     "moment": "^2.29.1",
     "object-run": "^1.0.1",
     "requirejs": "^2.3.6",