@saltcorn/server 1.0.0-beta.1 → 1.0.0-beta.11

package/auth/admin.js

@@ -365,6 +365,7 @@ const auth_settings_form = async (req) =>
       "signup_role",
       "elevate_verified",
       "email_mask",
+      "plain_password_triggers",
     ],
     action: "/useradmin/settings",
     submitLabel: req.__("Save"),

package/help/Android App Signing.tmd

@@ -8,7 +8,7 @@ To build an Android app for the Play Store, you need to create an Android Applic
 
 *Note: You need a [Play Console developer account](https://support.google.com/googleplay/android-developer/answer/6112435?hl=en&ref_topic=3450769&sjid=11090022771305927482-EU) to publish your app on the Play Store.*
 
-### Create a Keysore file
+### Create a Keystore file
 On any Unix-based system, you can use the `keytool` command to create the keystore file. For example:
 ```sh
 keytool -genkey -v -keystore my-app-key.jks 

package/load_plugins.js

@@ -12,6 +12,37 @@ const { isRoot } = require("@saltcorn/data/utils");
 const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 
 const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
+const npmFetch = require("npm-registry-fetch");
+const packagejson = require("./package.json");
+const {
+  supportedVersion,
+  resolveLatest,
+} = require("@saltcorn/plugins-loader/stable_versioning");
+
+/**
+ * checks the saltcorn engine property and changes the plugin version if necessary
+ * @param plugin plugin to load
+ */
+const ensurePluginSupport = async (plugin) => {
+  const pkgInfo = await npmFetch.json(
+    `https://registry.npmjs.org/${plugin.location}`
+  );
+  const supported = supportedVersion(
+    plugin.version || "latest",
+    pkgInfo.versions,
+    packagejson.version
+  );
+  if (!supported)
+    throw new Error(
+      `Unable to find a supported version for '${plugin.location}'`
+    );
+  else if (
+    supported !== plugin.version ||
+    (plugin.version === "latest" &&
+      supported !== resolveLatest(pkgInfo.versions))
+  )
+    plugin.version = supported;
+};
 
 /**
  * Load one plugin
@@ -20,6 +51,15 @@ const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
  * @param force - force flag
  */
 const loadPlugin = async (plugin, force) => {
+  if (plugin.source === "npm") {
+    try {
+      await ensurePluginSupport(plugin);
+    } catch (e) {
+      console.log(
+        `Warning: Unable to find a supported version for '${plugin.location}' Continuing with the installed version`
+      );
+    }
+  }
   // load plugin
   const loader = new PluginInstaller(plugin);
   const res = await loader.install(force);
@@ -151,11 +191,14 @@ const loadAndSaveNewPlugin = async (
       return;
     }
   }
-  const msgs = [];
-  const loader = new PluginInstaller(plugin);
-  const { version, plugin_module, location, loadedWithReload } =
+  if (plugin.source === "npm") await ensurePluginSupport(plugin);
+  const loadMsgs = [];
+  const loader = new PluginInstaller(plugin, {
+    scVersion: packagejson.version,
+  });
+  const { version, plugin_module, location, loadedWithReload, msgs } =
     await loader.install(force);
