@saltcorn/server 1.1.2-beta.15 → 1.1.2-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.2-beta.15",
+  "version": "1.1.2-beta.17",
   "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.15",
-    "@saltcorn/builder": "1.1.2-beta.15",
-    "@saltcorn/data": "1.1.2-beta.15",
-    "@saltcorn/admin-models": "1.1.2-beta.15",
-    "@saltcorn/filemanager": "1.1.2-beta.15",
-    "@saltcorn/markup": "1.1.2-beta.15",
-    "@saltcorn/plugins-loader": "1.1.2-beta.15",
-    "@saltcorn/sbadmin2": "1.1.2-beta.15",
+    "@saltcorn/base-plugin": "1.1.2-beta.17",
+    "@saltcorn/builder": "1.1.2-beta.17",
+    "@saltcorn/data": "1.1.2-beta.17",
+    "@saltcorn/admin-models": "1.1.2-beta.17",
+    "@saltcorn/filemanager": "1.1.2-beta.17",
+    "@saltcorn/markup": "1.1.2-beta.17",
+    "@saltcorn/plugins-loader": "1.1.2-beta.17",
+    "@saltcorn/sbadmin2": "1.1.2-beta.17",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -318,11 +318,11 @@ function apply_showif() {
         a.label === dynwhere.neutral_label
           ? -1
           : b.label === dynwhere.neutral_label
-          ? 1
-          : (a.label?.toLowerCase?.() || a.label) >
-            (b.label?.toLowerCase?.() || b.label)
-          ? 1
-          : -1
+            ? 1
+            : (a.label?.toLowerCase?.() || a.label) >
+                (b.label?.toLowerCase?.() || b.label)
+              ? 1
+              : -1
       );
       if (!dynwhere.required)
         toAppend.unshift({ label: dynwhere.neutral_label || "", value: "" });
@@ -1120,8 +1120,8 @@ function initialize_page() {
           type === "Integer" || type === "Float"
             ? "number"
             : type === "Bool"
-            ? "checkbox"
-            : "text"
+              ? "checkbox"
+              : "text"
         }" ${
           type === "Float"
             ? `step="${
@@ -1490,10 +1490,10 @@ function buildToast(txt, type, spin) {
     realtype === "success"
       ? "fa-check-circle"
       : realtype === "danger"
-      ? "fa-times-circle"
-      : realtype === "warning"
-      ? "fa-exclamation-triangle"
-      : "";
+        ? "fa-times-circle"
+        : realtype === "warning"
+          ? "fa-exclamation-triangle"
+          : "";
   const isNode = getIsNode();
   const rndid = `tab${Math.floor(Math.random() * 16777215).toString(16)}`;
   return {
@@ -1587,7 +1587,11 @@ function press_store_button(clicked, keepOld, disable) {
     $(btn).data("old-text", oldText);
   }
   const width = $(btn).width();
-  $(btn).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
+  const height = $(btn).height();
+  $(btn)
+    .html('<i class="fas fa-spinner fa-spin"></i>')
+    .width(width)
+    .height(height);
   setTimeout(() => {
     $(btn).prop("disabled", true);
   }, 50);
@@ -1597,7 +1601,7 @@ function restore_old_button(btnId) {
   const btn = btnId instanceof jQuery ? btnId : $(`#${btnId}`);
   const oldText = $(btn).data("old-text");
   btn.html(oldText);
-  btn.css({ width: "" }).prop("disabled", false);
+  btn.css({ width: "", height: "" }).prop("disabled", false);
   btn.removeData("old-text");
 }
 
@@ -2174,6 +2178,34 @@ function restrict_options(selector, restriction) {
     });
 }
 
