Merge pull request #24 from Exabyte-io/fix/SOF-6389-1

SOF-6389-1: change subworkflow.addUnit signature without head parameter

Author: unsigned6

src/subworkflows/subworkflow.js

@@ -206,22 +206,14 @@ export class Subworkflow extends BaseSubworkflow {
      * @param head {Boolean}
      * @param index {Number}
      */
-    addUnit(unit, head = false, index = -1) {
+    addUnit(unit, index = -1) {
         const { units } = this;
         if (units.length === 0) {
             unit.head = true;
             this.setUnits([unit]);
         } else {
-            if (head) {
-                const first = lodash.first(units);
-                unit.next = first.flowchartId;
-                units.unshift(unit);
-            } else {
-                const last = lodash.last(units);
-                last.next = unit.flowchartId;
-                if (index >= 0) units.splice(index, 0, unit);
-                else units.push(unit);
-            }
+            if (index >= 0) units.splice(index, 0, unit);
+            else units.push(unit);
             this.setUnits(setNextLinks(setUnitsHead(units)));
         }
     }

tests/subworkflow.test.js

@@ -1,6 +1,17 @@
 import { expect } from "chai";
 
 import { createSubworkflowByName } from "../src/subworkflows";
+import { AssignmentUnit, ConditionUnit } from "../src/units";
+
+const assignmentUnitData = {
+    type: "assignment",
+    application: { name: "espresso", version: "5.4.0" },
+};
+
+const conditionUnitData = {
+    type: "condition",
+    application: { name: "espresso", version: "5.4.0" },
+};
 
 describe("subworkflows", () => {
     it("have updateContext function", () => {
@@ -19,4 +30,59 @@ describe("subworkflows", () => {
         subworkflow.updateContext(newContext);
         expect(subworkflow.context).to.include(newContext);
     });
+    it("add unit to list end", () => {
+        const subworkflow = createSubworkflowByName({
+            appName: "espresso",
+            swfName: "total_energy",
+        });
+
+        expect(subworkflow.units.length).to.be.equal(1);
+        expect(subworkflow.units[0]._json.type).to.be.equal("execution");
+
+        const assignementUnit = new AssignmentUnit(assignmentUnitData);
+        subworkflow.addUnit(assignementUnit, -1);
+
+        expect(subworkflow.units.length).to.be.equal(2);
+        expect(subworkflow.units[0]._json.type).to.be.equal("execution");
+        expect(subworkflow.units[1]._json.type).to.be.equal("assignment");
+    });
+    it("add unit to list head", () => {
+        const subworkflow = createSubworkflowByName({
+            appName: "espresso",
+            swfName: "total_energy",
+        });
+
+        expect(subworkflow.units.length).to.be.equal(1);
+        expect(subworkflow.units[0]._json.type).to.be.equal("execution");
+
+        const assignementUnit = new AssignmentUnit(assignmentUnitData);
+        subworkflow.addUnit(assignementUnit, 0);
+
+        expect(subworkflow.units.length).to.be.equal(2);
+        expect(subworkflow.units[0]._json.type).to.be.equal("assignment");
+        expect(subworkflow.units[1]._json.type).to.be.equal("execution");
+    });
+    it("add unit in the middle list of two", () => {
+        const subworkflow = createSubworkflowByName({
+            appName: "espresso",
+            swfName: "total_energy",
+        });
+        expect(subworkflow.units.length).to.be.equal(1);
+        expect(subworkflow.units[0]._json.type).to.be.equal("execution");
+
+        const assignementUnit = new AssignmentUnit(assignmentUnitData);
+        const conditionUnit = new ConditionUnit(conditionUnitData);
+        subworkflow.addUnit(assignementUnit, -1);
+
+        expect(subworkflow.units.length).to.be.equal(2);
+        expect(subworkflow.units[0]._json.type).to.be.equal("execution");
+        expect(subworkflow.units[1]._json.type).to.be.equal("assignment");
+
+        subworkflow.addUnit(conditionUnit, 1);
+
+        expect(subworkflow.units.length).to.be.equal(3);
+        expect(subworkflow.units[0]._json.type).to.be.equal("execution");
+        expect(subworkflow.units[1]._json.type).to.be.equal("condition");
+        expect(subworkflow.units[2]._json.type).to.be.equal("assignment");
+    });
 });