fix UI defect RAC-4416

RackHD · Nov 8, 2017 · 123af10 · 123af10
1 parent b197709
commit 123af10
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/lib/task-graph.js b/lib/task-graph.js
@@ -208,10 +208,16 @@ function taskGraphFactory(
                 waitingOn: taskData.waitOn,
                 ignoreFailure: taskData.ignoreFailure
             };
-
             if (taskData.taskName) {
+                  var taskName = taskData.taskName;
+                  taskName = getTaskName(taskName);
+          //      var contains = taskName.indexOf("\/");
+          //      if(contains !== -1){
+          //          var nameArray = taskName.split("\/");
+         //           taskName = nameArray[nameArray.length - 1];
+               // }
                 return self.constructTaskObject(
-                    taskData.taskName,
+                    taskName,
                     taskOverrides,
                     taskData.optionOverrides,
                     taskData.label
@@ -229,7 +235,14 @@ function taskGraphFactory(
             return self;
         });
     };
-
+    var getTaskName = function(taskName){
+        var contains = taskName.indexOf("\/");
+                if(contains !== -1){
+                    var nameArray = taskName.split("\/");
+                    taskName = nameArray[nameArray.length - 1];
+                }
+        return taskName;    
+    } 
     TaskGraph.prototype.constructInlineTaskObject = function(_definition, taskOverrides,
            optionOverrides, label) {
 
@@ -360,7 +373,16 @@ function taskGraphFactory(
             assert.arrayOfObject(self.definition.tasks, 'Graph.tasks');
             return Promise.map(self.definition.tasks, function(taskData) {
                 if (!_.has(taskData, 'taskDefinition')) {
-                    return store.getTaskDefinition(taskData.taskName)
+                    var taskName = taskData.taskName;
+                    if(taskName){
+                        //var contains = taskName.indexOf("\/");
+                        //if(contains !== -1){
+                          //  var nameArray = taskName.split("\/");
+                            //taskName = nameArray[nameArray.length - 1];
+                       // }
+                         taskName = getTaskName(taskName);
+                    }
+                    return store.getTaskDefinition(taskName)
                     .then(function(definition) {
                         return {
                             taskDefinition: definition,

diff --git a/spec/lib/task-graph-spec.js b/spec/lib/task-graph-spec.js
@@ -130,6 +130,13 @@ describe('Task Graph', function () {
                 expect(graph).to.be.an.instanceof(TaskGraph);
             });
         });
+        it('should return ok if taskName with api path', function() {
+             definitions.graphDefinition.tasks[0].taskName = 'api/workflows/tasks/Task.test';
+             return TaskGraph.create('domain', { definition: definitions.graphDefinition })
+             .then(function(graph) {
+                 expect(graph).to.be.an.instanceof(TaskGraph);
+             });
+         });
 
         it('should fail on an invalid task definition', function() {
             this.sandbox.stub(TaskGraph.prototype, '_validateTaskDefinition')