-
+  if (msgs) loadMsgs.push(...msgs);
   // install dependecies
   for (const loc of plugin_module.dependencies || []) {
     const existing = await Plugin.findOne({ location: loc });
@@ -201,7 +244,7 @@ const loadAndSaveNewPlugin = async (
     }
   }
   if (loadedWithReload || registeredWithReload) {
-    msgs.push(
+    loadMsgs.push(
       __(
         "The plugin was corrupted and had to be repaired. We recommend restarting your server.",
         plugin.name
@@ -228,7 +271,7 @@ const loadAndSaveNewPlugin = async (
       force: false, // okay ??
     });
   }
-  return msgs;
+  return loadMsgs;
 };
 
 module.exports = {
@@ -236,4 +279,6 @@ module.exports = {
   loadAllPlugins,
   loadPlugin,
   requirePlugin,
+  supportedVersion,
+  ensurePluginSupport,
 };

package/locales/en.json

@@ -1459,5 +1459,14 @@
 	"Hourly": "Hourly",
 	"Daily": "Daily",
 	"Weekly": "Weekly",
-	"Code pages": "Code pages"
+	"Code pages": "Code pages",
+	"Please select a file": "Please select a file",
+	"Zip compression level": "Zip compression level",
+	"1=Fast, larger file, 9=Slow, smaller files": "1=Fast, larger file, 9=Slow, smaller files",
+	"Use system zip": "Use system zip",
+	"Recommended. Executable <code>zip</code> must be installed": "Recommended. Executable <code>zip</code> must be installed",
+	"Time to run": "Time to run",
+	"Mobile": "Mobile",
+	"Plain password trigger row": "Plain password trigger row",
+	"Send plaintext password changes to Users table triggers (Insert, Update and Validate).": "Send plaintext password changes to Users table triggers (Insert, Update and Validate)."
 }

package/markup/blockly.js

@@ -22,16 +22,16 @@ const db = require("@saltcorn/data/db");
  */
 const blocklyImportScripts = ({ locale }) =>
   script({
-    src: "/plugins/pubdeps/base/blockly/6.20210701.0/blockly_compressed.js",
+    src: "/plugins/pubdeps/base/blockly/8.0.5/blockly_compressed.js",
   }) +
   script({
-    src: "/plugins/pubdeps/base/blockly/6.20210701.0/blocks_compressed.js",
+    src: "/plugins/pubdeps/base/blockly/8.0.5/blocks_compressed.js",
   }) +
   script({
-    src: `/plugins/pubdeps/base/blockly/6.20210701.0/msg/${locale}.js`,
+    src: `/plugins/pubdeps/base/blockly/8.0.5/msg/${locale}.js`,
   }) +
   script({
-    src: "/plugins/pubdeps/base/blockly/6.20210701.0/javascript_compressed.js",
+    src: "/plugins/pubdeps/base/blockly/8.0.5/javascript_compressed.js",
   }) +
   script({
     src: `/static_assets/${db.connectObj.version_tag}/blockly.js`,

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.11",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "1.0.0-beta.1",
-    "@saltcorn/builder": "1.0.0-beta.1",
-    "@saltcorn/data": "1.0.0-beta.1",
-    "@saltcorn/admin-models": "1.0.0-beta.1",
-    "@saltcorn/filemanager": "1.0.0-beta.1",
-    "@saltcorn/markup": "1.0.0-beta.1",
-    "@saltcorn/plugins-loader": "1.0.0-beta.1",
-    "@saltcorn/sbadmin2": "1.0.0-beta.1",
+    "@saltcorn/base-plugin": "1.0.0-beta.11",
+    "@saltcorn/builder": "1.0.0-beta.11",
+    "@saltcorn/data": "1.0.0-beta.11",
+    "@saltcorn/admin-models": "1.0.0-beta.11",
+    "@saltcorn/filemanager": "1.0.0-beta.11",
+    "@saltcorn/markup": "1.0.0-beta.11",
+    "@saltcorn/plugins-loader": "1.0.0-beta.11",
+    "@saltcorn/sbadmin2": "1.0.0-beta.11",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -46,7 +46,7 @@
     "node-fetch": "2.6.9",
     "node-watch": "^0.7.2",
     "notp": "2.0.3",
-    "npm-registry-fetch": "16.0.0",
+    "npm-registry-fetch": "17.1.0",
     "passport": "^0.6.0",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
@@ -63,7 +63,7 @@
     "tmp-promise": "^3.0.2",
     "ua-parser-js": "^1.0.37",
     "underscore": "1.13.6",
-    "uuid": "^8.2.0"
+    "uuid": "^10.0.0"
   },
   "optionalDependencies": {
     "connect-sqlite3": "^0.9.11",
@@ -71,9 +71,9 @@
   },
   "repository": "github:saltcorn/saltcorn",
   "devDependencies": {
-    "jest": "^28.1.3",
-    "jest-environment-jsdom": "28.1.3",
-    "supertest": "^6.3.3"
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "supertest": "7.0.0"
   },
   "scripts": {
     "dev": "nodemon index.js",

package/public/saltcorn-common.js

@@ -303,25 +303,27 @@ function apply_showif() {
         ...cache,
         [qs]: "fetching",
       });
-      $.ajax(`/api/${dynwhere.table}?${qs}`).then((resp) => {
-        if (resp.success) {
-          if (window._sc_loglevel > 4)
-            console.log("dynwhere fetch", qs, resp.success);
-
-          activate(resp.success, qs);
-          const cacheNow = e.prop("data-fetch-options-cache") || {};
-          e.prop("data-fetch-options-cache", {
-            ...cacheNow,
-            [qs]: resp.success,
-          });
-        } else {
-          const cacheNow = e.prop("data-fetch-options-cache") || {};
-          e.prop("data-fetch-options-cache", {
-            ...cacheNow,
-            [qs]: undefined,
-          });
-        }
-      });
+      $.ajax(`/api/${dynwhere.table}?${qs}`)
+        .then((resp) => {
+          if (resp.success) {
+            if (window._sc_loglevel > 4)
+              console.log("dynwhere fetch", qs, resp.success);
+
+            activate(resp.success, qs);
+            const cacheNow = e.prop("data-fetch-options-cache") || {};
+            e.prop("data-fetch-options-cache", {
+              ...cacheNow,
+              [qs]: resp.success,
+            });
+          } else {
+            const cacheNow = e.prop("data-fetch-options-cache") || {};
+            e.prop("data-fetch-options-cache", {
+              ...cacheNow,
+              [qs]: undefined,
+            });
+          }
+        })
+        .fail(checkNetworkError);
     }
   });
   $("[data-filter-table]").each(function (ix, element) {
@@ -421,7 +423,14 @@ function apply_showif() {
     navigator.systemLanguage ||
     "en";
   window.detected_locale = locale;
-  const parse = (s) => JSON.parse(decodeURIComponent(s));
+  const parse = (s, def = {}) => {
+    try {
+      return JSON.parse(decodeURIComponent(s));
+    } catch (e) {
+      console.error("failed to parse time format", e);
+      return def;
+    }
+  };
   $("time[locale-time-options]").each(function () {
     var el = $(this);
     var date = new Date(el.attr("datetime"));
@@ -443,8 +452,9 @@ function apply_showif() {
   $("time[locale-date-format]").each(function () {
     var el = $(this);
     var date = el.attr("datetime");
-    const format = parse(el.attr("locale-date-format"));
-    el.text(dayjs(date).format(format));
+    const format = parse(el.attr("locale-date-format"), "");
+    if (format) el.text(dayjs(date).format(format));
+    else el.text(dayjs(date));
   });
 
   _apply_showif_plugins.forEach((p) => p());
@@ -522,6 +532,7 @@ function get_form_record(e_in, select_labels) {
             $(e_in).prop("data-join-values", jvs);
             apply_showif();
           },
+          error: checkNetworkError,
         });
       }
       $(e_in).prop("data-join-key-values", keyVals);
@@ -886,31 +897,33 @@ function initialize_page() {
       })
     );
     const doAjaxOptionsFetch = (tblName, target) => {
-      $.ajax(`/api/${tblName}`).then((resp) => {
-        if (resp.success) {
-          resp.success.sort((a, b) =>
-            a[target]?.toLowerCase?.() > b[target]?.toLowerCase?.() ? 1 : -1
-          );
-
-          const selopts = resp.success.map(
-            (r) =>
-              `<option ${current == r.id ? `selected ` : ``}value="${
-                r.id
-              }">${escapeHtml(r[target])}</option>`
-          );
-          $(this).replaceWith(
-            `<form method="post" action="${url}" ${
-              ajax ? `onsubmit="inline_ajax_submit(event, '${opts}')"` : ""
-            }>
+      $.ajax(`/api/${tblName}`)
+        .then((resp) => {
+          if (resp.success) {
+            resp.success.sort((a, b) =>
+              a[target]?.toLowerCase?.() > b[target]?.toLowerCase?.() ? 1 : -1
+            );
+
+            const selopts = resp.success.map(
+              (r) =>
+                `<option ${current == r.id ? `selected ` : ``}value="${
+                  r.id
+                }">${escapeHtml(r[target])}</option>`
+            );
+            $(this).replaceWith(
+              `<form method="post" action="${url}" ${
+                ajax ? `onsubmit="inline_ajax_submit(event, '${opts}')"` : ""
+              }>
           <input type="hidden" name="_csrf" value="${_sc_globalCsrf}">
           <select name="${key}" value="${current}">${selopts}
           </select>
           <button type="submit" class="btn btn-sm btn-primary">OK</button>
           <button onclick="cancel_inline_edit(event, '${opts}')" type="button" class="btn btn-sm btn-danger"><i class="fas fa-times"></i></button>
           </form>`
-          );
-        }
-      });
+            );
+          }
+        })
+        .fail(checkNetworkError);
     };
     if (type === "JSON" && schema && schema.type.startsWith("Key to ")) {
       const tblName = schema.type.replace("Key to ", "");
@@ -1089,7 +1102,8 @@ function initialize_page() {
           initialize_page();
         },
         error: function (res) {
-          notifyAlert({ type: "danger", text: res.responseText });
+          if (!checkNetworkError(res))
+            notifyAlert({ type: "danger", text: res.responseText });
           if ($e.html() === "Loading...") $e.html("");
         },
       });
