@saltcorn/server 0.8.5-beta.2 → 0.8.5-beta.4

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.5-beta.2",
+  "version": "0.8.5-beta.4",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.5-beta.2",
-    "@saltcorn/builder": "0.8.5-beta.2",
-    "@saltcorn/data": "0.8.5-beta.2",
-    "@saltcorn/admin-models": "0.8.5-beta.2",
-    "@saltcorn/filemanager": "0.8.5-beta.2",
-    "@saltcorn/markup": "0.8.5-beta.2",
-    "@saltcorn/sbadmin2": "0.8.5-beta.2",
+    "@saltcorn/base-plugin": "0.8.5-beta.4",
+    "@saltcorn/builder": "0.8.5-beta.4",
+    "@saltcorn/data": "0.8.5-beta.4",
+    "@saltcorn/admin-models": "0.8.5-beta.4",
+    "@saltcorn/filemanager": "0.8.5-beta.4",
+    "@saltcorn/markup": "0.8.5-beta.4",
+    "@saltcorn/sbadmin2": "0.8.5-beta.4",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -52,6 +52,7 @@
     "qrcode": "1.5.1",
     "resize-with-sharp-or-jimp": "0.1.6",
     "socket.io": "4.6.0",
+    "systeminformation": "^5.11.12",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",
     "uuid": "^8.2.0",

package/public/saltcorn-common.js

@@ -145,7 +145,7 @@ function apply_showif() {
       });
       element.dispatchEvent(new Event("RefreshSelectOptions"));
       if (e.hasClass("selectized") && $().selectize) {
-        e.selectize()[0].selectize.clearOptions();
+        e.selectize()[0].selectize.clearOptions(true);
         e.selectize()[0].selectize.addOption(dataOptions);
         if (typeof currentDataOption !== "undefined")
           e.selectize()[0].selectize.setValue(currentDataOption);
@@ -428,6 +428,10 @@ function initialize_page() {
     var key = $(this).attr("data-inline-edit-field") || "value";
     var ajax = !!$(this).attr("data-inline-edit-ajax");
     var type = $(this).attr("data-inline-edit-type");
+    var schema = $(this).attr("data-inline-edit-schema");
+    if (schema) {
+      schema = JSON.parse(decodeURIComponent(schema));
+    }
     var is_key = type?.startsWith("Key:");
     const opts = encodeURIComponent(
       JSON.stringify({
@@ -438,12 +442,16 @@ function initialize_page() {
         current_label: $(this).attr("data-inline-edit-current-label"),
         type,
         is_key,
+        schema,
       })
     );
-    if (is_key) {
-      const [tblName, target] = type.replace("Key:", "").split(".");
+    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="${
@@ -463,6 +471,14 @@ function initialize_page() {
           );
         }
       });
+    };
+    if (type === "JSON" && schema && schema.type.startsWith("Key to ")) {
+      const tblName = schema.type.replace("Key to ", "");
+      const target = schema.summary_field || "id";
+      doAjaxOptionsFetch(tblName, target);
+    } else if (is_key) {
+      const [tblName, target] = type.replace("Key:", "").split(".");
+      doAjaxOptionsFetch(tblName, target);
     } else
       $(this).replaceWith(
         `<form method="post" action="${url}" ${
@@ -590,7 +606,10 @@ $(initialize_page);
 function cancel_inline_edit(e, opts1) {
   var opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
   var form = $(e.target).closest("form");
-
+  var json_fk_opt;
+  if (opts.schema) {
+    json_fk_opt = form.find(`option[value="${opts.current}"]`).text();
+  }
   form.replaceWith(`<div 
   data-inline-edit-field="${opts.key}" 
   ${opts.ajax ? `data-inline-edit-ajax="true"` : ""}
@@ -601,8 +620,17 @@ function cancel_inline_edit(e, opts1) {
       ? `data-inline-edit-current-label="${opts.current_label}"`
       : ""
   }
+  ${
+    opts.schema
+      ? `data-inline-edit-schema="${encodeURIComponent(
+          JSON.stringify(opts.schema)
+        )}"`
+      : ""
+  }
   data-inline-edit-dest-url="${opts.url}">
-    <span class="current">${opts.current_label || opts.current}</span>
+    <span class="current">${
+      json_fk_opt || opts.current_label || opts.current
+    }</span>
     <i class="editicon fas fa-edit ms-1"></i>
   </div>`);
   initialize_page();
@@ -624,15 +652,23 @@ function inline_ajax_submit(e, opts1) {
     success: function (res) {
       if (opts) {
         let rawVal = formDataArray.find((f) => f.name == opts.key).value;
-        let val = opts.is_key
-          ? form.find("select").find("option:selected").text()
-          : rawVal;
+        let val =
+          opts.is_key || (opts.schema && opts.schema.type.startsWith("Key to "))
+            ? form.find("select").find("option:selected").text()
+            : rawVal;
 
         $(e.target).replaceWith(`<div 
       data-inline-edit-field="${opts.key}" 
       ${opts.ajax ? `data-inline-edit-ajax="true"` : ""}
       ${opts.type ? `data-inline-edit-type="${opts.type}"` : ""}
       ${opts.current ? `data-inline-edit-current="${rawVal}"` : ""}
+      ${
+        opts.schema
+          ? `data-inline-edit-schema="${encodeURIComponent(
+              JSON.stringify(opts.schema)
+            )}"`
+          : ""
+      }
       ${opts.current_label ? `data-inline-edit-current-label="${val}"` : ""}
       data-inline-edit-dest-url="${opts.url}">
         <span class="current">${val}</span>

package/public/saltcorn.css

@@ -375,3 +375,26 @@ table.table-inner-grid td {
   margin-bottom: 0 !important;
   text-decoration: underline;
 }
+
+@supports (zoom: 2) {
+  input[type="radio"].large,
+  input[type="checkbox"].large {
+    zoom: 2;
+  }
+  input[type="radio"].medium,
+  input[type="checkbox"].medium {
+    zoom: 1.5;
+  }
+}
+@supports not (zoom: 2) {
+  input[type="radio"].large,
+  input[type="checkbox"].large {
+    transform: scale(2);
+    margin: 15px;
+  }
+  input[type="radio"].medium,
+  input[type="checkbox"].medium {
+    transform: scale(1.5);
+    margin: 8px;
+  }
+}