From 1f941854d67b4d6409b9c88633f2ed6e63ecee89 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Fri, 4 Dec 2020 06:48:59 +0300
Subject: [PATCH] reworked closing of a shared progress bar...

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

diff --git a/Viewer/features/core.js b/Viewer/features/core.js
index e8c68465..155572f7 100755
--- a/Viewer/features/core.js
+++ b/Viewer/features/core.js
@@ -2871,8 +2871,8 @@ var TaskActions = actions.Actions({
 					.on('taskFailed', function(evt, t, err){ 
 						this.logger && this.logger.emit('skipped', t, err) }) 
 					.on('stop', function(){
-						// XXX not sure about this...
-						this.logger && this.logger.emit('skipped', [...this]) 
+						//this.logger && this.logger.emit('skipped', [...this]) 
+						this.logger && this.logger.emit('reset') 
 						this.clear() })
 				// cleanup...
 				queue
diff --git a/Viewer/features/ui-progress.js b/Viewer/features/ui-progress.js
index f17174da..eb96fc4a 100755
--- a/Viewer/features/ui-progress.js
+++ b/Viewer/features/ui-progress.js
@@ -75,6 +75,9 @@ var ProgressActions = actions.Actions({
 				'skipping',
 				'removed',
 			],
+			reset: [
+				'clear',
+			],
 			close: [
 				'end',
 				'abort',
@@ -107,7 +110,7 @@ var ProgressActions = actions.Actions({
 		
 			Close progress bar...
 			.showProgress('text', 'close')
-		
+
 			Relative progress modification...
 			.showProgress('text', '+1')
 			.showProgress('text', '+0', '+1')
@@ -238,7 +241,7 @@ var ProgressActions = actions.Actions({
 				.text(msg)
 
 			// auto-close...
-			if(value && value >= (max || 0)){
+			if(value != null && value >= (max || 0)){
 				widget.attr('close-timeout', 
 					JSON.stringify(setTimeout(
 						function(){ 
@@ -263,19 +266,23 @@ var ProgressActions = actions.Actions({
 				&& (attrs.onclose = logger.onclose)
 
 			// get keywords...
-			var {add, done, skip, close, error} = 
+			var {add, done, skip, reset, close, error} = 
 				this.config['progress-logger-keywords'] 
 				|| {}
 			// setup default aliases...
 			add = new Set([...(add || []), 'added'])
 			done = new Set([...(done || [])])
 			skip = new Set([...(skip || []), 'skipped'])
+			reset = new Set([...(reset || [])])
 			close = new Set([...(close || []), 'closed'])
 			error = new Set([...(error || [])])
 
 			// close...
 			if(status == 'close' || close.has(status)){
 				this.showProgress(path, 'close', attrs)
+			// reset...
+			} else if(status == 'reset' || reset.has(status)){
+				this.showProgress(path, 0, 0, attrs)
 			// added new item -- increase max...
 			// XXX show msg in the progress bar???
 			} else if(status == 'add' || add.has(status)){
diff --git a/Viewer/package-lock.json b/Viewer/package-lock.json
index 31ddbda8..bfb0fb86 100755
--- a/Viewer/package-lock.json
+++ b/Viewer/package-lock.json
@@ -1110,9 +1110,9 @@
       "integrity": "sha512-9kZM80Js9/eTwXN9VXwLDC1wDJ7gIAdYU9GIzb5KJmNcLAMaW+zhgFrwFFMrcSfggUuadgnqSrS41E4XLe8JZw=="
     },
     "ig-types": {
-      "version": "5.0.38",
-      "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-5.0.38.tgz",
-      "integrity": "sha512-eiDnadPddsSlq68wulCGMl00nL8MLrwFrBhw2peioXWwvJHkS1tA4qUiYaNYZDK3tEFo1B3idx3nBQ8jiATWAA==",
+      "version": "5.0.39",
+      "resolved": "https://registry.npmjs.org/ig-types/-/ig-types-5.0.39.tgz",
+      "integrity": "sha512-Tqha0RCPFm2rlcmsBSb9RyhUBK4qNAhtCIqmWeq/k0StiotC9EddqlFOXuJvKtFBSKFYorRYAv+rewXP3Y3YYQ==",
       "requires": {
         "ig-object": "^5.4.12",
         "object-run": "^1.0.1"
diff --git a/Viewer/package.json b/Viewer/package.json
index d07b59dd..ed9801a6 100755
--- a/Viewer/package.json
+++ b/Viewer/package.json
@@ -32,7 +32,7 @@
     "ig-argv": "^2.15.0",
     "ig-features": "^3.4.2",
     "ig-object": "^5.4.12",
-    "ig-types": "^5.0.38",
+    "ig-types": "^5.0.39",
     "moment": "^2.29.1",
     "object-run": "^1.0.1",
     "requirejs": "^2.3.6",