+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 observer = new IntersectionObserver(
   (entries, observer) => {
     entries.forEach((entry) => {

package/public/saltcorn.js

@@ -693,7 +693,7 @@ function ajax_post(url, args) {
     },
     ...(args || {}),
   })
-    .done(ajax_done)
+    .done((res) => ajax_done(res))
     .fail((e, ...more) => {
       if (!checkNetworkError(e))
         return ajax_done(
@@ -1322,34 +1322,6 @@ 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

@@ -15,10 +15,6 @@ const {
 const { ppVal, jsIdentifierValidator } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
-const View = require("@saltcorn/data/models/view");
-const {
-  getForm,
-} = require("@saltcorn/data/base-plugin/viewtemplates/viewable_fields");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const { getTriggerList } = require("./common_lists");
 const TagEntry = require("@saltcorn/data/models/tag_entry");
@@ -29,6 +25,9 @@ const Tag = require("@saltcorn/data/models/tag");
 const db = require("@saltcorn/data/db");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
+const {
+  getWorkflowStepUserForm,
+} = require("@saltcorn/data/web-mobile-commons");
 
 /**
  * @type {object}
@@ -1690,42 +1689,6 @@ router.post(
   })
 );
 
-const getWorkflowStepUserForm = async (run, trigger, step, req) => {
-  if (step.action_name === "EditViewForm") {
-    const view = View.findOne({ name: step.configuration.edit_view });
-    const table = Table.findOne({ id: view.table_id });
-    const form = await getForm(
-      table,
-      view.name,
-      view.configuration.columns,
-      view.configuration.layout,
-      null,
-      req
-    );
-    await form.fill_fkey_options(false, undefined, req?.user);
-    form.action = `/actions/fill-workflow-form/${run.id}`;
-    if (run.context[step.configuration.response_variable])
-      Object.assign(
-        form.values,
-        run.context[step.configuration.response_variable]
-      );
-
-    return form;
-  }
-
-  let blurb = run.wait_info.output || step.configuration?.form_header || "";
-  if (run.wait_info.markdown && run.wait_info.output) blurb = md.render(blurb);
-  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),
-  });
-  return form;
-};
-
 router.get(
   "/fill-workflow-form/:id",
   error_catcher(async (req, res) => {

package/routes/admin.js

@@ -236,6 +236,7 @@ admin_config_route({
               id: "testemail",
               href: "/admin/send-test-email",
               class: "btn btn-primary",
+              onclick: "spin_action_link(this)",
             },
             req.__("Send test email")
           ),
@@ -262,12 +263,14 @@ router.get(
       html: req.__("Hello from Saltcorn"),
     };
     try {
-      await getMailTransport().sendMail(email);
+      const sendres = await getMailTransport().sendMail(email);
+      getState().log(6, sendres);
       req.flash(
         "success",
         req.__("Email sent to %s with no errors", req.user.email)
       );
     } catch (e) {
+      console.error(e);
       req.flash("error", e.message);
     }
 
@@ -384,6 +387,7 @@ router.get(
                     req.csrfToken(),
                     {
                       btnClass: "btn-outline-primary",
+                      spinner: true,
                     }
                   )
                 ),
@@ -837,7 +841,7 @@ const autoBackupForm = (req) => {
         label: req.__("Backup now"),
         id: "btnBackupNow",
         class: "btn btn-outline-secondary",
-        onclick: "ajax_post('/admin/auto-backup-now')",
+        onclick: "ajax_post('/admin/auto-backup-now');press_store_button(this);",
       },
     ],
     fields: [

package/routes/tables.js

@@ -800,7 +800,9 @@ router.get(
     let fieldCard;
     const primaryKeys = fields.filter((f) => f.primary_key);
     const nPrimaryKeys = primaryKeys.length;
-    const nonSerialPKS = primaryKeys.some((f) => f.attributes?.NonSerial);
+    const nonSerialPKS = primaryKeys.some(
+      (f) => f.attributes?.NonSerial && f.type?.name === "Integer"
+    );
 
     if (fields.length === 0) {
       fieldCard = [
@@ -864,11 +866,11 @@ router.get(
         { hover: true }
       );
       fieldCard = [
-        (nPrimaryKeys > 1 || nonSerialPKS) &&
+        (nPrimaryKeys !== 1 || nonSerialPKS) &&
           div(
             { class: "alert alert-danger", role: "alert" },
             i({ class: "fas fa-exclamation-triangle" }),
-            "This table has composite or non-defaulted primary keys, which are not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
+            "This table has composite, non-defaulted integer, or no primary keys, which are not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
             post_btn(
               `/table/repair-composite-primary/${table.id}`,
               "Add autoincrementing primary key",