update: clone before modifying

Author: VsevolodX

dist/js/workflows/create.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createWorkflow = createWorkflow;
+var _lodash = _interopRequireDefault(require("lodash"));
 var _create = require("../subworkflows/create");
 var _units = require("../units");
 var _map = require("../units/map");
 var _utils = require("../utils");
 var _workflow = require("./workflow");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * @summary Helper for creating Map units for complex workflows
  * @param config {Object} map unit configuration
@@ -94,9 +96,12 @@ function createSubworkflowUnit({
   const {
     [appName]: dataByApp
   } = subworkflows;
-  let {
-    [unitName]: subworkflowData
+  const {
+    [unitName]: originalSubworkflowData
   } = dataByApp;
+
+  // Clone to avoid modifying shared data
+  let subworkflowData = _lodash.default.cloneDeep(originalSubworkflowData);
   subworkflowData.config = {
     ...subworkflowData.config,
     ...config
@@ -107,11 +112,9 @@ function createSubworkflowUnit({
   });
   if (uniqueFlowchartIds && unitIndex !== undefined) {
     subworkflowData.units.forEach(unit => {
-      if (unit.flowchartId) {
-        unit.flowchartId = `${unit.flowchartId}-${unitIndex}`;
+      if (unit.config && unit.config.flowchartId) {
+        unit.config.flowchartId = `${unit.config.flowchartId}-${unitIndex}`;
       }
-    });
-    subworkflowData.units.forEach(unit => {
       if (unit.next) {
         unit.next = `${unit.next}-${unitIndex}`;
       }

src/js/workflows/create.js

@@ -1,3 +1,5 @@
+import lodash from "lodash";
+
 import { createSubworkflow } from "../subworkflows/create";
 import { UnitFactory } from "../units";
 import { defaultMapConfig } from "../units/map";
@@ -49,18 +51,18 @@ function createSubworkflowUnit({ appName, unitData, unitIndex, workflowData, ...
     const { name: unitName, unitConfigs, config, uniqueFlowchartIds } = unitData;
     const { subworkflows } = workflowData;
     const { [appName]: dataByApp } = subworkflows;
-    let { [unitName]: subworkflowData } = dataByApp;
+    const { [unitName]: originalSubworkflowData } = dataByApp;
+
+    // Clone to avoid modifying shared data
+    let subworkflowData = lodash.cloneDeep(originalSubworkflowData);
     subworkflowData.config = { ...subworkflowData.config, ...config };
     if (unitConfigs) subworkflowData = updateUnitConfigs({ subworkflowData, unitConfigs });
 
     if (uniqueFlowchartIds && unitIndex !== undefined) {
         subworkflowData.units.forEach((unit) => {
-            if (unit.flowchartId) {
-                unit.flowchartId = `${unit.flowchartId}-${unitIndex}`;
+            if (unit.config && unit.config.flowchartId) {
+                unit.config.flowchartId = `${unit.config.flowchartId}-${unitIndex}`;
             }
-        });
-
-        subworkflowData.units.forEach((unit) => {
             if (unit.next) {
                 unit.next = `${unit.next}-${unitIndex}`;
             }

tests/js/workflow.test.js

@@ -201,3 +201,82 @@ describe("Workflow UUIDs", () => {
         expect(workflow1._id).to.equal(workflow2._id);
     });
 });
+
+describe("subworkflow uniqueFlowchartIds", () => {
+    it("should append suffix to flowchart IDs when uniqueFlowchartIds is true", () => {
+        const workflowData = {
+            name: "Test Workflow",
+            units: [
+                {
+                    name: "average_electrostatic_potential_via_band_structure",
+                    type: "subworkflow",
+                    uniqueFlowchartIds: true,
+                },
+            ],
+        };
+
+        const workflow = createWorkflow({
+            appName: "espresso",
+            workflowData,
+            workflowSubworkflowMapByApplication,
+            workflowCls: Workflow,
+            SubworkflowCls: Subworkflow,
+            UnitFactoryCls: UnitFactory,
+            unitBuilders: builders,
+        });
+
+        const subworkflowUnit = workflow.subworkflows[0];
+
+        // Check that explicit flowchart IDs have suffix (units at index 2 and 7)
+        expect(subworkflowUnit.units[2].flowchartId).to.equal(
+            "pw-bands-calculate-band-gap-right-1",
+        );
+        expect(subworkflowUnit.units[7].flowchartId).to.equal(
+            "average-electrostatic-potential-right-1",
+        );
+    });
+
+    it("should use different suffixes for multiple subworkflow instances", () => {
+        const workflowData = {
+            name: "Test Workflow",
+            units: [
+                {
+                    name: "average_electrostatic_potential_via_band_structure",
+                    type: "subworkflow",
+                    uniqueFlowchartIds: true,
+                },
+                {
+                    name: "average_electrostatic_potential_via_band_structure",
+                    type: "subworkflow",
+                    uniqueFlowchartIds: true,
+                },
+            ],
+        };
+
+        const workflow = createWorkflow({
+            appName: "espresso",
+            workflowData,
+            workflowSubworkflowMapByApplication,
+            workflowCls: Workflow,
+            SubworkflowCls: Subworkflow,
+            UnitFactoryCls: UnitFactory,
+            unitBuilders: builders,
+        });
+
+        // First subworkflow should have -1 suffix
+        expect(workflow.subworkflows[0].units[2].flowchartId).to.equal(
+            "pw-bands-calculate-band-gap-right-1",
+        );
+        expect(workflow.subworkflows[0].units[7].flowchartId).to.equal(
+            "average-electrostatic-potential-right-1",
+        );
+
+        // Second subworkflow should have -2 suffix
+        expect(workflow.subworkflows[1].units[2].flowchartId).to.equal(
+            "pw-bands-calculate-band-gap-right-2",
+        );
+        expect(workflow.subworkflows[1].units[7].flowchartId).to.equal(
+            "average-electrostatic-potential-right-2",
+        );
+    });
+});