@saltcorn/server 1.3.1-beta.0 → 1.3.1-beta.10

package/package.json

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

package/public/log_viewer_utils.js

@@ -172,7 +172,7 @@ var logViewerHelpers = (() => {
         }
       }, 5000);
       try {
-        socket = io({ transports: ["websocket"] });
+        socket = window.get_shared_socket();
       } catch (e) {
         notifyAlert({
           type: "danger",
@@ -180,7 +180,8 @@ var logViewerHelpers = (() => {
         });
       }
       startTrackingMsg();
-      socket.on("connect", () => handleConnect(socket));
+      if (socket.connected) handleConnect(socket);
+      else socket.on("connect", () => handleConnect(socket));
       socket.on("disconnect", handleDisconnect);
       socket.on("log_msg", handleLogMsg);
       socket.on("test_conn_msg", handleTestConnMsg);

package/public/saltcorn-common.js

@@ -151,15 +151,15 @@ 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) {
+function add_extra_state(base_url, extra_state_fml, row, outerState = {}) {
   //console.log("add_extra_state", { base_url, extra_state_fml, row });
-  if (!extra_state_fml) return base_url;
+  if (!extra_state_fml && !Object.keys(outerState).length) return base_url;
   let extra_state = new Function(
     "row",
     `{${Object.keys(row).join(",")}}`,
-    "return " + extra_state_fml
+    "return " + extra_state_fml||"{}"
   )(row, row);
-  let qs = Object.entries(extra_state)
+  let qs = Object.entries({ ...outerState, ...extra_state })
     .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
     .join("&");
   let sepChar = base_url.includes("?") ? "&" : "?";
@@ -172,6 +172,17 @@ const global_fetch_options_cache = {};
 
 function apply_showif() {
   const isNode = getIsNode();
+  $(".toggle-password-vis")
+    .off("click")
+    .on("click", function (event) {
+      const $e = $(event.target);
+      const eyeIcon = $e.prop("tagName") === "I" ? $e : $e.find("i");
+      const passwordInput = eyeIcon.parent().prev();
+
+      const isPassword = passwordInput.attr("type") === "password";
+      passwordInput.attr("type", isPassword ? "text" : "password");
+      eyeIcon.toggleClass("fa-eye fa-eye-slash");
+    });
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
     try {
@@ -1688,10 +1699,13 @@ function notifyAlert(note, spin) {
   if ($modal.length && $modal.hasClass("show"))
     $("#modal-toasts-area").append(html);
   else $("#toasts-area").append(html);
-  if (type === "success") {
-    setTimeout(() => {
-      $(`#${id}`).removeClass("show");
-    }, 5000);
+  if (type === "success" || note.remove_delay) {
+    setTimeout(
+      () => {
+        $(`#${id}`).removeClass("show");
+      },
+      note.remove_delay ? note.remove_delay * 1000 : 5000
+    );
   }
 }
 
@@ -1712,6 +1726,8 @@ function press_store_button(clicked, keepOld, disable) {
     .html('<i class="fas fa-spinner fa-spin"></i>')
     .width(width)
     .height(height);
+  $(document).trigger("activate-spinner", $(btn));
+  $(btn).trigger("spin");
   setTimeout(() => {
     $(btn).prop("disabled", true);
   }, 50);
@@ -1740,6 +1756,9 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
           .attr("data-sc-embed-viewname");
   if (window._sc_loglevel > 4)
     console.log("ajax result directives", viewname, res);
+
+  if (res.page_load_tag && res.page_load_tag !== _sc_pageloadtag) return;
+
   const handle = async (element, fn) => {
     if (Array.isArray(element))
       for (const current of element) await fn(current);
@@ -1765,17 +1784,32 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
   };
   if (res.notify)
     await handle(res.notify, (text) =>
-      notifyAlert({ type: "info", text, toast_title: res.toast_title })
+      notifyAlert({
+        type: "info",
+        text,
+        toast_title: res.toast_title,
+        remove_delay: res.remove_delay,
+      })
     );
   if (res.error) {
     if (window._sc_loglevel > 4) console.trace("error response", res.error);
     await handle(res.error, (text) =>
-      notifyAlert({ type: "danger", text, toast_title: res.toast_title })
+      notifyAlert({
+        type: "danger",
+        text,
+        toast_title: res.toast_title,
+        remove_delay: res.remove_delay,
+      })
     );
   }
   if (res.notify_success)
     await handle(res.notify_success, (text) =>
-      notifyAlert({ type: "success", text, toast_title: res.toast_title })
+      notifyAlert({
+        type: "success",
+        text,
+        toast_title: res.toast_title,
+        remove_delay: res.remove_delay,
+      })
     );
   if (res.set_fields && (viewname || res.set_fields._viewname)) {
     const form =
@@ -1810,10 +1844,10 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
           input.attr("data-selected", res.set_fields[k]);
         }
 
-        input.trigger("set_form_field");
+        input.trigger("set_form_field", { no_onchange: res.no_onchange });
       });
     }
-    form.trigger("change");
+    if (!res.no_onchange) form.trigger("change");
   }
 
   if (res.download) {
@@ -2044,17 +2078,24 @@ function room_older(viewname, room_id, btn) {
   );
 }
 
-function init_room(viewname, room_id) {
-  let socket = null;
-  if (parent?.saltcorn?.data?.state) {
-    const { server_path, jwt } =
-      parent.saltcorn.data.state.getState().mobileConfig;
-    socket = io(server_path, {
-      query: `jwt=${jwt}`,
-      transports: ["websocket"],
-    });
-  } else socket = io({ transports: ["websocket"] });
+function get_shared_socket() {
+  let socket = window.sharedSocket || null;
+  if (!socket) {
+    if (parent?.saltcorn?.data?.state) {
+      const { server_path, jwt } =
+        parent.saltcorn.data.state.getState().mobileConfig;
+      socket = io(server_path, {
+        query: `jwt=${jwt}`,
+        transports: ["websocket"],
+      });
+    } else socket = io({ transports: ["websocket"] });
+    window.sharedSocket = socket;
+  }
+  return socket;
+}
 
+function init_room(viewname, room_id) {
+  let socket = get_shared_socket();
   socket.emit("join_room", [viewname, room_id]);
   socket.on("message", (msg) => {
     if (msg.not_for_user_id) {
@@ -2077,24 +2118,46 @@ function init_room(viewname, room_id) {
 }
 
 function init_collab_room(viewname, eventCfgs) {
-  const socket = io({ transports: ["websocket"] });
+  let socket = get_shared_socket();
   for (const [event, callback] of Object.entries(eventCfgs.events)) {
     socket.on(event, callback);
   }
-  socket.on("connect", function () {
+  const joinFn = () => {
     socket.emit("join_collab_room", viewname, (ack) => {
-      if (ack && ack.status === "ok") {
+      if (ack && ack.status === "ok")
         console.log(`Joined collaboration room for view '${viewname}'`);
-      } else {
-        console.error("Failed to join collaboration room:", ack);
-      }
+      else console.error("Failed to join collaboration room:", ack);
     });
-  });
+  };
+  if (socket.connected) joinFn();
+  else socket.on("connect", joinFn);
   socket.on("disconnect", function () {
     console.log("Disconnected from the server");
   });
 }
 
+function init_dynamic_update_room() {
+  if (
+    !window.io ||
+    navigator.userAgent.includes("jsdom") ||
+    !dynamic_updates_cfg?.enabled
+  )
+    return;
+  let socket = get_shared_socket();
+  socket.on("dynamic_update", async (data) => {
+    await common_done(data);
+  });
+  const joinFn = () => {
+    socket.emit("join_dynamic_update_room", (ack) => {
+      if (ack && ack.status === "ok") {
+        if (window._sc_loglevel > 5) console.log("Joined dynamic update room");
+      } else console.error("Failed to join dynamic update room:", ack);
+    });
+  };
+  if (socket.connected) joinFn();
+  else socket.on("connect", joinFn);
+}
+
 function cancel_form(form) {
   if (!form) return;
   $(form).trigger("reset");
@@ -2140,7 +2203,7 @@ function check_saltcorn_notifications() {
     .then((resp) => {
       if (resp.success) {
         const n = resp.success;
-        const menu_item = $(`a.notify-menu-item`);
+        const menu_item = $('a[href="/notifications"]');
 
         menu_item.html(
           `<i class="fa-fw mr-05 fas fa-bell"></i>Notifications (${n})`
@@ -2542,3 +2605,9 @@ async function initPushNotify() {
     console.error("Push notification initialization failed:", error);
   }
 }
+
+if (document.readyState !== "loading") {
+  init_dynamic_update_room();
+} else {
+  document.addEventListener("DOMContentLoaded", init_dynamic_update_room);
+}

package/public/saltcorn.css

@@ -1,3 +1,15 @@
+.table-valign-middle > tbody > tr > td {
+     vertical-align: middle;
+}
+
+.table-valign-top > tbody > tr > td {
+     vertical-align: top;
+}
+
+.table-valign-bottom > tbody > tr > td {
+     vertical-align: bottom;
+}
+
 div.form-repeat {
   border: 1px dashed black;
   padding: 3px;
@@ -838,3 +850,7 @@ input[type="file"].file-has-existing {
 ::file-selector-button {
   font-size: initial;
 }
+
+.toggle-password-vis {
+  cursor: pointer;
+}

package/public/saltcorn.js

@@ -218,6 +218,9 @@ function pjax_to(href, e) {
         }
         $dest.html(res);
         if (localizer.length) localizer.attr("data-sc-local-state", href);
+        let $modal = $("#scmodal");
+        if ($modal.length && $modal.hasClass("show"))
+          $modal.prop("data-modal-state", href);
         initialize_page();
         document.dispatchEvent(new Event("pjax-loaded"));
       },
@@ -261,6 +264,8 @@ function spin_action_link(e) {
 
   $e.attr("data-innerhtml-prespin", $e.html());
   $e.html('<i class="fas fa-spinner fa-spin"></i>').width(width).height(height);
+  $(document).trigger("activate-spinner", $e);
+  $e.trigger("spin");
 }
 
 function reset_spinners() {
@@ -289,6 +294,7 @@ function view_post(viewnameOrElem, route, data, onDone, sendState) {
     type: "POST",
     headers: {
       "CSRF-Token": _sc_globalCsrf,
+      "Page-Load-Tag": _sc_pageloadtag,
     },
     ...(!isFormData
       ? {
@@ -423,6 +429,7 @@ function ajax_modal(url, opts = {}) {
       new bootstrap.Modal($("#scmodal"), {
         focus: false,
       }).show();
+      $("#scmodal .modal-body").find("[autofocus]").first().focus();
       initialize_page();
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
@@ -702,6 +709,7 @@ function ajax_post(url, args) {
     type: "POST",
     headers: {
       "CSRF-Token": _sc_globalCsrf,
+      "Page-Load-Tag": _sc_pageloadtag,
     },
     ...(args || {}),
   })

package/routes/actions.js

@@ -179,6 +179,7 @@ const triggerForm = async (req, trigger) => {
     workflow: true,
   });
   const table_triggers = ["Insert", "Update", "Delete", "Validate"];
+  const additional_triggers_with_onlyif = ["Login", "PageLoad"];
   const action_options = {};
   const actionsNotRequiringRow = Trigger.action_options({
     notRequireRow: true,
@@ -337,6 +338,19 @@ const triggerForm = async (req, trigger) => {
         type: "String",
         showIf: { when_trigger: ["API call"], _raw_output: true },
       },
+      {
+        name: "_only_if",
+        label: req.__("Only if"),
+        type: "String",
+        class: "validate-expression",
+        sublabel: req.__(
+          "Optional JavaScript expression to determine if the trigger should run."
+        ),
+        parent_field: "configuration",
+        showIf: {
+          when_trigger: [...table_triggers, ...additional_triggers_with_onlyif],
+        },
+      },
     ],
   });
   // if (trigger) {
@@ -1795,7 +1809,9 @@ router.get(
     try {
       const form = await getWorkflowStepUserForm(run, trigger, step, req);
       if (req.xhr) form.xhrSubmit = true;
-      const title = run.wait_info.output ? "Workflow output" : "Fill form";
+      const title =
+        step.configuration?.popup_title ||
+        (run.wait_info.output ? "Workflow output" : "Fill form");
       res.sendWrap(title, renderForm(form, req.csrfToken()));
     } catch (e) {
       console.error(e);

package/routes/admin.js

@@ -500,11 +500,12 @@ router.get(
       "backup_s3_access_secret"
     );
     backupForm.values.backup_s3_region =
-    getState().getConfig("backup_s3_region");
+      getState().getConfig("backup_s3_region");
     aBackupFilePrefixForm.values.backup_with_event_log = getState().getConfig(
       "backup_with_event_log"
     );
-    aBackupFilePrefixForm.values.backup_password = getState().getConfig("backup_password");
+    aBackupFilePrefixForm.values.backup_password =
+      getState().getConfig("backup_password");
     const aSnapshotForm = snapshotForm(req);
     aSnapshotForm.values.snapshots_enabled =
       getState().getConfig("snapshots_enabled");
@@ -4126,6 +4127,8 @@ router.post(
       await db.deleteWhere("_sc_config", { not: { key: "letsencrypt" } });
     }
     await getState().refresh();
+    await require("@saltcorn/data/standard-menu")();
+
     if (form.values.users) {
       await db.deleteWhere("_sc_notifications");
 
@@ -4532,7 +4535,6 @@ admin_config_route({
   path: "/notifications",
   super_path: "/admin",
   field_names: [
-    "notification_in_menu",
     { section_header: "Progressive Web Application" },
     "pwa_enabled",
     { name: "pwa_display", showIf: { pwa_enabled: true } },

package/routes/common_lists.js

@@ -138,6 +138,7 @@ const tablesList = async (
         hover: true,
         tableClass: listClass(tagId, showList),
         tableId: domId,
+        class: "table-valign-middle",
       }
     ) +
     (tables.length == 0 && !filterOnTag
@@ -442,6 +443,7 @@ const viewsList = async (
         hover: true,
         tableClass: listClass(tagId, showList),
         tableId: domId,
+        class: "table-valign-middle",
       }
     ) +
     (views.length == 0 && !filterOnTag
@@ -625,6 +627,7 @@ const getPageList = async (
       hover: true,
       tableClass: tagId ? `collapse ${showList ? "show" : ""}` : "",
       tableId: domId,
+      class: "table-valign-middle",
     }
   );
 };
@@ -657,6 +660,7 @@ const getPageGroupList = (rows, roles, req) => {
     rows,
     {
       hover: true,
+      class: "table-valign-middle",
     }
   );
 };
@@ -729,6 +733,8 @@ const getTriggerList = async (
       )
     );
   };
+  const whenCanHaveTable = (when) =>
+    ["Insert", "Update", "Delete", "Validate", "Never"].includes(when);
   return mkTable(
     [
       { label: req.__("Name"), key: "name" },
@@ -781,7 +787,7 @@ const getTriggerList = async (
       {
         label: req.__("Table or Channel"),
         key: (r) =>
-          r.table_name
+          r.table_name && whenCanHaveTable(r.when_trigger)
             ? user_can_inspect_tables
               ? a({ href: `/table/${r.table_name}` }, r.table_name)
               : r.table_name
@@ -807,6 +813,7 @@ const getTriggerList = async (
       hover: true,
       tableClass: tagId ? `collapse ${showList ? "show" : ""}` : "",
       tableId: domId,
+      class: "table-valign-middle",
     }
   );
 };

package/routes/eventlog.js

@@ -81,6 +81,18 @@ const logSettingsForm = async (req) => {
       input_type: "date",
       attributes: { minDate: new Date(), maxDate: hoursFuture(24 * 7 * 2) },
     },
+    {
+      input_type: "section_header",
+      label: req.__("Dynamic server side updates"),
+    },
+    {
+      name: "enable_dynamic_updates",
+      label: req.__("Enable dynamic updates"),
+      type: "Bool",
+      sublabel: req.__(
+        "Enable server side updates from within run_js_code actions"
+      ),
+    },
     {
       input_type: "section_header",
       label: req.__("Delete old workflow runs with status after days"),
@@ -168,6 +180,10 @@ router.get(
       "next_weekly_event",
       {}
     );
+    form.values.enable_dynamic_updates = getState().getConfig(
+      "enable_dynamic_updates",
+      true
+    );
     ["error", "finished", "running", "waiting"].forEach((k) => {
       let cfgk = `delete_${k}_workflows_days`;
       form.values[cfgk] = getState().getConfig(cfgk);
@@ -377,6 +393,10 @@ router.post(
           delete form.values[k];
         }
       }
+      await getState().setConfig(
+        "enable_dynamic_updates",
+        form.values.enable_dynamic_updates
+      );
       for (const status of ["error", "finished", "running", "waiting"]) {
         let k = `delete_${status}_workflows_days`;
         if (form.values[k]) {

package/routes/fields.js

@@ -1433,8 +1433,16 @@ router.post(
       const inboundTable = Table.findOne(inboundTableName);
       field = inboundTable.getField(refField);
     }
-
+    if (
+      !field &&
+      table.name === "users" &&
+      ["passwordRepeat", "password"].includes(fieldName)
+    ) {
+      field = new Field({ name: fieldName, type: "String" });
+    }
     if (!field) {
+      console.log("no field");
+
       res.send(req.query?.accept == "json" ? "[]" : "");
       return;
     }
@@ -1522,7 +1530,7 @@ router.post(
     const table = Table.findOne({ name: table_name });
     const field = table.getField(field_name);
     let val = field.type?.read
-      ? field.type?.read(req.body[field_name])
+      ? field.type?.read(req.body[field_name], field.attributes)
       : req.body[field_name];
     await db.withTransaction(async () => {
       await table.updateRow({ [field_name]: val }, pk, req.user);