@saltcorn/server 0.7.3-beta.1 → 0.7.3-beta.6

package/markup/admin.js

@@ -124,6 +124,7 @@ const send_settings_page = ({
     : [
         {
           type: "card",
+          class: "mt-0",
           contents: div(
             { class: "d-flex" },
             ul(
@@ -271,7 +272,7 @@ const send_events_page = (args) => {
  * @returns {void}
  */
 const send_admin_page = (args) => {
-  //const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
   return send_settings_page({
     main_section: "About application",
     main_section_href: "/admin",
@@ -280,6 +281,9 @@ const send_admin_page = (args) => {
       { text: "Backup", href: "/admin/backup" },
       { text: "Email", href: "/admin/email" },
       { text: "System", href: "/admin/system" },
+      ...(isRoot
+        ? [{ text: "Mobile app", href: "/admin/build-mobile-app" }]
+        : []),
     ],
     ...args,
   });

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.3-beta.1",
+  "version": "0.7.3-beta.6",
   "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.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",
+    "@saltcorn/base-plugin": "0.7.3-beta.6",
+    "@saltcorn/builder": "0.7.3-beta.6",
+    "@saltcorn/data": "0.7.3-beta.6",
+    "@saltcorn/admin-models": "0.7.3-beta.6",
+    "@saltcorn/markup": "0.7.3-beta.6",
+    "@saltcorn/sbadmin2": "0.7.3-beta.6",
     "@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.3",
+    "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(),
@@ -164,7 +167,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);
@@ -583,6 +616,49 @@ function unique_field_from_rows(
   }
 }
 
+function room_older(viewname, room_id, btn) {
+  view_post(
+    viewname,
+    "fetch_older_msg",
+    { room_id, lt_msg_id: +$(btn).attr("data-lt-msg-id") },
+    (res) => {
+      if (res.prepend) $(`.msglist-${room_id}`).prepend(res.prepend);
+      if (res.new_fetch_older_lt)
+        $(btn).attr("data-lt-msg-id", res.new_fetch_older_lt);
+      if (res.remove_fetch_older) $(btn).remove();
+    }
+  );
+}
+
+function init_room(viewname, room_id) {
+  const socket = parent?.config?.server_path
+    ? io(parent.config.server_path, {
+        query: `jwt=${localStorage.getItem("auth_jwt")}`,
+        transports: ["websocket"],
+      })
+    : io({ transports: ["websocket"] });
+
+  socket.emit("join_room", [viewname, room_id]);
+  socket.on("message", (msg) => {
+    if (msg.not_for_user_id) {
+      const my_user_id = $(`.msglist-${room_id}`).attr("data-user-id");
+      if (+my_user_id === +msg.not_for_user_id) return;
+    }
+    if (msg.append) $(`.msglist-${room_id}`).append(msg.append);
+    if (msg.pls_ack_msg_id)
+      view_post(viewname, "ack_read", { room_id, id: msg.pls_ack_msg_id });
+  });
+
+  $(`form.room-${room_id}`).submit((e) => {
+    e.preventDefault();
+    var form_data = $(`form.room-${room_id}`).serialize();
+    view_post(viewname, "submit_msg_ajax", form_data, (vpres) => {
+      if (vpres.append) $(`.msglist-${room_id}`).append(vpres.append);
+      $(`form.room-${room_id}`).trigger("reset");
+    });
+  });
+}
+
 function cancel_form(form) {
   if (!form) return;
   $(form).append(`<input type="hidden" name="_cancel" value="on">`);

package/public/saltcorn.css

@@ -298,3 +298,8 @@ section.range-slider input[type="range"]::-moz-focus-outer {
 .btn-xs {
   padding: 0.1rem 0.4rem !important;
 }
+
+table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
+  border: 1px solid black;
+  border-collapse: collapse;
+}

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, {
@@ -296,7 +309,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");
@@ -366,42 +383,6 @@ function test_formula(tablename, stored) {
   });
 }
 
-function init_room(viewname, room_id) {
-  const socket = io({ transports: ["websocket"] });
-  socket.emit("join_room", [viewname, room_id]);
-  socket.on("message", (msg) => {
-    if (msg.not_for_user_id) {
-      const my_user_id = $(`.msglist-${room_id}`).attr("data-user-id");
-      if (+my_user_id === +msg.not_for_user_id) return;
-    }
-    if (msg.append) $(`.msglist-${room_id}`).append(msg.append);
-    if (msg.pls_ack_msg_id)
-      view_post(viewname, "ack_read", { room_id, id: msg.pls_ack_msg_id });
-  });
-
-  $(`form.room-${room_id}`).submit((e) => {
-    e.preventDefault();
-    var form_data = $(`form.room-${room_id}`).serialize();
-    view_post(viewname, "submit_msg_ajax", form_data, (vpres) => {
-      if (vpres.append) $(`.msglist-${room_id}`).append(vpres.append);
-      $(`form.room-${room_id}`).trigger("reset");
-    });
-  });
-}
-function room_older(viewname, room_id, btn) {
-  view_post(
-    viewname,
-    "fetch_older_msg",
-    { room_id, lt_msg_id: +$(btn).attr("data-lt-msg-id") },
-    (res) => {
-      if (res.prepend) $(`.msglist-${room_id}`).prepend(res.prepend);
-      if (res.new_fetch_older_lt)
-        $(btn).attr("data-lt-msg-id", res.new_fetch_older_lt);
-      if (res.remove_fetch_older) $(btn).remove();
-    }
-  );
-}
-
 async function fill_formula_btn_click(btn, k) {
   const formula = decodeURIComponent($(btn).attr("data-formula"));
   const free_vars = JSON.parse(