@saltcorn/server 1.2.0-beta.1 → 1.2.0-beta.2

package/public/saltcorn-common.js

@@ -561,6 +561,16 @@ function splitTargetMatch(elemValue, target, keySpec) {
   return elemValueShort === target;
 }
 
+function get_form_data(e_in, rndid) {
+  const e = e_in.viewname
+    ? $(`form[data-viewname="${e_in.viewname}"]`)
+    : $(e_in).closest(".form-namespace");
+  const form = $(e).closest("form");
+  const data = new FormData(form[0]);
+  data.append("rndid", rndid);
+  return data;
+}
+
 function get_form_record(e_in, select_labels) {
   const rec = {};
 
@@ -2252,9 +2262,34 @@ function restrict_options(selector, restriction) {
     });
 }
 
+// alternative to jQuery.closest
+// bubbles until the end of the item view of a feed
+// needed when don't want to bubble too far because the browser removed an invalid form
+function formInEmbed(event) {
+  let form = null;
+  let el = event.srcElement;
+  while (el) {
+    if (el.hasAttribute && el.hasAttribute("data-sc-embed-viewname")) {
+      break;
+    }
+    if (el.tagName && el.tagName.toLowerCase() === "form") {
+      form = el;
+      break;
+    }
+    el = el.parentElement;
+  }
+  return form;
+}
+
 function handle_identical_fields(event) {
   let form = null;
-  if (event.srcElement) form = $(event.srcElement).closest("form")[0];
+  if (event.srcElement) {
+    form = formInEmbed(event);
+    if (!form) {
+      console.warn("No form found");
+      return;
+    }
+  }
   if (!form) {
     if (event.currentTarget.tagName === "FORM") form = event.currentTarget;
     else form = $(event.currentTarget).closest("form")[0];
@@ -2268,16 +2303,25 @@ function handle_identical_fields(event) {
     const isRadio = event.target.type === "radio";
     if (tagName === "SELECT" || isRadio) {
       form.querySelectorAll(`select[name="${name}"]`).forEach((select) => {
-        $(select).val(newValue); //.trigger("change");
+        const closestEmbed = select.closest("[data-sc-embed-viewname]");
+        if (!closestEmbed || !form.contains(closestEmbed)) {
+          $(select).val(newValue);
+        }
       });
       form
         .querySelectorAll(`input[type="radio"][name="${name}"]`)
         .forEach((input) => {
-          input.checked = input.value === newValue;
+          const closestEmbed = input.closest("[data-sc-embed-viewname]");
+          if (!closestEmbed || !form.contains(closestEmbed)) {
+            input.checked = input.value === newValue;
+          }
         });
     } else if (tagName === "INPUT") {
       form.querySelectorAll(`input[name="${name}"]`).forEach((input) => {
-        if (input.type !== "file") input.value = newValue;
+        const closestEmbed = input.closest("[data-sc-embed-viewname]");
+        if (!closestEmbed || !form.contains(closestEmbed)) {
+          if (input.type !== "file") input.value = newValue;
+        }
       });
     }
   }

package/public/saltcorn.js

@@ -280,17 +280,22 @@ function view_post(viewnameOrElem, route, data, onDone, sendState) {
   const query = sendState
     ? `?${new URL(get_current_state_url()).searchParams.toString()}`
     : "";
+  const isFormData = data instanceof FormData;
   $.ajax("/view/" + viewname + "/" + route + query, {
-    dataType: "json",
     type: "POST",
     headers: {
       "CSRF-Token": _sc_globalCsrf,
     },
-    contentType:
-      typeof data === "string"
-        ? "application/x-www-form-urlencoded"
-        : "application/json",
-    data: typeof data === "string" ? data : JSON.stringify(data),
+    ...(!isFormData
+      ? {
+          dataType: "json",
+          contentType:
+            typeof data === "string"
+              ? "application/x-www-form-urlencoded"
+              : "application/json",
+          data: typeof data === "string" ? data : JSON.stringify(data),
+        }
+      : { contentType: false, processData: false, data: data }),
   })
     .done(function (res) {
       if (onDone) onDone(res);

package/routes/actions.js

@@ -1488,7 +1488,7 @@ router.post(
         if (astep)
           await astep.update({
             configuration: {
-              ...step.configuration,
+              ...astep.configuration,
               loop_body_initial_step: step.name,
             },
           });
@@ -1559,7 +1559,11 @@ router.get(
     const q = {};
     const selOpts = { orderBy: "started_at", orderDesc: true, limit: 20 };
     if (_page) selOpts.offset = 20 * (parseInt(_page) - 1);
-    if (trigger) q.trigger_id = trigger;
+    let trName = "";
+    if (trigger) {
+      q.trigger_id = trigger;
+      trName = trNames[+q.trigger_id];
+    }
     const runs = await WorkflowRun.find(q, selOpts);
     const count = await WorkflowRun.count(q);
 
@@ -1607,15 +1611,21 @@ router.get(
         },
       }
     );
+    const title = trName
+      ? req.__(
+          `Workflow runs: %s`,
+          a({ href: `/actions/configure/${+trigger}` }, trName)
+        )
+      : req.__(`Workflow runs`);
     send_events_page({
       res,
       req,
       active_sub: "Workflow runs",
-      page_title: req.__(`Workflow runs`),
+      page_title: title,
       contents: {
         type: "card",
         titleAjaxIndicator: true,
-        title: req.__("Workflow runs"),
+        title,
         contents: wfTable,
       },
     });