Update attributes on cancel job. Fixes #617

deepforge-dev · Aug 3, 2016 · 12b8864 · 12b8864
1 parent 96f2090
commit 12b8864
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/visualizers/panels/ForgeActionButton/Actions.js b/src/visualizers/panels/ForgeActionButton/Actions.js
@@ -251,11 +251,16 @@ define([
                 action: function() {
                     // Stop every running job
                     var execNode = this.client.getNode(this._currentNodeId),
-                        jobIds = execNode.getChildrenIds();
+                        jobIds = execNode.getChildrenIds(),
+                        msg = `Canceling ${execNode.getAttribute('name')} execution`;
 
+                    this.client.startTransaction(msg);
                     jobIds.map(id => this.client.getNode(id))
                         .filter(job => this.isJobRunning(job))  // get running jobs
                         .forEach(job => this.stopJob(job));  // stop them
+
+                    this.client.setAttributes(execNode, 'status', 'canceled');
+                    this.client.completeTransaction();
                 }
             }
         ],

diff --git a/src/visualizers/panels/ForgeActionButton/ForgeActionButton.js b/src/visualizers/panels/ForgeActionButton/ForgeActionButton.js
@@ -383,8 +383,18 @@ define([
         }
 
         return this._executor.cancelJob(jobHash, secret)
-            .then(() => this.logger.info(`${jobHash} has been cancelled!`))
-            .fail(err => this.logger.error(`Job cancel failed: ${err}`));
+            .then(() => {
+                this.logger.info(`${jobHash} has been cancelled!`);
+                this.client.delAttributes(job, 'jobId');
+                this.client.delAttributes(job, 'secret');
+                this.client.setAttributes(job, 'status', 'canceled');
+            })
+            .fail(err => {
+                this.logger.error(`Job cancel failed: ${err}`);
+                this.client.delAttributes(job, 'jobId');
+                this.client.delAttributes(job, 'secret');
+                this.client.setAttributes(job, 'status', 'canceled');
+            });
     };
 
     return ForgeActionButton;