@saltcorn/server 0.7.2-beta.9 → 0.7.3-beta.1

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.2-beta.9",
+  "version": "0.7.3-beta.1",
   "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.2-beta.9",
-    "@saltcorn/builder": "0.7.2-beta.9",
-    "@saltcorn/data": "0.7.2-beta.9",
-    "@saltcorn/admin-models": "0.7.2-beta.9",
-    "@saltcorn/markup": "0.7.2-beta.9",
-    "@saltcorn/sbadmin2": "0.7.2-beta.9",
+    "@saltcorn/base-plugin": "0.7.3-beta.1",
+    "@saltcorn/builder": "0.7.3-beta.1",
+    "@saltcorn/data": "0.7.3-beta.1",
+    "@saltcorn/admin-models": "0.7.3-beta.1",
+    "@saltcorn/markup": "0.7.3-beta.1",
+    "@saltcorn/sbadmin2": "0.7.3-beta.1",
     "@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",
-    "sharp": "0.30.3",
+    "resize-with-sharp-or-jimp": "0.1.3",
     "socket.io": "4.2.0",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",

package/public/saltcorn-common.js

@@ -215,6 +215,40 @@ function initialize_page() {
   $(".blur-on-enter-keypress").bind("keyup", function (e) {
     if (e.keyCode === 13) e.target.blur();
   });
+
+  const validate_expression_elem = (target) => {
+    const next = target.next();
+    if (next.hasClass("expr-error")) next.remove();
+    const val = target.val();
+    if (target.hasClass("validate-expression-conditional")) {
+      const box = target
+        .closest(".form-namespace")
+        .find(`[name="${target.attr("name")}_formula"]`);
+      if (!box.prop("checked")) return;
+    }
+    if (!val) return;
+    try {
+      Function("return " + val);
+    } catch (error) {
+      target.after(`<small class="text-danger font-monospace d-block expr-error">
+      ${error.message}
+    </small>`);
+    }
+  };
+  $(".validate-expression").bind("input", function (e) {
+    const target = $(e.target);
+    validate_expression_elem(target);
+  });
+  $(".validate-expression-conditional").each(function () {
+    const theInput = $(this);
+    theInput
+      .closest(".form-namespace")
+      .find(`[name="${theInput.attr("name")}_formula"]`)
+      .bind("change", function (e) {
+        validate_expression_elem(theInput);
+      });
+  });
+
   $("form").change(apply_showif);
   apply_showif();
   apply_showif();
@@ -437,7 +471,7 @@ function common_done(res, isWeb = true) {
 
 const repeaterCopyValuesToForm = (form, editor) => {
   const vs = JSON.parse(editor.getString());
-  const allNames = new Set([]);
+
   const setVal = (k, ix, v) => {
     const $e = form.find(`input[name="${k}_${ix}"]`);
     if ($e.length) $e.val(v);
@@ -449,16 +483,22 @@ const repeaterCopyValuesToForm = (form, editor) => {
   vs.forEach((v, ix) => {
     Object.entries(v).forEach(([k, v]) => {
       //console.log(ix, k, typeof v, v)
-      allNames.add(k);
       if (typeof v === "boolean") setVal(k, ix, v ? "on" : "");
       else setVal(k, ix, v);
     });
   });
   //delete
-  [...allNames].forEach((k) => {
-    for (let ix = vs.length; ix < vs.length + 20; ix++) {
-      $(`input[name="${k}_${ix}"]`).remove();
-    }
+  //for (let ix = vs.length; ix < vs.length + 20; ix++) {
+  // $(`input[name="${k}_${ix}"]`).remove();
+  //}
+  $(`input[type=hidden]`).each(function () {
+    const name = $(this).attr("name");
+    if (!name) return;
+    const m = name.match(/_(\d+)$/);
+    if (!m || !m[1]) return;
+    const ix = parseInt(m[1], 10);
+    if (typeof ix !== "number" || isNaN(ix)) return;
+    if (ix >= vs.length) $(this).remove();
   });
 };
 function align_dropdown(id) {
@@ -542,3 +582,9 @@ function unique_field_from_rows(
     }
   }
 }
+
+function cancel_form(form) {
+  if (!form) return;
+  $(form).append(`<input type="hidden" name="_cancel" value="on">`);
+  $(form).submit();
+}

package/public/saltcorn.css

@@ -294,3 +294,7 @@ section.range-slider input:last-of-type::-moz-range-track {
 section.range-slider input[type="range"]::-moz-focus-outer {
   border: 0;
 }
+
+.btn-xs {
+  padding: 0.1rem 0.4rem !important;
+}

package/public/saltcorn.js

@@ -162,6 +162,13 @@ function globalErrorCatcher(message, source, lineno, colno, error) {
   });
 }
 
+function close_saltcorn_modal() {
+  var myModalEl = document.getElementById("scmodal");
+  if (!myModalEl) return;
+  var modal = bootstrap.Modal.getInstance(myModalEl);
+  if (modal) modal.dispose();
+}
+
 function ajax_modal(url, opts = {}) {
   if ($("#scmodal").length === 0) {
     $("body").append(`<div id="scmodal", class="modal">
@@ -179,9 +186,7 @@ function ajax_modal(url, opts = {}) {
     </div>
   </div>`);
   } else if ($("#scmodal").hasClass("show")) {
-    var myModalEl = document.getElementById("scmodal");
-    var modal = bootstrap.Modal.getInstance(myModalEl);
-    modal.dispose();
+    close_saltcorn_modal();
   }
   if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   else $("#scmodal").removeClass("no-submit-reload");
@@ -429,7 +434,6 @@ async function fill_formula_btn_click(btn, k) {
   if (k) k();
 }
 
-
 /*
 https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
 Copyright (c) 2015 Jeff Green

package/restart_watcher.js

@@ -17,6 +17,8 @@ const relevantPackages = [
   "db-common",
   "postgres",
   "saltcorn-data",
+  "saltcorn-builder",
+  "saltcorn-admin-models",
   "saltcorn-markup",
   "saltcorn-sbadmin2",
   "server",
@@ -28,7 +30,6 @@ const relevantPackages = [
  */
 const excludePatterns = [
   /\/node_modules/,
-  /\/public/,
   /\.git/,
   /\.docs/,
   /\.docs/,

package/routes/actions.js

@@ -618,6 +618,7 @@ router.get(
         console: fakeConsole,
         table,
         row,
+        req,
         ...(row || {}),
         Table,
         user: req.user,

package/routes/admin.js

@@ -48,6 +48,7 @@ const { loadAllPlugins } = require("../load_plugins");
 const {
   create_backup,
   restore,
+  auto_backup_now,
 } = require("@saltcorn/admin-models/models/backup");
 const {
   runConfigurationCheck,
@@ -293,41 +294,163 @@ router.get(
   "/backup",
   isAdmin,
   error_catcher(async (req, res) => {
+    const backupForm = autoBackupForm(req);
+    backupForm.values.auto_backup_frequency = getState().getConfig(
+      "auto_backup_frequency"
+    );
+    backupForm.values.auto_backup_destination = getState().getConfig(
+      "auto_backup_destination"
+    );
+    backupForm.values.auto_backup_directory = getState().getConfig(
+      "auto_backup_directory"
+    );
+    backupForm.values.auto_backup_expire_days = getState().getConfig(
+      "auto_backup_expire_days"
+    );
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+
     send_admin_page({
       res,
       req,
       active_sub: "Backup",
       contents: {
-        type: "card",
-        title: req.__("Backup"),
-        contents: table(
-          tbody(
-            tr(
-              td(
+        above: [
+          {
+            type: "card",
+            title: req.__("Manual backup"),
+            contents: {
+              besides: [
                 div(
-                  post_btn("/admin/backup", req.__("Backup"), req.csrfToken())
-                )
-              ),
-              td(p({ class: "ms-4 pt-2" }, req.__("Download a backup")))
-            ),
-            tr(td(div({ class: "my-4" }))),
-            tr(
-              td(
-                restore_backup(req.csrfToken(), [
-                  i({ class: "fas fa-2x fa-upload" }),
-                  "<br/>",
-                  req.__("Restore"),
-                ])
-              ),
-              td(p({ class: "ms-4" }, req.__("Restore a backup")))
-            )
-          )
-        ),
+                  post_btn(
+                    "/admin/backup",
+                    i({ class: "fas fa-download me-2" }) +
+                      req.__("Download a backup"),
+                    req.csrfToken(),
+                    {
+                      btnClass: "btn-outline-primary",
+                    }
+                  )
+                ),
+                div(
+                  restore_backup(req.csrfToken(), [
+                    i({ class: "fas fa-2x fa-upload me-2" }),
+                    "",
+                    req.__("Restore a backup"),
+                  ])
+                ),
+              ],
+            },
+          },
+          isRoot
+            ? {
+                type: "card",
+                title: req.__("Automated backup"),
+                contents: div(renderForm(backupForm, req.csrfToken())),
+              }
+            : { type: "blank", contents: "" },
+        ],
       },
     });
   })
 );
 
+/**
+ * Auto backup Form
+ * @param {object} req
+ * @returns {Form} form
+ */
+const autoBackupForm = (req) =>
+  new Form({
+    action: "/admin/set-auto-backup",
+    submitButtonClass: "btn-outline-primary",
+    onChange: "remove_outline(this)",
+    submitLabel: "Save settings",
+    additionalButtons: [
+      {
+        label: "Backup now",
+        id: "btnBackupNow",
+        class: "btn btn-outline-secondary",
+        onclick: "ajax_post('/admin/auto-backup-now')",
+      },
+    ],
+    fields: [
+      {
+        type: "String",
+        label: req.__("Frequency"),
+        name: "auto_backup_frequency",
+        required: true,
+        attributes: { options: ["Never", "Daily", "Weekly"] },
+      },
+      {
+        type: "String",
+        label: req.__("Destination"),
+        name: "auto_backup_destination",
+        required: true,
+        showIf: { auto_backup_frequency: ["Daily", "Weekly"] },
+        attributes: { options: ["Saltcorn files", "Local directory"] },
+      },
+      {
+        type: "String",
+        label: req.__("Directory"),
+        name: "auto_backup_directory",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "Local directory",
+        },
+      },
+      {
+        type: "Integer",
+        label: req.__("Expiration in days"),
+        sublabel: req.__(
+          "Delete old backup files in this directory after the set number of days"
+        ),
+        name: "auto_backup_expire_days",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "Local directory",
+        },
+      },
+    ],
+  });
+
+router.post(
+  "/set-auto-backup",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await autoBackupForm(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      send_admin_page({
+        res,
+        req,
+        active_sub: "Backup",
+        contents: {
+          type: "card",
+          title: req.__("Backup settings"),
+          contents: [renderForm(form, req.csrfToken())],
+        },
+      });
+    } else {
+      await save_config_from_form(form);
+      req.flash("success", req.__("Backup settings updated"));
+      res.redirect("/admin/backup");
+    }
+  })
+);
+router.post(
+  "/auto-backup-now",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    try {
+      await auto_backup_now();
+      req.flash("success", req.__("Backup successful"));
+    } catch (e) {
+      req.flash("error", e.message);
+    }
+    res.json({ reload_page: true });
+  })
+);
+
 /**
  * @name get/system
  * @function
@@ -550,8 +673,8 @@ router.post(
     const fileName = await create_backup();
     res.type("application/zip");
     res.attachment(fileName);
-      const file = fs.createReadStream(fileName);
-      file.on("end", function () {
+    const file = fs.createReadStream(fileName);
+    file.on("end", function () {
       fs.unlink(fileName, function () {});
     });
     file.pipe(res);
@@ -794,7 +917,10 @@ router.get(
               ? div(
                   { class: "alert alert-success", role: "alert" },
                   i({ class: "fas fa-check-circle fa-lg me-2" }),
-                  h5({ class: "d-inline" }, req.__("No errors detected during configuration check"))
+                  h5(
+                    { class: "d-inline" },
+                    req.__("No errors detected during configuration check")
+                  )
                 )
               : errors.map(mkError)
           ),

package/routes/fields.js

@@ -300,7 +300,9 @@ const fieldFlow = (req) =>
                   name: "also_delete_file",
                   type: "Bool",
                   label: req.__("Cascade delete to file"),
-                  sublabel: req.__("Deleting a row will also delete the file referenced by this field")
+                  sublabel: req.__(
+                    "Deleting a row will also delete the file referenced by this field"
+                  ),
                 },
               ],
             });
@@ -337,6 +339,7 @@ const fieldFlow = (req) =>
                 label: req.__("Formula"),
                 // todo sublabel
                 type: "String",
+                class: "validate-expression",
                 validator: expressionValidator,
               }),
               new Field({

package/routes/files.js

@@ -10,7 +10,7 @@ const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const { getState } = require("@saltcorn/data/db/state");
 const s3storage = require("../s3storage");
-const sharp = require("sharp");
+const resizer = require("resize-with-sharp-or-jimp");
 
 const {
   mkTable,
@@ -214,7 +214,11 @@ router.get(
         }
         const fnm = `${file.location}_w${width}`;
         if (!fs.existsSync(fnm)) {
-          await sharp(file.location).resize({ width }).toFile(fnm);
+          await resizer({
+            fromFileName: file.location,
+            width,
+            toFileName: fnm,
+          });
         }
         res.sendFile(fnm);
       }

package/routes/tables.js

@@ -21,7 +21,10 @@ const {
   post_delete_btn,
   post_dropdown_item,
 } = require("@saltcorn/markup");
-const { recalculate_for_stored } = require("@saltcorn/data/models/expression");
+const {
+  recalculate_for_stored,
+  expressionValidator,
+} = require("@saltcorn/data/models/expression");
 const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const {
@@ -101,7 +104,9 @@ const tableForm = async (table, req) => {
             {
               name: "ownership_formula",
               label: req.__("Ownership formula"),
+              validator: expressionValidator,
               type: "String",
+              class: "validate-expression",
               sublabel:
                 req.__("User is treated as owner if true. In scope: ") +
                 ["user", ...fields.map((f) => f.name)]
@@ -878,10 +883,20 @@ router.post(
       const { id, _csrf, ...rest } = v;
       const table = await Table.findOne({ id: parseInt(id) });
       const old_versioned = table.versioned;
+      let hasError = false;
       if (!rest.versioned) rest.versioned = false;
-      if (rest.ownership_field_id === "_formula")
+      if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
-      else rest.ownership_formula = null;
+        const fmlValidRes = expressionValidator(rest.ownership_formula);
+        console.log({ fmlValidRes });
+        if (typeof fmlValidRes === "string") {
+          req.flash(
+            "error",
+            req.__(`Invalid ownership formula: %s`, fmlValidRes)
+          );
+          hasError = true;
+        }
+      } else rest.ownership_formula = null;
       await table.update(rest);
       if (!old_versioned && rest.versioned)
         req.flash(
@@ -893,7 +908,7 @@ router.post(
           "success",
           req.__("Table saved with version history disabled")
         );
-      else req.flash("success", req.__("Table saved"));
+      else if (!hasError) req.flash("success", req.__("Table saved"));
 
       res.redirect(`/table/${id}`);
     }

package/serve.js

@@ -43,6 +43,7 @@ const {
   eachTenant,
   getAllTenants,
 } = require("@saltcorn/admin-models/models/tenant");
+const { auto_backup_now } = require("@saltcorn/admin-models/models/backup");
 
 // helpful https://gist.github.com/jpoehls/2232358
 /**
@@ -135,7 +136,13 @@ const onMessageFromWorker =
     //console.log("worker msg", typeof msg, msg);
     if (msg === "Start" && !masterState.started) {
       masterState.started = true;
-      runScheduler({ port, watchReaper, disableScheduler, eachTenant });
+      runScheduler({
+        port,
+        watchReaper,
+        disableScheduler,
+        eachTenant,
+        auto_backup_now,
+      });
       require("./systemd")({ port });
       return true;
     } else if (msg === "RestartServer") {
@@ -261,6 +268,13 @@ module.exports =
         });
       } else {
         await nonGreenlockWorkerSetup(appargs, port);
+        runScheduler({
+          port,
+          watchReaper,
+          disableScheduler,
+          eachTenant,
+          auto_backup_now,
+        });
       }
       Trigger.emitEvent("Startup");
     } else {