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

package/public/saltcorn-common.js

@@ -151,8 +151,25 @@ function valid_js_var_name(s) {
   return !!s.match(/^[a-zA-Z_$][a-zA-Z_$0-9]*$/);
 }
 
+function add_extra_state(base_url, extra_state_fml, row) {
+  //console.log("add_extra_state", { base_url, extra_state_fml, row });
+  if (!extra_state_fml) return base_url;
+  let extra_state = new Function(
+    "row",
+    `{${Object.keys(row).join(",")}}`,
+    "return " + extra_state_fml
+  )(row, row);
+  let qs = Object.entries(extra_state)
+    .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
+    .join("&");
+  let sepChar = base_url.includes("?") ? "&" : "?";
+  return base_url + sepChar + qs;
+}
+
 const apply_showif_fetching_urls = new Set();
 
+const global_fetch_options_cache = {};
+
 function apply_showif() {
   const isNode = getIsNode();
   $("[data-show-if]").each(function (ix, element) {
@@ -294,6 +311,9 @@ function apply_showif() {
         qss.push(...dynwhere.dereference.map((d) => `dereference=${d}`));
       else qss.push(`dereference=${dynwhere.dereference}`);
     }
+    if (!dynwhere.label_formula && dynwhere.summary_field && dynwhere.refname) {
+      qss.push(`fields=${dynwhere.summary_field},${dynwhere.refname}`);
+    }
     const qs = qss.join("&");
     let current = e.attr("data-selected");
     if (current === "null") current = null;
@@ -380,36 +400,27 @@ function apply_showif() {
           e.selectize()[0].selectize.setValue(currentDataOption);
       }
     };
-
-    const cache = e.prop("data-fetch-options-cache") || {};
+    if (!global_fetch_options_cache[dynwhere.table])
+      global_fetch_options_cache[dynwhere.table] = {};
+    const cache = global_fetch_options_cache[dynwhere.table] || {};
     if (cache[qs] === "fetching") {
       // do nothing, this will be activated by someone else
     } else if (cache[qs]) {
       activate(cache[qs], qs);
     } else {
-      e.prop("data-fetch-options-cache", {
-        ...cache,
-        [qs]: "fetching",
-      });
+      cache[qs] = "fetching";
       apply_showif_fetching_urls.add(`/api/${dynwhere.table}?${qs}`);
       $.ajax(`/api/${dynwhere.table}?${qs}`)
         .then((resp) => {
+          const cacheNow = global_fetch_options_cache[dynwhere.table] || {};
           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,
-            });
+            cacheNow[qs] = resp.success;
+            apply_showif();
           } else {
-            const cacheNow = e.prop("data-fetch-options-cache") || {};
-            e.prop("data-fetch-options-cache", {
-              ...cacheNow,
-              [qs]: undefined,
-            });
+            cacheNow[qs] = undefined;
           }
         })
         .fail(checkNetworkError)
@@ -428,6 +439,49 @@ function apply_showif() {
       });
     });
   });
