beta-glozic-workflow 1.23.0 → 1.26.0

package/dist/css/style.css

@@ -372,4 +372,65 @@
     color: #fff !important;
     background-color: #2bbbad !important;
     border-color: #2bbbad !important;
-}
+}
+
+.initial-branch::before {
+    position: absolute;
+    left: -19px;
+    top: 11px;
+    width: 53px;
+    z-index: 99;
+    font-size: 12px;
+    background: white;
+}
+
+.initial-if::before {
+    position: absolute;
+    left: -14px;
+    top: 11px;
+    width: 53px;
+    z-index: 99;
+    font-size: 12px;
+    background: white;
+    
+}
+
+.initial-branch-value1::before {
+    content: "Branch 1";
+}
+.initial-branch-value2::before {
+    content: "Branch 2";
+}
+.initial-branch-value3::before {
+    content: "Branch 3";
+}
+.initial-branch-value4::before {
+    content: "Branch 4";
+}
+.initial-branch-value5::before {
+    content: "Branch 5";
+}
+.initial-branch-value6::before {
+    content: "Branch 6";
+}
+.initial-branch-value7::before {
+    content: "Branch 7";
+}
+.initial-branch-value8::before {
+    content: "Branch 8";
+}
+.initial-branch-value9::before {
+    content: "Branch 9";
+}
+.initial-branch-value10::before {
+    content: "Branch 10";
+}
+.initial-if-value1::before {
+    content: "False";
+}
+
+.initial-if-value2::before {
+    content: "True";
+}
+
+

package/dist/index.js

@@ -74,11 +74,68 @@ class Designer extends _react.Component {
           data.definition.actions = props.Nodes;
           this.importedJsonFile(data);
         } else if (props.options.updatedNodeId && props.options.properties) {
-          console.log('on update action config');
-          console.log(props.options);
+          //Update Properties
           if (this.nodes[props.options.updatedNodeId]) {
             this.nodes[props.options.updatedNodeId].configuration["properties"] = props.options.properties;
           }
+
+          // Update Branch
+          function updateBranchesByActionID(data, targetActionID, newBranches) {
+            try {
+              // Recursive function to traverse the structure
+              function traverse(actions) {
+                for (let action of actions) {
+                  if (action.configuration && action.configuration.actionID === targetActionID) {
+                    // Update branches array when actionID matches
+                    var tempBranch = action.branches;
+                    if (tempBranch.length > newBranches.length) {
+                      tempBranch = tempBranch.slice(0, newBranches.length);
+                    } else {
+                      newBranches.forEach((ele, index) => {
+                        if (!tempBranch[index]) {
+                          tempBranch.push({
+                            name: "branch".concat(index),
+                            actions: []
+                          });
+                        }
+                      });
+                    }
+                    action.branches = tempBranch;
+                    return true; // Exit once the update is done
+                  }
+
+                  // Check nested branches if exist
+                  if (action.branches) {
+                    for (let branch of action.branches) {
+                      if (traverse(branch.actions)) {
+                        return true;
+                      }
+                    }
+                  }
+                }
+                return false; // If no match found at this level
+              }
+
+              // Start traversing from the root actions
+              const isUpdated = traverse(data);
+
+              // Return status or data based on the update result
+              return isUpdated ? data : null;
+            } catch (error) {
+              console.error("An error occurred while updating branches:", error);
+              return null; // Return null if there's an error
+            }
+          }
+          if (this.nodes[props.options.updatedNodeId].nodeType == "BRANCH" && this.nodes[props.options.updatedNodeId].configuration) {
+            const newBranches = this.nodes[props.options.updatedNodeId].configuration.properties.branches;
+            const updatedData = updateBranchesByActionID(props.Nodes, props.options.updatedNodeId, newBranches);
+            let data = JSON.parse(JSON.stringify(layout));
+            data.definition.actions = updatedData;
+            this.importedJsonFile(data);
+          }
+          window.setTimeout(() => {
+            self.props.onChange(self.flowchartToJson());
+          }, 400);
         }
       }
     });
@@ -1028,6 +1085,7 @@ class Designer extends _react.Component {
     //let item = config.taskType[datatype.parent][datatype.type];
     let item = taskConfig[datatype.type];
     let branches = copyTask ? copyTask.branches ? copyTask.branches.length : null : item.branch;
+    let nodeType = copyTask ? copyTask !== null && copyTask !== void 0 && copyTask.nodeType ? copyTask.nodeType : null : item === null || item === void 0 ? void 0 : item.nodeType;
     let connections = this.firstInstance.getConnections({
       source: source,
       target: target
@@ -1234,7 +1292,13 @@ class Designer extends _react.Component {
         let topPos = this.nodes[target].element.offsetTop - _workflow.config.nodeGap;
         newTopBranchNode.setAttribute('id', topBranchId);
         newBotBranchNode.setAttribute('id', botBranchId);
-        newTopBranchNode.className = 'fc-item fc-item-draggable fc-item-end-point';
+        if (nodeType == "BRANCH") {
+          newTopBranchNode.className = "fc-item fc-item-draggable fc-item-end-point initial-branch initial-branch-value".concat(i + 1);
+        } else if (nodeType == "Condition") {
+          newTopBranchNode.className = "fc-item fc-item-draggable fc-item-end-point initial-if initial-if-value".concat(i + 1);
+        } else {
+          newTopBranchNode.className = "fc-item fc-item-draggable fc-item-end-point";
+        }
         newBotBranchNode.className = 'fc-item fc-item-draggable fc-item-end-point';
         let left;
         let top;

package/dist/utils/taskConfig.js

@@ -272,7 +272,7 @@ const taskConfig = exports.taskConfig = {
         "name": "branch1",
         "actions": []
       }],
-      "title": "Parallel branches",
+      "title": "Branch",
       "nodeType": "BRANCH",
       "name": "BRANCH",
       "description": "IF_ELSE(CMP, branch_if_true, branch_if_false)",

package/dist/utils/workflow.config.js

@@ -9,7 +9,7 @@ var _taskConfig = require("./taskConfig");
 const config = exports.config = {
   MAXIMUM_NESTED: 5,
   logger: true,
-  nodeGap: 60,
+  nodeGap: 100,
   nodeStartEndSize: 35,
   nodeWidthDefault: 160,
   nodeSizeDefault: 44,

package/package.json

@@ -7,7 +7,7 @@
     "components",
     "ui"
   ],
-  "version": "1.23.0",
+  "version": "1.26.0",
   "private": false,
   "main": "dist/index.js",
   "module": "dist/index.js",