@@ -1164,9 +1178,10 @@ function inline_ajax_submit(e, opts1) {
       inline_submit_success(e, form, opts);
     },
     error: function (e) {
-      ajax_done(
-        e.responseJSON || { error: "Unknown error: " + e.responseText }
-      );
+      if (!checkNetworkError(e))
+        ajax_done(
+          e.responseJSON || { error: "Unknown error: " + e.responseText }
+        );
     },
   });
 }
@@ -1209,6 +1224,7 @@ function enable_codemirror(f) {
     dataType: "script",
     cache: true,
     success: f,
+    error: checkNetworkError,
   });
 }
 function tristateClick(e, required) {
@@ -1516,7 +1532,8 @@ function reloadEmbeddedEditOwnViews(form, id) {
         initialize_page();
       },
       error: function (res) {
-        notifyAlert({ type: "danger", text: res.responseText });
+        if (!checkNetworkError(res))
+          notifyAlert({ type: "danger", text: res.responseText });
       },
     });
   });
@@ -1749,24 +1766,26 @@ function is_paging_param(key) {
   return key.endsWith("_page") || key.endsWith("_pagesize");
 }
 function check_saltcorn_notifications() {
-  $.ajax(`/notifications/count-unread`).then((resp) => {
-    if (resp.success) {
-      const n = resp.success;
-      const menu_item = $(`a.notify-menu-item`);
-
-      menu_item.html(
-        `<i class="fa-fw mr-05 fas fa-bell"></i>Notifications (${n})`
-      );
-      $(".user-nav-section").html(
-        `<i class="fa-fw mr-05 fas fa-user"></i>User (${n})`
-      );
-      $(".user-nav-section-with-span").html(
-        `<i class="fa-fw mr-05 fas fa-user"></i><span>User (${n})</span>`
-      );
-      window.update_theme_notification_count &&
-        window.update_theme_notification_count(n);
-    }
-  });
+  $.ajax(`/notifications/count-unread`)
+    .then((resp) => {
+      if (resp.success) {
+        const n = resp.success;
+        const menu_item = $(`a.notify-menu-item`);
+
+        menu_item.html(
+          `<i class="fa-fw mr-05 fas fa-bell"></i>Notifications (${n})`
+        );
+        $(".user-nav-section").html(
+          `<i class="fa-fw mr-05 fas fa-user"></i>User (${n})`
+        );
+        $(".user-nav-section-with-span").html(
+          `<i class="fa-fw mr-05 fas fa-user"></i><span>User (${n})</span>`
+        );
+        window.update_theme_notification_count &&
+          window.update_theme_notification_count(n);
+      }
+    })
+    .fail(checkNetworkError);
 }
 
 function disable_inactive_tab_inputs(id) {
@@ -1862,7 +1881,8 @@ function reload_embedded_view(viewname, new_query_string) {
           updater($e, res);
         },
         error: function (res) {
-          notifyAlert({ type: "danger", text: res.responseText });
+          if (!checkNetworkError(res))
+            notifyAlert({ type: "danger", text: res.responseText });
         },
       });
     } else {
@@ -1872,3 +1892,19 @@ function reload_embedded_view(viewname, new_query_string) {
     }
   });
 }