+  $("[data-view-source]").each(function (ix, element) {
+    const e = $(element);
+    const rec = get_form_record(e);
+    const current = e.attr("data-view-source-current");
+    const encFml = e.attr("data-view-source");
+    const needFields = e.attr("data-view-source-need-fields");
+    if (needFields) {
+      const isSet = (v) => v !== null && v !== "" && typeof v !== "undefined";
+      if (needFields.split(",").some((k) => !isSet(rec[k]))) return;
+    }
+    const fml = decodeURIComponent(encFml);
+    //console.log("fml", fml);
+
+    const viewname = e.attr("data-sc-embed-viewname");
+
+    const newUrl = new Function("row", "return " + fml)(rec);
+    //console.log("current-new", current, newUrl);
+
+    if (current && current == newUrl) return;
+
+    e.attr("data-view-source-current", newUrl); // to prevent concurrent fetches
+    $.ajax(newUrl, {
+      headers: {
+        pjaxpageload: "true",
+        localizedstate: "true", //no admin bar
+      },
+      success: function (res, textStatus, request) {
+        const newE = `<div class="d-inline" 
+        data-sc-embed-viewname="${viewname}" 
+        data-sc-view-source="${newUrl}" 
+        data-view-source-current="${newUrl}"
+        data-view-source-need-fields="${needFields}"
+        data-view-source="${encFml}">${res}</div>`;
+
+        e.replaceWith(newE);
+        initialize_page();
+      },
+      error: function (res) {
+        if (!checkNetworkError(res))
+          notifyAlert({ type: "danger", text: res.responseText });
+      },
+    });
+  });
   $("[data-source-url]").each(function (ix, element) {
     const e = $(element);
     const rec0 = get_form_record(e);
@@ -1664,8 +1718,10 @@ function press_store_button(clicked, keepOld, disable) {
 }
 
 function restore_old_button(btnId) {
+  if (window.reset_spinners) reset_spinners();
   const btn = btnId instanceof jQuery ? btnId : $(`#${btnId}`);
   const oldText = $(btn).data("old-text");
+  if (!oldText.length) reuturn;
   btn.html(oldText);
   btn.css({ width: "", height: "" }).prop("disabled", false);
   btn.removeData("old-text");
@@ -1689,6 +1745,9 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
       for (const current of element) await fn(current);
     else await fn(element);
   };
+  //TODO what if something else is spinning?
+  if (window.reset_spinners) reset_spinners();
+
   const eval_it = async (s) => {
     if (res.row && res.field_names) {
       const f = new Function(`viewname, row, {${res.field_names}}`, s);
@@ -1741,7 +1800,7 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
           form.append(
             `<input type="hidden" name="id" value="${res.set_fields[k]}">`
           );
-          reloadEmbeddedEditOwnViews(form, res.set_fields[k]);
+          apply_showif();
           return;
         }
         if (input.attr("type") === "checkbox")
@@ -1830,29 +1889,6 @@ function editAllowedAuthByRole(id, event) {
   );
 }
 
-function reloadEmbeddedEditOwnViews(form, id) {
-  form.find("div[sc-load-on-assign-id]").each(function () {
-    const $e = $(this);
-    const viewname = $e.attr("sc-load-on-assign-id");
-    const newUrl = `/view/${viewname}?id=${id}`;
-    $.ajax(newUrl, {
-      headers: {
-        pjaxpageload: "true",
-        localizedstate: "true", //no admin bar
-      },
-      success: function (res, textStatus, request) {
-        const newE = `<div class="d-inline" data-sc-embed-viewname="${viewname}" data-sc-view-source="${newUrl}">${res}</div>`;
-        $e.replaceWith(newE);
-        initialize_page();
-      },
-      error: function (res) {
-        if (!checkNetworkError(res))
-          notifyAlert({ type: "danger", text: res.responseText });
-      },
-    });
-  });
-}
-
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
@@ -1981,7 +2017,8 @@ function unique_field_from_rows(
       .filter((v) => v !== value)
       .map((s) => s.replace(value_wspace, ""))
       .map((s) => (numtype ? +s : s))
-      .sort(numtype ? (a, b) => a - b : undefined);
+      .filter((s) => (numtype ? !isNaN(s) : true))
+      .sort((a, b) => a - b);
     if (stripped.length === 0) newname = `${value_wspace}${gen_char(start)}`;
     else {
       const i = char_to_i(stripped[stripped.length - 1]);
@@ -2039,6 +2076,25 @@ function init_room(viewname, room_id) {
   });
 }
 
+function init_collab_room(viewname, eventCfgs) {
+  const socket = io({ transports: ["websocket"] });
+  for (const [event, callback] of Object.entries(eventCfgs.events)) {
+    socket.on(event, callback);
+  }
+  socket.on("connect", function () {
+    socket.emit("join_collab_room", viewname, (ack) => {
+      if (ack && ack.status === "ok") {
+        console.log(`Joined collaboration room for view '${viewname}'`);
+      } else {
+        console.error("Failed to join collaboration room:", ack);
+      }
+    });
+  });
+  socket.on("disconnect", function () {
+    console.log("Disconnected from the server");
+  });
+}
+
 function cancel_form(form) {
   if (!form) return;
   $(form).trigger("reset");
@@ -2281,6 +2337,22 @@ function formInEmbed(event) {
   return form;
 }
 
+function login_from_edit_view(e) {
+  e.stopPropagation();
+  e.preventDefault();
+  const form = $(e.target).closest("form");
+  form.attr("action", "/auth/login");
+  form.submit();
+}
+
+function signup_from_edit_view(e) {
+  e.stopPropagation();
+  e.preventDefault();
+  const form = $(e.target).closest("form");
+  form.attr("action", "/auth/signup");
+  form.submit();
+}
+
 function handle_identical_fields(event) {
   let form = null;
   if (event.srcElement) {

package/public/saltcorn.css

@@ -824,6 +824,14 @@ tr:hover span.add-tag {
   );
 }
 
+.prevwfroomrun i.fa-trash-alt {
+  display: none;
+}
+
+.prevwfroomrun:hover i.fa-trash-alt {
+  display: inline;
+}
+
 input[type="file"].file-has-existing {
   font-size: 0;
 }

package/public/saltcorn.js

@@ -538,7 +538,7 @@ function saveAndContinue(e, k, event) {
         form.append(
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
-        reloadEmbeddedEditOwnViews(form, res.id);
+        apply_showif();
       }
       common_done(res, form.attr("data-viewname"));
       if (focusedEl) focusedEl.setAttribute("previous-val", focusedEl.value);
@@ -1338,6 +1338,14 @@ function check_delete_unsaved(tablename, script_tag) {
   }
 }
 
+function delprevwfroomrun(viewname, e, runid) {
+  e.preventDefault();
+  e.stopPropagation();
+  view_post(viewname, "delprevrun", { run_id: runid });
+  $(e.target).closest(".prevwfroomrun").remove();
+  return false;
+}
+
 function cfu_translate(that) {
   const locale = that.value;
   const translations = window.cfu_translations[locale];

package/routes/admin.js

@@ -196,6 +196,8 @@ admin_config_route({
     { section_header: "Extension store" },
     "plugins_store_endpoint",
     "packs_store_endpoint",
+    "maintenance_mode_enabled",
+    "maintenance_mode_page",
   ],
   response(form, req, res) {
     send_admin_page({
@@ -487,28 +489,22 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
-    backupForm.values.storage_s3_bucket = getState().getConfig(
-      "storage_s3_bucket"
+    backupForm.values.backup_s3_bucket =
+      getState().getConfig("backup_s3_bucket");
+    backupForm.values.backup_s3_endpoint =
+      getState().getConfig("backup_s3_endpoint");
+    backupForm.values.backup_s3_access_key = getState().getConfig(
+      "backup_s3_access_key"
     );
-    backupForm.values.storage_s3_access_key = getState().getConfig(
-      "storage_s3_access_key"
-    );
-    backupForm.values.storage_s3_access_secret = getState().getConfig(
-      "storage_s3_access_secret"
-    );
-    backupForm.values.storage_s3_region = getState().getConfig(
-      "storage_s3_region"
+    backupForm.values.backup_s3_access_secret = getState().getConfig(
+      "backup_s3_access_secret"
     );
+    backupForm.values.backup_s3_region =
+    getState().getConfig("backup_s3_region");
     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"
-    );
-    //
+    aBackupFilePrefixForm.values.backup_password = getState().getConfig("backup_password");
     const aSnapshotForm = snapshotForm(req);
     aSnapshotForm.values.snapshots_enabled =
       getState().getConfig("snapshots_enabled");
@@ -966,25 +962,13 @@ const backupFilePrefixForm = (req) =>
         name: "backup_with_event_log",
       },
       {
-        type: "Bool",
-        label: req.__("Use system zip"),
+        type: "String",
+        label: "Backup password",
+        fieldview: "password",
+        name: "backup_password",
         sublabel: req.__(
-          "Recommended. Executable <code>zip</code> must be installed"
+          "Password to encrypt the backup file. Leave empty for no encryption"
         ),
-        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,
-        },
       },
     ],
   });
@@ -1089,18 +1073,6 @@ const autoBackupForm = (req) => {
           //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",
-        },
-      },
       ...(isRoot
         ? [
             {
@@ -1114,10 +1086,19 @@ const autoBackupForm = (req) => {
             },
           ]
         : []),
+      {
+        type: "String",
+        label: req.__("S3 Endpoint"),
+        name: "backup_s3_endpoint",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
       {
         type: "String",
         label: req.__("S3 Bucket Name"),
-        name: "storage_s3_bucket",
+        name: "backup_s3_bucket",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1126,7 +1107,7 @@ const autoBackupForm = (req) => {
       {
         type: "String",
         label: req.__("S3 Access Key"),
-        name: "storage_s3_access_key",
+        name: "backup_s3_access_key",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1136,7 +1117,7 @@ const autoBackupForm = (req) => {
         type: "String",
         label: req.__("S3 Secret Key"),
         fieldview: "password",
-        name: "storage_s3_access_secret",
+        name: "backup_s3_access_secret",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
@@ -1145,12 +1126,24 @@ const autoBackupForm = (req) => {
       {
         type: "String",
         label: req.__("S3 Region"),
-        name: "storage_s3_region",
+        name: "backup_s3_region",
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
           auto_backup_destination: "S3",
         },
       },
+      {
+        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", "S3"],
+        },
+      },
     ],
   });
 };
@@ -3832,6 +3825,22 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
+
+    // if builDir exists, remove it
+    if (
+      await fs.promises
+        .access(buildDir)
+        .then(() => true)
+        .catch(() => false)
+    ) {
+      try {
+        await fs.promises.rm(buildDir, { recursive: true, force: true });
+        getState().log(5, `Removed existing build directory: ${buildDir}`);
+      } catch (error) {
+        getState().log(4, `Error removing build directory: ${error.message}`);
+      }
+    }
+
     // end http call, return the out directory name, the build directory path and the mode
     // the gui polls for results
     res.json({

package/routes/api.js

@@ -135,6 +135,21 @@ const getFlashes = (req) =>
     })
     .filter((a) => a.msg && a.msg.length && a.msg.length > 0);
 
+router.use(
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).json({ error: "in maintenance mode" });
+      return;
+    }
+    next();
+  })
+);
+
 router.post(
   "/viewQuery/:viewName/:queryName",
   error_catcher(async (req, res, next) => {
@@ -376,8 +391,8 @@ router.get(
               aggregations: {
                 _versions: {
                   table: table.name + "__history",
-                  ref: "id",
-                  field: "id",
+                  ref: table.pk_name,
+                  field: table.pk_name,
                   aggregate: "count",
                 },
               },
@@ -446,6 +461,44 @@ router.get(
   })
 );
 
+router.get("/:tableName/count", async (req, res, next) => {
+  const { tableName } = req.params;
+  const { approximate, ...req_query } = req.query;
+
+  const table = Table.findOne(
+    strictParseInt(tableName)
+      ? { id: strictParseInt(tableName) }
+      : { name: tableName }
+  );
+  if (!table) {
+    getState().log(3, `API get ${tableName} table not found`);
+    res.status(404).json({ error: req.__("Not found") });
+    return;
+  }
+  await passport.authenticate(
+    ["api-bearer", "jwt"],
+    { session: false },
+    async function (err, user, info) {
+      if (accessAllowedRead(req, user, table)) {
+        const tbl_fields = table.getFields();
+        readState(req_query, tbl_fields, req);
+        const qstate = stateFieldsToWhere({
+          fields: tbl_fields,
+          approximate: !!approximate,
+          state: req_query,
+          table,
+          prefix: "a.",
+        });
+        const count = await table.countRows(qstate);
+        res.json({ success: count });
+      } else {
+        getState().log(3, `API get ${table.name} not authorized`);
+        res.status(401).json({ error: req.__("Not authorized") });
+      }
+    }
+  )(req, res, next);
+});
+
 /**
  * Emit Event using POST
  * This is used from the mobile app to send an event to the server.

package/routes/files.js

@@ -52,6 +52,18 @@ const { extract } = require("@saltcorn/admin-models/models/backup");
 const router = new Router();
 module.exports = router;
 
+router.use(
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled =  state.getConfig("maintenance_mode_enabled", false);
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).send("Page Unavailable: in maintenance mode");
+      return;
+    }
+    next();
+  })
+)
+
 const send_files_picker = async (folder, noSubdirs, inputId, req, res) => {
   res.set("SaltcornModalWidth", "1200px");
   res.sendWrap(req.__("Please select a file"), {

package/routes/homepage.js

@@ -15,7 +15,7 @@ const Page = require("@saltcorn/data/models/page");
 const PageGroup = require("@saltcorn/data/models/page_group");
 const Plugin = require("@saltcorn/data/models/plugin");
 const { link, mkTable } = require("@saltcorn/markup");
-const { div, a, p, i, h5, span } = require("@saltcorn/markup/tags");
+const { div, a, p, i, h5, span, title } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { get_cached_packs } = require("@saltcorn/admin-models/models/pack");
 // const { restore_backup } = require("../markup/admin");
@@ -553,6 +553,28 @@ const no_views_logged_in = async (req, res) => {
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
+  const state = getState();
+  const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+  const maintenanceModePage = state.getConfig("maintenance_mode_page", "");
+
+  if(maintenanceModeEnabled && (!req.user || req.user.role_id > 1) && maintenanceModePage) {
+    const db_page = await Page.findOne({ name: maintenanceModePage });
+    if (db_page) {
+      res.sendWrap(
+        {
+          title: db_page.title,
+          description: db_page.description,
+          bodyClass: "page_" + db.sqlsanitize(maintenanceModePage),
+        },
+        await db_page.run(req.query, { res, req })
+      );
+      return true;
+    } else {
+      res.status(503).send("Page Unavailable: in maintenance mode");
+      return true;
+    }
+  }
+
   const wrap = async (
     contents,
     homeCfg,

package/routes/list.js

@@ -65,7 +65,7 @@ router.get(
 
     const fields = table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
-
+    const pk_name = table.pk_name;
     tfields.push({
       label: req.__("Version"),
       key: (r) => r._version,
@@ -82,7 +82,7 @@ router.get(
       label: req.__("Restore"),
       key: (r) =>
         post_btn(
-          `/list/_restore/${table.name}/${r.id}/${r._version}`,
+          `/list/_restore/${table.name}/${r[pk_name]}/${r._version}`,
           req.__("Restore"),
           req.csrfToken()
         ),
@@ -281,6 +281,7 @@ router.get(
         field: "_versions",
         title: "Versions",
         formatter: "__versionsFormatter",
+        formatterParams: { pk_name: table.pk_name },
       });
     }
     jsfields.push({
@@ -466,7 +467,7 @@ router.get(
               window.tabulator_table.on("cellEdited", function(cell){
                 const row = cell.getRow().getData()
                 const fieldName = cell.getColumn().getField()
-                let ident = (row.${pkNm}||"");
+                let ident = encodeURIComponent(row.${pkNm}||"");
                 if(fieldName === "${pkNm}")
                   ident = "";
                 ajax_indicator(true);

package/routes/menu.js

@@ -624,6 +624,20 @@ router.post(
   })
 );
 
+router.post(
+  "/action/:rndid",
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).json({ error: "in maintenance mode" });
+      return;
+    }
+    next();
+  }),
+);
+
 const getIcons = () => {
   return getState().icons;
 };

package/routes/notifications.js

@@ -20,6 +20,18 @@ const db = require("@saltcorn/data/db");
 const router = new Router();
 module.exports = router;
 
+router.use(
+  error_catcher(async (req, res, next) => {
+    const state = getState();
+    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
+      res.status(503).send("Page Unavailable: in maintenance mode");
+      return;
+    }
+    next();
+  })
+);
+
 const notificationSettingsForm = () =>
   new Form({
     action: `/notifications/settings`,