Merge branch 'master' into 481-stop-running-jobs

deepforge-dev · Aug 3, 2016 · a20b81c · a20b81c
2 parents c6d4bc2 + a8e5876
commit a20b81c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/plugins/ExecuteJob/ExecuteJob.js b/src/plugins/ExecuteJob/ExecuteJob.js
@@ -82,6 +82,7 @@ define([
         }
 
         this._callback = callback;
+        this.currentForkName = null;
         this.prepare()
             .then(() => this.executeJob(this.activeNode));
     };
@@ -112,6 +113,7 @@ define([
                 var msg;
                 if (result.status === STORAGE_CONSTANTS.FORKED) {
                     msg = `"${name}" execution has forked to "${result.forkName}"`;
+                    this.currentForkName = result.forkName;
                     this.sendNotification(msg);
                 }
             });
@@ -247,6 +249,10 @@ define([
         this.logger.info(`Setting ${name} (${jobId}) status to ${status}`);
         this.clearOldMetadata(job);
 
+        if (this.currentForkName) {
+            // notify client that the job has completed
+            this.sendNotification(`"${name}" execution completed on branch "${this.currentForkName}"`);
+        }
         if (err) {
             this.core.setAttribute(exec, 'status', 'failed');
         } else if (this.canceled) {

diff --git a/src/plugins/ExecutePipeline/ExecutePipeline.js b/src/plugins/ExecutePipeline/ExecutePipeline.js
@@ -113,6 +113,7 @@ define([
         }
 
         this._callback = callback;
+        this.currentForkName = null;
 
         startPromise
         .then(() => this.core.loadSubTree(this.activeNode))
@@ -140,6 +141,7 @@ define([
             .then(result => {
                 var msg;
                 if (result.status === STORAGE_CONSTANTS.FORKED) {
+                    this.currentForkName = result.forkName;
                     msg = `"${this.pipelineName}" execution has forked to "${result.forkName}"`;
                     this.sendNotification(msg);
                 }
@@ -307,6 +309,11 @@ define([
             msg += 'finished!';
         }
 
+        if (this.currentForkName) {
+            // notify client that the job has completed
+            this.sendNotification(`"${this.pipelineName}" execution completed on branch "${this.currentForkName}"`);
+        }
+
         this.logger.debug(`Pipeline "${name}" complete!`);
         this.core.setAttribute(this.activeNode, 'status',
             (this.pipelineError ? 'failed' : (this.canceled ? 'canceled' : 'success')));

diff --git a/src/visualizers/panels/ForgeActionButton/Actions.js b/src/visualizers/panels/ForgeActionButton/Actions.js
@@ -103,6 +103,7 @@ define([
                 name: `Return to ${fromType}`,
                 icon: 'input',
                 priority: 2,
+                color: 'teal',
                 filter: () => {
                     return DeepForge.last[fromType];
                 },
@@ -112,6 +113,7 @@ define([
                 name: `Delete ${type} Definition`,
                 icon: 'delete',
                 priority: 1,
+                color: 'red',
                 action: function() {
                     // Delete and go to the last pipeline?
                     var node = this.client.getNode(this._currentNodeId),
@@ -139,6 +141,7 @@ define([
             name: 'Restart ' + name,
             icon: 'replay',
             priority: 1000,
+            color: 'green',
             action: function(event) {
                 this.runExecutionPlugin(pluginId, event.shiftKey);
             }

diff --git a/src/visualizers/panels/ForgeActionButton/PluginConfig.json b/src/visualizers/panels/ForgeActionButton/PluginConfig.json
@@ -5,6 +5,7 @@
     },
     "ExecutePipeline": {
         "icon": "play_arrow",
+        "color": "green",
         "priority": 1
     },
     "ImportTorch": {