@saltcorn/server 0.7.3-beta.3 → 0.7.3

package/markup/admin.js

@@ -124,6 +124,7 @@ const send_settings_page = ({
     : [
         {
           type: "card",
+          class: "mt-0",
           contents: div(
             { class: "d-flex" },
             ul(
@@ -344,7 +345,7 @@ const flash_restart = (req) => {
  * @param {*} opts.formArgs
  * @returns {Promise<Form>}
  */
-const config_fields_form = async ({ field_names, req, ...formArgs }) => {
+const config_fields_form = async ({ field_names, req, action, ...formArgs }) => {
   const values = {};
   const state = getState();
   const fields = [];
@@ -395,8 +396,9 @@ const config_fields_form = async ({ field_names, req, ...formArgs }) => {
   const form = new Form({
     fields,
     values,
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    action,
+    noSubmitButton: true,
+    onChange: `saveAndContinue(this)`,
     ...formArgs,
   });
   await form.fill_fkey_options();

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.3-beta.3",
+  "version": "0.7.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.7.3-beta.3",
-    "@saltcorn/builder": "0.7.3-beta.3",
-    "@saltcorn/data": "0.7.3-beta.3",
-    "@saltcorn/admin-models": "0.7.3-beta.3",
-    "@saltcorn/markup": "0.7.3-beta.3",
-    "@saltcorn/sbadmin2": "0.7.3-beta.3",
+    "@saltcorn/base-plugin": "0.7.3",
+    "@saltcorn/builder": "0.7.3",
+    "@saltcorn/data": "0.7.3",
+    "@saltcorn/admin-models": "0.7.3",
+    "@saltcorn/markup": "0.7.3",
+    "@saltcorn/sbadmin2": "0.7.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -48,7 +48,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.0",
-    "resize-with-sharp-or-jimp": "0.1.4",
+    "resize-with-sharp-or-jimp": "0.1.5",
     "socket.io": "4.2.0",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",

package/public/gridedit.js

@@ -76,6 +76,8 @@ function isoDateTimeFormatter(cell, formatterParams, onRendered) {
 function isoDateFormatter(cell, formatterParams, onRendered) {
   const val = cell.getValue();
   if (!val) return "";
+  if (formatterParams && formatterParams.format)
+    return moment(val).format(formatterParams.format);
 
   return new Date(val).toLocaleDateString(window.detected_locale || "en");
 }
@@ -144,6 +146,10 @@ function add_tabulator_row() {
 }
 
 function delete_tabulator_row(e, cell) {
+  const def = cell.getColumn().getDefinition();
+  if (def && def.formatterParams && def.formatterParams.confirm) {
+    if (!confirm("Are you sure you want to delete this row?")) return;
+  }
   const row = cell.getRow().getData();
   if (!row.id) {
     cell.getRow().delete();

package/public/jquery-menu-editor.min.js

@@ -117,7 +117,7 @@ function MenuEditor(e, t) {
             (n.prev("div").children(".sortableListsOpener").first().remove(),
             n.remove()),
           MenuEditor.updateButtons(s);
-          l.onUpdate();
+        l.onUpdate();
       }
     }),
     $(document).on("click", ".btnEdit", function (e) {
@@ -132,6 +132,9 @@ function MenuEditor(e, t) {
                 "checked",
                 true
               );
+            } else if (el.prop("tagName") == "SELECT") {
+              el.val(t);
+              el.attr("data-selected", t);
             } else el.val(t);
           }),
             i.find(".item-menu").first().focus(),
@@ -139,6 +142,16 @@ function MenuEditor(e, t) {
               ? c.iconpicker("setIcon", t.icon)
               : c.iconpicker("setIcon", "empty");
           r.removeAttr("disabled");
+          i.find("[name]").each(function () {
+            try {
+              const el = $(this);
+              if (typeof t[el.attr("name")] === "undefined") {
+                el.val("");
+              }
+            } catch (e) {
+              console.warn(e);
+            }
+          });
         })((n = $(this).closest("li")));
       l.onUpdate();
     }),
@@ -164,7 +177,7 @@ function MenuEditor(e, t) {
           t.remove()),
         MenuEditor.updateButtons(s),
         s.updateLevels();
-        l.onUpdate();
+      l.onUpdate();
     }),
     s.on("click", ".btnIn", function (e) {
       e.preventDefault();

package/public/saltcorn-common.js

@@ -63,8 +63,8 @@ function apply_showif() {
       .val();
 
     var options = data[1][val];
-    var current = e.attr("data-selected");
-    //console.log({ val, options, current, data });
+    var current = e.attr("data-selected") || e.val();
+    //console.log({ field: e.attr("name"), target: data[0], val, current });
     e.empty();
     (options || []).forEach((o) => {
       if (
@@ -87,6 +87,39 @@ function apply_showif() {
       e.attr("data-selected", ec.target.value);
     });
   });
+  $("[data-fetch-options]").each(function (ix, element) {
+    const e = $(element);
+    const rec = get_form_record(e);
+    const dynwhere = JSON.parse(
+      decodeURIComponent(e.attr("data-fetch-options"))
+    );
+    //console.log(dynwhere);
+    const qs = Object.entries(dynwhere.whereParsed)
+      .map(([k, v]) => `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}`)
+      .join("&");
+    var current = e.attr("data-selected");
+    e.change(function (ec) {
+      e.attr("data-selected", ec.target.value);
+    });
+    $.ajax(`/api/${dynwhere.table}?${qs}`).then((resp) => {
+      if (resp.success) {
+        e.empty();
+        if (!dynwhere.required) e.append($(`<option></option>`));
+        resp.success.forEach((r) => {
+          e.append(
+            $(
+              `<option ${
+                `${current}` === `${r[dynwhere.refname]}` ? "selected" : ""
+              } value="${r[dynwhere.refname]}">${
+                r[dynwhere.summary_field]
+              }</option>`
+            )
+          );
+        });
+      }
+    });
+  });
+
   $("[data-source-url]").each(function (ix, element) {
     const e = $(element);
     const rec = get_form_record(e);
@@ -469,7 +502,7 @@ function common_done(res, isWeb = true) {
   }
 }
 
-const repeaterCopyValuesToForm = (form, editor) => {
+const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
   const setVal = (k, ix, v) => {
@@ -500,6 +533,7 @@ const repeaterCopyValuesToForm = (form, editor) => {
     if (typeof ix !== "number" || isNaN(ix)) return;
     if (ix >= vs.length) $(this).remove();
   });
+  !noTriggerChange && form.trigger("change");
 };
 function align_dropdown(id) {
   setTimeout(() => {
@@ -631,4 +665,3 @@ function cancel_form(form) {
   $(form).append(`<input type="hidden" name="_cancel" value="on">`);
   $(form).submit();
 }
-

package/public/saltcorn.css

@@ -302,4 +302,21 @@ section.range-slider input[type="range"]::-moz-focus-outer {
 table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
   border: 1px solid black;
   border-collapse: collapse;
+}
+
+/* https://codepen.io/pezmotion/pen/RQERdm */
+
+.editStarRating {
+	direction: rtl;
+	unicode-bidi: bidi-override;
+	color: #ddd;
+}
+.editStarRating input {
+	display: none;
+}
+.editStarRating label:hover,
+.editStarRating label:hover ~ label,
+.editStarRating input:checked + label,
+.editStarRating input:checked + label ~ label {
+	color: #ffc107; 
 }

package/public/saltcorn.js

@@ -169,7 +169,7 @@ function close_saltcorn_modal() {
   if (modal) modal.dispose();
 }
 
-function ajax_modal(url, opts = {}) {
+function ensure_modal_exists_and_closed() {
   if ($("#scmodal").length === 0) {
     $("body").append(`<div id="scmodal", class="modal">
     <div class="modal-dialog">
@@ -188,6 +188,19 @@ function ajax_modal(url, opts = {}) {
   } else if ($("#scmodal").hasClass("show")) {
     close_saltcorn_modal();
   }
+}
+
+function expand_thumbnail(img_id, filename) {
+  ensure_modal_exists_and_closed();
+  $("#scmodal .modal-body").html(
+    `<img src="/files/serve/${img_id}" style="width: 100%">`
+  );
+  $("#scmodal .modal-title").html(decodeURIComponent(filename));
+  new bootstrap.Modal($("#scmodal")).show();
+}
+
+function ajax_modal(url, opts = {}) {
+  ensure_modal_exists_and_closed();
   if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   else $("#scmodal").removeClass("no-submit-reload");
   $.ajax(url, {
@@ -200,6 +213,7 @@ function ajax_modal(url, opts = {}) {
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
         (opts.onClose || function () {})(res);
+        $("body").css("overflow", "");
       });
     },
   });
@@ -235,7 +249,7 @@ function saveAndContinue(e, k) {
   return false;
 }
 
-function applyViewConfig(e, url) {
+function applyViewConfig(e, url, k) {
   var form = $(e).closest("form");
   var form_data = form.serializeArray();
   const cfg = {};
@@ -251,6 +265,9 @@ function applyViewConfig(e, url) {
     },
     data: JSON.stringify(cfg),
     error: function (request) {},
+    success: function (res) {
+      k && k(res);
+    },
   });
 
   return false;
@@ -296,7 +313,11 @@ function ajax_post(url, args) {
       "CSRF-Token": _sc_globalCsrf,
     },
     ...(args || {}),
-  }).done(ajax_done);
+  })
+    .done(ajax_done)
+    .fail((e) =>
+      ajax_done(e.responseJSON || { error: "Unknown error: " + e.responseText })
+    );
 }
 function ajax_post_btn(e, reload_on_done, reload_delay) {
   var form = $(e).closest("form");

package/routes/admin.js

@@ -43,6 +43,11 @@ const {
   option,
   fieldset,
   legend,
+  ul,
+  li,
+  ol,
+  script,
+  domReady,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
 const {
@@ -83,6 +88,7 @@ const {
 const moment = require("moment");
 const View = require("@saltcorn/data/models/view");
 const { getConfigFile } = require("@saltcorn/data/db/connect");
+const os = require("os");
 
 /**
  * @type {object}
@@ -137,10 +143,6 @@ const email_form = async (req) => {
     ],
     action: "/admin/email",
   });
-  form.submitButtonClass = "btn-outline-primary";
-  form.submitLabel = req.__("Save");
-  form.onChange =
-    "remove_outline(this);$('#testemail').attr('href','#').removeClass('btn-primary').addClass('btn-outline-primary')";
   return form;
 };
 
@@ -211,8 +213,10 @@ router.post(
       flash_restart_if_required(form, req);
       await save_config_from_form(form);
 
-      req.flash("success", req.__("Site identity settings updated"));
-      res.redirect("/admin");
+      if (!req.xhr) {
+        req.flash("success", req.__("Site identity settings updated"));
+        res.redirect("/admin");
+      } else res.json({ success: "ok" });
     }
   })
 );
@@ -305,7 +309,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("Email settings updated"));
-      res.redirect("/admin/email");
+      if (!req.xhr) res.redirect("/admin/email");
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -370,7 +375,18 @@ router.get(
             ? {
                 type: "card",
                 title: req.__("Automated backup"),
-                contents: div(renderForm(backupForm, req.csrfToken())),
+                contents: div(
+                  renderForm(backupForm, req.csrfToken()),
+                  a(
+                    { href: "/admin/auto-backup-list" },
+                    "Restore/download automated backups »"
+                  ),
+                  script(
+                    domReady(
+                      `$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`
+                    )
+                  )
+                ),
               }
             : { type: "blank", contents: "" },
         ],
@@ -379,6 +395,93 @@ router.get(
   })
 );
 
+/**
+ * @name get/backup
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.get(
+  "/auto-backup-list",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+    if (!isRoot) {
+      res.redirect("/admin/backup");
+      return;
+    }
+    const auto_backup_directory = getState().getConfig("auto_backup_directory");
+    const fileNms = await fs.promises.readdir(auto_backup_directory);
+    const backupFiles = fileNms.filter(
+      (fnm) => fnm.startsWith("sc-backup") && fnm.endsWith(".zip")
+    );
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Backup",
+      contents: {
+        above: [
+          {
+            type: "card",
+            title: req.__("Download automated backup"),
+            contents: div(
+              ul(
+                backupFiles.map((fnm) =>
+                  li(
+                    a(
+                      {
+                        href: `/admin/auto-backup-download/${encodeURIComponent(
+                          fnm
+                        )}`,
+                      },
+                      fnm
+                    )
+                  )
+                )
+              )
+            ),
+          },
+          {
+            type: "card",
+            title: req.__("Restoring automated backup"),
+            contents: div(
+              ol(
+                li("Download one of the backups above"),
+                li(
+                  a({ href: "/admin/clear-all" }, "Clear this application"),
+                  " ",
+                  "(tick all boxes)"
+                ),
+                li(
+                  "When prompted to create the first user, click the link to restore a backup"
+                ),
+                li("Select the downloaded backup file")
+              )
+            ),
+          },
+        ],
+      },
+    });
+  })
+);
+
+router.get(
+  "/auto-backup-download/:filename",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { filename } = req.params;
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+    if (
+      !isRoot ||
+      !(filename.startsWith("sc-backup") && filename.endsWith(".zip"))
+    ) {
+      res.redirect("/admin/backup");
+      return;
+    }
+    const auto_backup_directory = getState().getConfig("auto_backup_directory");
+    res.download(path.join(auto_backup_directory, filename), filename);
+  })
+);
+
 /**
  * Auto backup Form
  * @param {object} req
@@ -387,9 +490,8 @@ router.get(
 const autoBackupForm = (req) =>
   new Form({
     action: "/admin/set-auto-backup",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
-    submitLabel: "Save settings",
+    onChange: `saveAndContinue(this);$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`,
+    noSubmitButton: true,
     additionalButtons: [
       {
         label: "Backup now",
@@ -458,7 +560,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("Backup settings updated"));
-      res.redirect("/admin/backup");
+      if (!req.xhr) res.redirect("/admin/backup");
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -1141,22 +1244,30 @@ router.post(
         "error",
         req.__("Please select at least one platform (android or iOS).")
       );
-      return res.redirect("/admin/system");
+      return res.redirect("/admin/build-mobile-app");
     }
     if (!androidPlatform && useDocker) {
       req.flash("error", req.__("Only the android build supports docker."));
-      return res.redirect("/admin/system");
+      return res.redirect("/admin/build-mobile-app");
     }
     if (appFile && !appFile.endsWith(".apk")) appFile = `${appFile}.apk`;
     const appOut = path.join(__dirname, "..", "mobile-app-out");
-    const spawnParams = ["build-app", "-v", entryView, "-c", appOut];
+    const spawnParams = [
+      "build-app",
+      "-v",
+      entryView,
+      "-c",
+      appOut,
+      "-b",
+      `${os.userInfo().homedir}/mobile_app_build`,
+    ];
     if (useDocker) spawnParams.push("-d");
     if (androidPlatform) spawnParams.push("-p", "android");
     if (iOSPlatform) spawnParams.push("-p", "ios");
     if (appFile) spawnParams.push("-a", appFile);
     if (serverURL) spawnParams.push("-s", serverURL);
     const child = spawn("saltcorn", spawnParams, {
-      stdio: ["ignore", "pipe", process.stderr],
+      stdio: ["ignore", "pipe", "pipe"],
       cwd: ".",
     });
     const childOutputs = [];
@@ -1164,8 +1275,12 @@ router.post(
       // console.log(data.toString());
       childOutputs.push(data.toString());
     });
-    child.on("exit", async function (code, signal) {
-      if (code === 0) {
+    child.stderr.on("data", (data) => {
+      // console.log(data.toString());
+      childOutputs.push(data.toString());
+    });
+    child.on("exit", async function (exitCode, signal) {
+      if (exitCode === 0) {
         const file = await File.from_existing_file(
           appOut,
           appFile ? appFile : "app-debug.apk",
@@ -1187,9 +1302,11 @@ router.post(
             {
               type: "card",
               title: req.__("Build Result"),
-              contents: div("Unable to build the app"),
+              contents: div(
+                "Unable to build the app:",
+                pre(code(childOutputs.join("<br/>")))
+              ),
             },
-            childOutputs.join("<br/>"),
           ],
         });
     });
@@ -1201,9 +1318,12 @@ router.post(
           {
             type: "card",
             title: req.__("Build Result"),
-            contents: div("Unable to build the app"),
+            contents: div(
+              p("Unable to build the app:"),
+              pre(code(message)),
+              pre(code(stack))
+            ),
           },
-          `${message} <br/> ${stack}`,
         ],
       });
     });

package/routes/eventlog.js

@@ -73,8 +73,9 @@ const logSettingsForm = async (req) => {
       fields.push({
         name: w + "_channel",
         label: w + " channel",
-        sublabel:
-          req.__("Channels to create events for. Separate by comma; leave blank for all"),
+        sublabel: req.__(
+          "Channels to create events for. Separate by comma; leave blank for all"
+        ),
         type: "String",
         showIf: { [w]: true },
       });
@@ -82,8 +83,8 @@ const logSettingsForm = async (req) => {
   return new Form({
     action: "/eventlog/settings",
     blurb: req.__("Which events should be logged?"),
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     fields,
   });
 };
@@ -169,23 +170,23 @@ router.get(
  * @returns {Form}
  */
 const customEventForm = async (req) => {
-    return new Form({
-        action: "/eventlog/custom/new",
-        submitButtonClass: "btn-outline-primary",
-        onChange: "remove_outline(this)",
-        fields: [
-            {
-                name: "name",
-                label: req.__("Event Name"),
-                type: "String",
-            },
-            {
-                name: "hasChannel",
-                label: req.__("Has channels?"),
-                type: "Bool",
-            },
-        ],
-    });
+  return new Form({
+    action: "/eventlog/custom/new",
+    submitButtonClass: "btn-outline-primary",
+    onChange: "remove_outline(this)",
+    fields: [
+      {
+        name: "name",
+        label: req.__("Event Name"),
+        type: "String",
+      },
+      {
+        name: "hasChannel",
+        label: req.__("Has channels?"),
+        type: "Bool",
+      },
+    ],
+  });
 };
 /**
  * @name get/custom/new
@@ -297,7 +298,8 @@ router.post(
     } else {
       await getState().setConfig("event_log_settings", form.values);
 
-      res.redirect(`/eventlog/settings`);
+      if (!req.xhr) res.redirect(`/eventlog/settings`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/fields.js

@@ -488,6 +488,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: wizardCardTitle(field.label, wf, wfres),
           contents: renderForm(wfres.renderForm, req.csrfToken()),
         },
@@ -524,6 +525,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: wizardCardTitle(req.__(`New field`), wf, wfres),
           contents: renderForm(wfres.renderForm, req.csrfToken()),
         },
@@ -589,6 +591,7 @@ router.post(
           },
           {
             type: "card",
+            class: "mt-0",
             title: wizardCardTitle(
               wfres.context.label || req.__("New field"),
               wf,