From d041d0e5f63335c2cc7680304a165d6fcf526534 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sat, 21 Mar 2020 11:18:29 +0100
Subject: [PATCH] fixes

---
 .../FloatingSpace/CircularProgressBar.js      |  2 ++
 CanvasApp/FloatingSpace/UiObject.js           | 29 +++++++++++++++----
 Files-Component/src/MarketFiles.js            |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CanvasApp/FloatingSpace/CircularProgressBar.js b/CanvasApp/FloatingSpace/CircularProgressBar.js
index 2fa62cfbb..5a9c64d8d 100644
--- a/CanvasApp/FloatingSpace/CircularProgressBar.js
+++ b/CanvasApp/FloatingSpace/CircularProgressBar.js
@@ -64,6 +64,8 @@ function newCircularProgressBar () {
     if (message.event.status !== undefined) {
       thisObject.payload.uiObject.setStatus(message.event.status, 200000)
     }
+
+    thisObject.payload.uiObject.heartBeat()
   }
 
   function getContainer (point) {
diff --git a/CanvasApp/FloatingSpace/UiObject.js b/CanvasApp/FloatingSpace/UiObject.js
index ebddc6dae..8e22ac890 100644
--- a/CanvasApp/FloatingSpace/UiObject.js
+++ b/CanvasApp/FloatingSpace/UiObject.js
@@ -25,6 +25,7 @@ function newUiObject () {
     shortcutKey: undefined,
     run: run,
     stop: stop,
+    heartBeat: heartBeat,
     getReadyToChainAttach: getReadyToChainAttach,
     showAvailabilityToChainAttach: showAvailabilityToChainAttach,
     getReadyToReferenceAttach: getReadyToReferenceAttach,
@@ -104,9 +105,12 @@ function newUiObject () {
   let currentStatus = ''
   let rightDragging = false
 
-  let eventSubscriptionIdHeartbeat
+  let eventSubscriptionIdOnRunning
   let eventSubscriptionIdOnStopped
   let lastHeartBeat
+  let onRunningCallBackFunction
+  let onRunningCallBackFunctionWasCalled = false
+
   let newUiObjectCounter = 25
   let referenceLineCounter = 0
   let chainLineCounter = 0
@@ -115,7 +119,7 @@ function newUiObject () {
 
   function finalize () {
     let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id
-    systemEventHandler.stopListening(key, eventSubscriptionIdHeartbeat, 'UiObject')
+    systemEventHandler.stopListening(key, eventSubscriptionIdOnRunning, 'UiObject')
     systemEventHandler.stopListening(key, eventSubscriptionIdOnStopped, 'UiObject')
 
     thisObject.container.eventHandler.stopListening(selfFocusEventSubscriptionId)
@@ -158,6 +162,8 @@ function newUiObject () {
     chainAttachToNode = undefined
     referenceAttachToNode = undefined
     lastHeartBeat = undefined
+
+    onRunningCallBackFunction = undefined
   }
 
   function initialize (payload, menuItemsInitialValues) {
@@ -717,6 +723,16 @@ function newUiObject () {
     }
   }
 
+  function heartBeat () {
+    lastHeartBeat = new Date()
+    thisObject.isRunning = true
+
+    if (onRunningCallBackFunctionWasCalled === false) {
+      onRunningCallBackFunctionWasCalled = true
+      onRunningCallBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
+    }
+  }
+
   function run (callBackFunction) {
     /* We setup the circular progress bar. */
     if (thisObject.circularProgressBar !== undefined) {
@@ -732,20 +748,23 @@ function newUiObject () {
     let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id
     systemEventHandler.listenToEvent(key, 'Running', undefined, 'UiObject', onResponse, onRunning)
 
+    onRunningCallBackFunction = callBackFunction
+
     function onResponse (message) {
-      eventSubscriptionIdHeartbeat = message.eventSubscriptionId
+      eventSubscriptionIdOnRunning = message.eventSubscriptionId
     }
 
     function onRunning () {
       if (thisObject.payload === undefined) { return }
-      lastHeartBeat = new Date()
+
       let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id
-      systemEventHandler.stopListening(key, eventSubscriptionIdHeartbeat, 'UiObject')
+      systemEventHandler.stopListening(key, eventSubscriptionIdOnRunning, 'UiObject')
 
       thisObject.isRunning = true
 
       if (callBackFunction !== undefined) {
         callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
+        onRunningCallBackFunctionWasCalled = true
       }
     }
 
diff --git a/Files-Component/src/MarketFiles.js b/Files-Component/src/MarketFiles.js
index c370e205b..7dcda95d0 100644
--- a/Files-Component/src/MarketFiles.js
+++ b/Files-Component/src/MarketFiles.js
@@ -134,7 +134,7 @@ function newMarketFiles () {
     try {
       if (finalized === true) { return }
       let updatedFiles = 0
-      console.log('updateFiles ' + periodName)
+
             /* Now we will get the market files */
 
       for (let i = 0; i < marketFilesPeriods.length; i++) {