+
+function update_time_of_week(nm) {
+  return function () {
+    const day = $(`#input${nm}__day`).val();
+    const flat = document.querySelector(`#input${nm}__time`)._flatpickr;
+
+    const time = flat.selectedDates?.[0];
+    let s;
+    if (time) {
+      const m = time.getMinutes();
+
+      s = `${day} ${time.getHours()} ${m < 10 ? `0${m}` : m}`;
+    } else s = day;
+    $(`#inputh${nm}`).val(s).trigger("change");
+  };
+}

package/public/saltcorn.js

@@ -190,7 +190,8 @@ function pjax_to(href, e) {
         initialize_page();
       },
       error: function (res) {
-        notifyAlert({ type: "danger", text: res.responseText });
+        if (!checkNetworkError(res))
+          notifyAlert({ type: "danger", text: res.responseText });
       },
     });
   }
@@ -264,7 +265,8 @@ function view_post(viewnameOrElem, route, data, onDone, sendState) {
       reset_spinners();
     })
     .fail(function (res) {
-      notifyAlert({ type: "danger", text: res.responseText });
+      if (!checkNetworkError(res))
+        notifyAlert({ type: "danger", text: res.responseText });
       reset_spinners();
     });
 }
@@ -388,9 +390,12 @@ function ajax_modal(url, opts = {}) {
       ? {
           error: opts.onError,
         }
-      : {}),
+      : { error: checkNetworkError }),
   });
 }
