@saltcorn/server 1.6.0-alpha.10 → 1.6.0-alpha.11

package/public/saltcorn-builder.css

@@ -123,7 +123,9 @@ div.wrap-builder-elem label {
 
 #builder-main-canvas {
   height: calc(100vh - 70px);
-  overflow-y: auto;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 
 #builder-main-canvas .is-text a {
@@ -155,6 +157,14 @@ div.wrap-builder-elem label {
   outline: 1px dashed #808080;
 }
 
+#builder-main-canvas .builder-columns {
+  padding: 4px;
+  outline: 1px dashed transparent;
+}
+#builder-main-canvas .builder-columns:hover {
+  outline-color: #b0b0b0;
+}
+
 #builder-main-canvas div.root-canvas {
   margin-top: 1px;
   padding: 2px;
@@ -745,9 +755,15 @@ body.builder-dark .builder-select__menu-notice,
 }
 
 /* Ensure selected nodes maintain visibility */
-.builder-layer-node.selected-node {
-  outline: 1px dashed #2680eb; /* Example: blue dashed outline */
-  outline-offset: -2px;
+.builder-layer-node.selected {
+  background-color: #cce5ff;
+  border-left: 3px solid #2680eb;
+}
+
+.builder-dark-panel .builder-layer-node.selected,
+[data-bs-theme="dark"] .builder-layer-node.selected {
+  background-color: #1a3a5c;
+  border-left: 3px solid #4da3ff;
 }
 
 .code-modal {
@@ -756,4 +772,37 @@ body.builder-dark .builder-select__menu-notice,
 
 .code-modal-form {
   min-height: 70vh;
-}
+}
+
+.device-preview-toolbar {
+  display: flex;
+  justify-content: flex-start;
+  gap: 4px;
+  padding: 5px 0;
+  flex-shrink: 0;
+}
+
+.device-preview-btn {
+  padding: 3px 10px;
+  line-height: 1;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.device-preview-scroll-area {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.device-preview-canvas-wrapper {
+  transition: max-width 0.3s ease;
+  margin: 0 auto;
+}
+
+.device-preview-constrained {
+  border-left: 1px dashed #adb5bd;
+  border-right: 1px dashed #adb5bd;
+}
+

package/public/saltcorn-common.js

@@ -1664,6 +1664,13 @@ ${value}`;
         });
       }
     });
+    if (window.mermaid) {
+      $(e.target)
+        .find(".mermaid[mm-src]")
+        .each(function(){$(this).html($(this).attr("mm-src"))})
+        .removeAttr("data-processed");
+      mermaid.init(undefined, $(e.target).find(".mermaid"));
+    }
   };
   $(".lazy-accoordion").on("show.bs.collapse", lazyAccHandler);
   $(".lazy-tabs").on("show.bs.tab", function (e) {

package/public/saltcorn.js

@@ -1229,7 +1229,7 @@ function check_ios_build_deps() {
   $.ajax("/admin/mobile-app/check-ios-build-tools", {
     type: "GET",
     success: function (res) {
-      const { xcodebuild, cocoapods, isMac } = res;
+      const { xcodebuild, cocoapods, iosRuntime, isMac } = res;
       if (isMac) {
         // update xcodebuild status
         if (xcodebuild.installed) {
@@ -1260,6 +1260,17 @@ function check_ios_build_deps() {
             `not available<i class="p-2 fas fa-times text-danger"></i>`
           );
         }
+
+        // update iOS runtime status
+        if (iosRuntime && iosRuntime.available) {
+          $("#iosRuntimeStatusId").html(
+            `${iosRuntime.version}<i class="p-2 fas fa-check text-success"></i>`
+          );
+        } else {
+          $("#iosRuntimeStatusId").html(
+            `not available<i class="p-2 fas fa-times text-danger"></i>`
+          );
+        }
       }
     },
   });

package/routes/actions.js

@@ -140,6 +140,7 @@ const workflowStrings = (req, trigger) => ({
   loopBody: req.__("Loop body"),
   openRuns: req.__("Show runs »"),
   configure: req.__(`%s configuration`, trigger.name),
+  copyStep: req.__("Copy"),
 });
 
 const getWorkflowEditorData = async (req, trigger, stepsIn) => {
@@ -166,6 +167,7 @@ const getWorkflowEditorData = async (req, trigger, stepsIn) => {
       connect: `/actions/workflow/connect/${trigger.id}`,
       positions: `/actions/workflow/positions/${trigger.id}`,
       sizes: `/actions/workflow/sizes/${trigger.id}`,
+      copy: `/actions/workflow/copy/${trigger.id}`,
       deleteStep: `/actions/delete-step`,
       configure: `/actions/configure/${trigger.id}`,
       runs: `/actions/runs/?trigger=${trigger.id}`,
@@ -800,6 +802,55 @@ router.post(
   })
 );
 
+router.post(
+  "/workflow/copy/:trigger_id",
+  isAdminOrHasConfigMinRole("min_role_edit_triggers"),
+  error_catcher(async (req, res) => {
+    const trigger_id = +req.params.trigger_id;
+    const { step_id } = req.body || {};
+    const source = await WorkflowStep.findOne({ id: +step_id, trigger_id });
+    if (!source) return res.status(404).json({ error: "Step not found" });
+
+    const steps = await WorkflowStep.find({ trigger_id });
+    const existingNames = new Set(steps.map((s) => s.name));
+    const safeName = String(source.name || "").replace(/\s+/g, "_");
+    const baseName = `${safeName}_copy`;
+    let candidate = baseName;
+    let suffix = 2;
+    while (existingNames.has(candidate)) {
+      candidate = `${baseName}${suffix++}`;
+    }
+
+    const newStepId = await WorkflowStep.create({
+      trigger_id,
+      name: candidate,
+      next_step: null,
+      only_if: source.only_if,
+      action_name: source.action_name,
+      initial_step: false,
+      configuration: source.configuration,
+    });
+
+    const trigger = await Trigger.findOne({ id: trigger_id });
+    Trigger.emitEvent(
+      "AppChange",
+      `Trigger ${trigger?.name || trigger_id}`,
+      req.user,
+      {
+        entity_type: "Trigger",
+        entity_name: trigger?.name || trigger_id,
+      }
+    );
+
+    const newStep = await WorkflowStep.findOne({ id: newStepId });
+
+    res.json({
+      success: "ok",
+      step: serializeWorkflowStep(newStep, { req, trigger }),
+    });
+  })
+);
+
 router.post(
   "/workflow/sizes/:trigger_id",
   isAdminOrHasConfigMinRole("min_role_edit_triggers"),

package/routes/admin.js

@@ -2479,6 +2479,34 @@ const checkCocoaPods = () => {
   });
 };
 
+const checkIosRuntime = () => {
+  return new Promise((resolve) => {
+    exec("xcrun simctl list runtimes --json", (error, stdout) => {
+      if (error) {
+        resolve({ available: false });
+      } else {
+        try {
+          const data = JSON.parse(stdout);
+          const runtimes = data.runtimes || [];
+          const iosRuntimes = runtimes.filter(
+            (r) => r.isAvailable && r.name && r.name.startsWith("iOS")
+          );
+          if (iosRuntimes.length > 0) {
+            resolve({
+              available: true,
+              version: iosRuntimes[iosRuntimes.length - 1].name,
+            });
+          } else {
+            resolve({ available: false });
+          }
+        } catch (e) {
+          resolve({ available: false });
+        }
+      }
+    });
+  });
+};
+
 const versFullfilled = (version, minMajVersion) => {
   const vTokens = version.split(".");
   const majVers = parseInt(vTokens[0]);
@@ -2496,6 +2524,8 @@ const buildIosConfigBox = ({
   xcodebuildVersion,
   cocoaPodsAvailable,
   cocoaPodsVersion,
+  iosRuntimeAvailable,
+  iosRuntimeVersion,
   provisioningFiles,
   allAppCfgFiles,
   builderSettings,
@@ -2583,6 +2613,29 @@ const buildIosConfigBox = ({
                     })
                   )
                 )
+              ),
+              div(
+                {
+                  class: "row",
+                },
+                // iOS runtime status
+                div(
+                  { class: "col-sm-4" },
+                  div({ class: "fw-bold form-label label" }, "iOS runtime"),
+                  span(
+                    { id: "iosRuntimeStatusId" },
+                    iosRuntimeAvailable
+                      ? span(iosRuntimeVersion)
+                      : span(req.__("not available")),
+                    i({
+                      class: `fas p-2 ${
+                        iosRuntimeAvailable
+                          ? "fa-check text-success"
+                          : "fa-times text-danger"
+                      }`,
+                    })
+                  )
+                )
               )
             )
           : span(
@@ -2903,6 +2956,9 @@ router.get(
     const cocoaPodCheckRes = await checkCocoaPods();
     const cocoaPodsAvailable = cocoaPodCheckRes.installed;
     const cocoaPodsVersion = cocoaPodCheckRes.version;
+    const iosRuntimeCheckRes = await checkIosRuntime();
+    const iosRuntimeAvailable = iosRuntimeCheckRes.available;
+    const iosRuntimeVersion = iosRuntimeCheckRes.version;
     const layout = getState().getLayout(req.user);
     const isSbadmin2 = layout === getState().layouts.sbadmin2;
     const isEntrypointByRole = builderSettings.entryPointByRole === "on";
@@ -4245,6 +4301,8 @@ router.get(
                     xcodebuildVersion,
                     cocoaPodsAvailable,
                     cocoaPodsVersion,
+                    iosRuntimeAvailable,
+                    iosRuntimeVersion,
                     provisioningFiles,
                     allAppCfgFiles,
                     builderSettings,
@@ -4842,8 +4900,9 @@ router.get(
   error_catcher(async (req, res) => {
     const xcodebuild = await checkXcodebuild();
     const cocoapods = await checkCocoaPods();
+    const iosRuntime = await checkIosRuntime();
     const isMac = process.platform === "darwin";
-    res.json({ xcodebuild, cocoapods, isMac });
+    res.json({ xcodebuild, cocoapods, iosRuntime, isMac });
   })
 );
 

package/routes/pageedit.js

@@ -436,6 +436,7 @@ const wrap = (contents, noCard, req, page) => ({
           ? { href: `/page/${encodeURIComponent(page.name)}`, text: page.name }
           : { text: req.__("New") },
       ],
+      right: '<div id="builder-header-actions" class="d-flex align-items-center gap-2"></div>',
     },
     {
       type: noCard ? "container" : "card",

package/routes/viewedit.js

@@ -635,6 +635,7 @@ const respondWorkflow = (view, wf, wfres, req, res, table) => {
           },
           { workflow: wf, step: wfres },
         ],
+        right: '<div id="builder-header-actions" class="d-flex align-items-center gap-2"></div>',
       },
       {
         type: noCard ? "container" : "card",