@saltcorn/workflow-editor 1.6.0-alpha.12 → 1.6.0-alpha.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/workflow-editor",
-  "version": "1.6.0-alpha.12",
+  "version": "1.6.0-alpha.14",
   "description": "React Flow-based workflow editor for Saltcorn",
   "main": "index.js",
   "homepage": "https://saltcorn.com",

package/src/WorkflowEditor.jsx

@@ -303,6 +303,11 @@ const buildGraph = (
   const allStepNames = steps.map((s) => s.name).filter(Boolean);
   const orderIndex = new Map(steps.map((s, idx) => [String(s.id), idx]));
 
+  const hasAnyWorkflowPosition = steps.some(
+    (s) => s?.configuration?.workflow_position
+  );
+  const shouldIndentLoopBodies = steps.length > 0 && !hasAnyWorkflowPosition;
+
   const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 
   const extractNextStepNames = (rawNextStep) => {
@@ -416,6 +421,9 @@ const buildGraph = (
         width: DEFAULT_NODE_WIDTH,
         height: DEFAULT_NODE_HEIGHT,
       };
+      const bodyX = shouldIndentLoopBodies
+        ? (loopPos.x || 0) + (loopSize.width || DEFAULT_NODE_WIDTH) + H_GAP
+        : loopPos.x;
       let yCursor = loopPos.y + loopSize.height + V_GAP;
 
       body.forEach((s) => {
@@ -425,7 +433,7 @@ const buildGraph = (
           height: DEFAULT_NODE_HEIGHT,
         };
         positionOverrides[String(s.id)] = {
-          x: loopPos.x,
+          x: bodyX,
           y: yCursor,
         };
         yCursor += bodySize.height + V_GAP;
@@ -784,21 +792,20 @@ const StepDrawer = ({
             <button className="btn btn-secondary" onClick={onClose}>
               Close
             </button>
-            {!modal.stepId && (
-              <button
-                className="btn btn-primary"
-                onClick={() =>
-                  innerRef.current
-                    ?.querySelector("form")
-                    ?.dispatchEvent(
-                      new Event("submit", { cancelable: true, bubbles: true })
-                    )
-                }
-                disabled={submitting}
-              >
-                {submitting ? "Saving..." : "Save"}
-              </button>
-            )}
+
+            <button
+              className="btn btn-primary"
+              onClick={() =>
+                innerRef.current
+                  ?.querySelector("form")
+                  ?.dispatchEvent(
+                    new Event("submit", { cancelable: true, bubbles: true })
+                  )
+              }
+              disabled={submitting}
+            >
+              {submitting ? "Saving..." : "Save"}
+            </button>
           </div>
         </>
       ) : null}
@@ -871,7 +878,7 @@ const WorkflowEditor = ({ data }) => {
     const cardBodyEl = shellEl.closest(".card-body");
     if (!cardBodyEl) return;
 
-    const minHeight = 320;
+    const minHeight = 400;
     const bottomMargin = 28;
 
     const cardBodyRect = cardBodyEl.getBoundingClientRect();
@@ -1509,7 +1516,7 @@ const WorkflowEditor = ({ data }) => {
             autoSavingRef.current = true;
             try {
               await submitStepForm(formEl, { closeOnSuccess: false });
-            } catch (err) {
+            } catch (err) {             
               setError(err.message);
             } finally {
               autoSavingRef.current = false;