+function closeModal() {
+  $("#scmodal").modal("toggle");
+}
 
 function selectVersionError(res, btnId) {
   notifyAlert({
@@ -448,7 +453,8 @@ function saveAndContinue(e, k, event) {
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";
-      if (ct.startsWith && ct.startsWith("application/json")) {
+      if (checkNetworkError(request)) {
+      } else if (ct.startsWith && ct.startsWith("application/json")) {
         notifyAlert({ type: "danger", text: request.responseJSON.error });
       } else {
         $("#page-inner-content").html(request.responseText);
@@ -497,6 +503,7 @@ function applyViewConfig(e, url, k, event) {
     },
     data: JSON.stringify(cfg),
     error: function (request) {
+      checkNetworkError(request);
       window.savingViewConfig = false;
       ajax_indicate_error(e, request);
     },
@@ -575,6 +582,7 @@ function ajaxSubmitForm(e, force_no_reload) {
       else common_done(res, form.attr("data-viewname"));
     },
     error: function (request) {
+      checkNetworkError(request);
       var title = request.getResponseHeader("Page-Title");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       var body = request.responseText;
@@ -591,6 +599,9 @@ function ajax_post_json(url, data, args = {}) {
     ...args,
   });
 }
+
+let scNetworkErrorSignaled = false;
+
 function ajax_post(url, args) {
   $.ajax(url, {
     type: "POST",
@@ -600,10 +611,30 @@ function ajax_post(url, args) {
     ...(args || {}),
   })
     .done(ajax_done)
-    .fail((e) =>
-      ajax_done(e.responseJSON || { error: "Unknown error: " + e.responseText })
-    );
+    .fail((e, ...more) => {
+      if (!checkNetworkError(e))
+        return ajax_done(
+          e.responseJSON || { error: "Unknown error: " + e.responseText }
+        );
+    });
 }
+
+function checkNetworkError(e) {
+  if (e.readyState == 0 && !e.responseText && !e.responseJSON) {
+    //network error
+    if (scNetworkErrorSignaled) return true;
+    scNetworkErrorSignaled = true;
+    setTimeout(() => {
+      scNetworkErrorSignaled = false;
+    }, 1000);
+    notifyAlert({
+      type: "danger",
+      text: "Network connection error",
+    });
+    return true;
+  }
+}
+
 function ajax_post_btn(e, reload_on_done, reload_delay) {
   var form = $(e).closest("form");
   var url = form.attr("action");
@@ -617,6 +648,7 @@ function ajax_post_btn(e, reload_on_done, reload_delay) {
     success: function () {
       if (reload_on_done) location.reload();
     },
+    error: checkNetworkError,
     complete: function () {
       if (reload_delay)
         setTimeout(function () {
@@ -638,6 +670,7 @@ function api_action_call(name, body) {
     success: function (res) {
       common_done(res.data);
     },
+    error: checkNetworkError,
   });
 }
 

package/routes/actions.js

@@ -237,6 +237,13 @@ const triggerForm = async (req, trigger) => {
         showIf: { when_trigger: "Daily" },
         sublabel: req.__("UTC timezone"),
       },
+      {
+        name: "channel",
+        label: req.__("Time to run"),
+        input_type: "time_of_week",
+        showIf: { when_trigger: "Weekly" },
+        sublabel: req.__("UTC timezone"),
+      },
       {
         name: "channel",
         label: req.__("Channel"),

package/routes/admin.js

@@ -309,9 +309,15 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
-    backupForm.values.backup_with_event_log = getState().getConfig(
+    aBackupFilePrefixForm.values.backup_with_event_log = getState().getConfig(
       "backup_with_event_log"
     );
+    aBackupFilePrefixForm.values.backup_with_system_zip = getState().getConfig(
+      "backup_with_system_zip"
+    );
+    aBackupFilePrefixForm.values.backup_system_zip_level = getState().getConfig(
+      "backup_system_zip_level"
+    );
     //
     const aSnapshotForm = snapshotForm(req);
     aSnapshotForm.values.snapshots_enabled =
@@ -702,6 +708,33 @@ const backupFilePrefixForm = (req) =>
         sublabel: req.__("Include table history in backup"),
         default: true,
       },
+      {
+        type: "Bool",
+        label: req.__("Include Event Logs"),
+        sublabel: req.__("Backup with event logs"),
+        name: "backup_with_event_log",
+      },
+      {
+        type: "Bool",
+        label: req.__("Use system zip"),
+        sublabel: req.__(
+          "Recommended. Executable <code>zip</code> must be installed"
+        ),
+        name: "backup_with_system_zip",
+      },
+      {
+        type: "Integer",
+        label: req.__("Zip compression level"),
+        sublabel: req.__("1=Fast, larger file, 9=Slow, smaller files"),
+        name: "backup_system_zip_level",
+        attributes: {
+          min: 1,
+          max: 9,
+        },
+        showIf: {
+          backup_with_system_zip: true,
+        },
+      },
     ],
   });
 
@@ -829,15 +862,6 @@ const autoBackupForm = (req) => {
             },
           ]
         : []),
-      {
-        type: "Bool",
-        label: req.__("Include Event Logs"),
-        sublabel: req.__("Backup with event logs"),
-        name: "backup_with_event_log",
-        showIf: {
-          auto_backup_frequency: ["Daily", "Weekly"],
-        },
-      },
     ],
   });
 };
@@ -3514,6 +3538,7 @@ router.get(
     send_admin_page({
       res,
       req,
+      page_title: req.__(`%s code page`, name),
       active_sub: "Development",
       sub2_page: req.__(`%s code page`, name),
       contents: {