@saltcorn/server 1.1.2-beta.5 → 1.1.2-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.2-beta.5",
+  "version": "1.1.2-beta.7",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.2-beta.5",
-    "@saltcorn/builder": "1.1.2-beta.5",
-    "@saltcorn/data": "1.1.2-beta.5",
-    "@saltcorn/admin-models": "1.1.2-beta.5",
-    "@saltcorn/filemanager": "1.1.2-beta.5",
-    "@saltcorn/markup": "1.1.2-beta.5",
-    "@saltcorn/plugins-loader": "1.1.2-beta.5",
-    "@saltcorn/sbadmin2": "1.1.2-beta.5",
+    "@saltcorn/base-plugin": "1.1.2-beta.7",
+    "@saltcorn/builder": "1.1.2-beta.7",
+    "@saltcorn/data": "1.1.2-beta.7",
+    "@saltcorn/admin-models": "1.1.2-beta.7",
+    "@saltcorn/filemanager": "1.1.2-beta.7",
+    "@saltcorn/markup": "1.1.2-beta.7",
+    "@saltcorn/plugins-loader": "1.1.2-beta.7",
+    "@saltcorn/sbadmin2": "1.1.2-beta.7",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -920,6 +920,27 @@ function initialize_page() {
     if (e.keyCode === 13) e.target.blur();
   });
 
