Added download execFiles button. Fixes #295

WIP #295. updated seeds
deepforge-dev · Jun 16, 2016 · a866695 · a866695
1 parent f95125a
commit a866695
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/src/decorators/JobDecorator/EasyDAG/JobDecorator.EasyDAGWidget.js b/src/decorators/JobDecorator/EasyDAG/JobDecorator.EasyDAGWidget.js
@@ -32,6 +32,7 @@ define([
         options.skipAttributes = {
             name: true,
             status: true,
+            execFiles: true,
             stdout: true,
             debug: true
         };

diff --git a/src/plugins/ExecutePipeline/ExecutePipeline.js b/src/plugins/ExecutePipeline/ExecutePipeline.js
@@ -429,8 +429,7 @@ define([
                     this.outputLineCount[jobId] = actualLine + 1;
                     return executor.getOutput(hash, currentLine, actualLine+1)
                         .then(outputLines => {
-                            var job = this.nodes[jobId],
-                                stdout = this.core.getAttribute(job, 'stdout'),
+                            var stdout = this.core.getAttribute(job, 'stdout'),
                                 output = outputLines.map(o => o.output).join(''),
                                 jobName = this.core.getAttribute(job, 'name');
 
@@ -462,15 +461,13 @@ define([
             .then(stdout => {
                 this.core.setAttribute(job, 'stdout', stdout);
                 if (info.status !== 'SUCCESS') {
-                    name = this.core.getAttribute(this.nodes[opId], 'name');
                     // Download all files
                     this.result.addArtifact(info.resultHashes[name + '-all-files']);
                     // Set the job to failed! Store the error
                     this.core.setAttribute(this.nodes[jobId], 'status', 'fail');
                     this.logger.info(`Setting ${jobId} status to "fail"`);
                     this.onPipelineComplete(`Operation "${opId}" failed! ${JSON.stringify(info)}`);  // Failed
                 } else {
-                    name = this.core.getAttribute(this.nodes[opId], 'name');
                     if (this.debug) {
                         this.result.addArtifact(info.resultHashes[name + '-all-files']);
                     }

diff --git a/src/seeds/minimal/minimal.webgmex b/src/seeds/minimal/minimal.webgmex
diff --git a/src/seeds/pipeline/pipeline.webgmex b/src/seeds/pipeline/pipeline.webgmex
diff --git a/src/seeds/project/project.webgmex b/src/seeds/project/project.webgmex
diff --git a/src/visualizers/panels/ForgeActionButton/Actions.js b/src/visualizers/panels/ForgeActionButton/Actions.js
@@ -114,11 +114,24 @@ define([
         };
     });
 
+    ////////////// Downloading files //////////////
+    var downloadAttrs = [
+            'data',
+            'execFiles'
+        ],
+        download = {};
+
+    downloadAttrs.forEach(attr => {
+        download[attr] = function() {
+            return downloadButton.call(this, attr);
+        };
+    });
+
     // Add download model button
-    var downloadButton = function() {
+    var downloadButton = function(attr) {
         var id = this._currentNodeId,
             node = this.client.getNode(id),
-            hash = node.getAttribute('data');
+            hash = node.getAttribute(attr);
 
         if (hash) {
             return '/rest/blob/download/' + hash;
@@ -231,7 +244,14 @@ define([
             {
                 name: 'Download',
                 icon: 'play_for_work',
-                href: downloadButton  // function to create href url
+                href: download.data  // function to create href url
+            }
+        ],
+        Job: [
+            {
+                name: 'Download Execution Files',
+                icon: 'play_for_work',
+                href: download.execFiles
             }
         ],
         Pipeline: [