+  const validate_identifier_elem = (target) => {
+    const next = target.next();
+    if (next.hasClass("expr-error")) next.remove();
+    const val = target.val();
+    if (!val) return;
+    try {
+      Function(val, "return 1");
+    } catch (error) {
+      target.after(`<small class="text-danger font-monospace d-block expr-error">
+      Invalid identifier
+    </small>`);
+    }
+  };
+  $(".validate-identifier").attr("spellcheck", false);
+  $(".validate-expression").attr("spellcheck", false);
+
+  $(".validate-identifier").bind("input", function (e) {
+    const target = $(e.target);
+    validate_identifier_elem(target);
+  });
+
   const validate_expression_elem = (target) => {
     const next = target.next();
     if (next.hasClass("expr-error")) next.remove();
@@ -932,7 +953,10 @@ function initialize_page() {
     }
     if (!val) return;
     try {
-      Function("return " + val);
+      const AsyncFunction = Object.getPrototypeOf(
+        async function () {}
+      ).constructor;
+      AsyncFunction("return " + val);
     } catch (error) {
       target.after(`<small class="text-danger font-monospace d-block expr-error">
       ${error.message}
@@ -943,6 +967,7 @@ function initialize_page() {
     const target = $(e.target);
     validate_expression_elem(target);
   });
+
   $(".validate-expression-conditional").each(function () {
     const theInput = $(this);
     theInput
@@ -1573,7 +1598,11 @@ function restore_old_button(btnId) {
   btn.removeData("old-text");
 }
 
-async function common_done(res, viewnameOrElem, isWeb = true) {
+async function common_done(res, viewnameOrElem0, isWeb = true) {
+  const viewnameOrElem =
+    viewnameOrElem0 === "undefined"
+      ? last_route_viewname
+      : viewnameOrElem0 || last_route_viewname;
   const viewname =
     typeof viewnameOrElem === "string"
       ? viewnameOrElem

package/public/saltcorn.js

@@ -34,10 +34,7 @@ function updateQueryStringParameter(uri1, key, value) {
     uri = uris[0];
   }
 
-  var re = new RegExp(
-    "([?&])" + escapeRegExp(key) + "=.*?(&|$)",
-    "i"
-  );
+  var re = new RegExp("([?&])" + escapeRegExp(key) + "=.*?(&|$)", "i");
   var separator = uri.indexOf("?") !== -1 ? "&" : "?";
   if (uri.match(re)) {
     if (Array.isArray(value)) {
@@ -267,6 +264,8 @@ function reset_spinners() {
   });
 }
 
+let last_route_viewname;
+
 function view_post(viewnameOrElem, route, data, onDone, sendState) {
   const viewname =
     typeof viewnameOrElem === "string"
@@ -274,6 +273,7 @@ function view_post(viewnameOrElem, route, data, onDone, sendState) {
       : $(viewnameOrElem)
           .closest("[data-sc-embed-viewname]")
           .attr("data-sc-embed-viewname");
+  last_route_viewname = viewname;
   const query = sendState
     ? `?${new URL(get_current_state_url()).searchParams.toString()}`
     : "";
@@ -1322,6 +1322,34 @@ function check_delete_unsaved(tablename, script_tag) {
   }
 }
 
+function handle_identical_fields(event) {
+  let form = null;
+  if (event.currentTarget.tagName === "FORM") form = event.currentTarget;
+  else form = $(event.currentTarget).closest("form")[0];
+  if (!form) {
+    console.warn("No form found");
+  } else {
+    const name = event.target.name;
+    const newValue = event.target.value;
+    const tagName = event.target.tagName;
+    const isRadio = event.target.type === "radio";
+    if (tagName === "SELECT" || isRadio) {
+      form.querySelectorAll(`select[name="${name}"]`).forEach((select) => {
+        $(select).val(newValue); //.trigger("change");
+      });
+      form
+        .querySelectorAll(`input[type="radio"][name="${name}"]`)
+        .forEach((input) => {
+          input.checked = input.value === newValue;
+        });
+    } else if (tagName === "INPUT") {
+      form.querySelectorAll(`input[name="${name}"]`).forEach((input) => {
+        input.value = newValue;
+      });
+    }
+  }
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";

package/routes/actions.js

@@ -730,6 +730,7 @@ const getWorkflowStepForm = async (
         label: req.__("Step name"),
         type: "String",
         required: true,
+        class: "validate-identifier",
         sublabel: "An identifier by which this step can be referred to.",
         validator: jsIdentifierValidator,
       },
@@ -742,6 +743,7 @@ const getWorkflowStepForm = async (
       {
         name: "wf_only_if",
         label: req.__("Only if..."),
+        class: "validate-expression",
         sublabel:
           "Optional JavaScript expression based on the run context. If given, the chosen action will only be executed if evaluates to true",
         type: "String",
@@ -1716,6 +1718,7 @@ const getWorkflowStepUserForm = async (run, trigger, step, req) => {
   const form = new Form({
     action: `/actions/fill-workflow-form/${run.id}`,
     submitLabel: run.wait_info.output ? req.__("OK") : req.__("Submit"),
+    onSubmit: "press_store_button(this)",
     blurb,
     formStyle: run.wait_info.output || req.xhr ? "vert" : undefined,
     fields: await run.userFormFields(step),
@@ -1788,8 +1791,8 @@ router.post(
       if (req.xhr) {
         const retDirs = await run.popReturnDirectives();
 
-        if (runres?.popup) retDirs.popup = runres.popup;
-        res.json({ success: "ok", ...retDirs });
+        //if (runres?.popup) retDirs.popup = runres.popup;
+        res.json({ success: "ok", ...runres, ...retDirs });
       } else {
         if (run.context.goto) res.redirect(run.context.goto);
         else res.redirect("/");

package/tests/view.test.js

@@ -1134,3 +1134,41 @@ describe("legacy relations with relation path", () => {
       .expect(toInclude("Delete"));
   });
 });
+
+describe("identical fields", () => {
+  it("runs a post with an author array ", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/view/authoredit_identicals")
+      .set("Cookie", loginCookie)
+      .send("author=Charles&author=Charles")
+      .expect(toRedirect("/view/authorlist"));
+    const table = Table.findOne({ name: "books" });
+    const rows = await table.getRows();
+    expect(rows).toContainEqual({
+      id: 3,
+      author: "Charles",
+      pages: 678,
+      publisher: null,
+    });
+  });
+
+  it("runs a post with only one author", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/view/authoredit_identicals")
+      .set("Cookie", loginCookie)
+      .send("author=Fjodor")
+      .expect(toRedirect("/view/authorlist"));
+    const table = Table.findOne({ name: "books" });
+    const rows = await table.getRows();
+    expect(rows).toContainEqual({
+      id: 4,
+      author: "Fjodor",
+      pages: 678,
+      publisher: null,
+    });
+  });
+});