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

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.5-beta.2",
+  "version": "0.8.5-beta.3",
   "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.3",
+    "@saltcorn/builder": "0.8.5-beta.3",
+    "@saltcorn/data": "0.8.5-beta.3",
+    "@saltcorn/admin-models": "0.8.5-beta.3",
+    "@saltcorn/filemanager": "0.8.5-beta.3",
+    "@saltcorn/markup": "0.8.5-beta.3",
+    "@saltcorn/sbadmin2": "0.8.5-beta.3",
     "@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/routes/admin.js

@@ -10,6 +10,7 @@ const {
   error_catcher,
   getGitRevision,
   setTenant,
+  get_sys_info,
 } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 const Plugin = require("@saltcorn/data/models/plugin");
@@ -864,7 +865,7 @@ router.get(
     const can_update =
       !is_latest && !process.env.SALTCORN_DISABLE_UPGRADE && !git_commit;
     const dbversion = await db.getVersion(true);
-
+    const { memUsage, diskUsage, cpuUsage } = await get_sys_info();
     send_admin_page({
       res,
       req,
@@ -986,7 +987,20 @@ router.get(
                   tr(
                     th(req.__("Process uptime")),
                     td(moment(get_process_init_time()).fromNow(true))
-                  )
+                  ),
+                  tr(
+                    th(req.__("Disk usage")),
+                    diskUsage > 95
+                      ? td(
+                          { class: "text-danger fw-bold" },
+                          diskUsage,
+                          "%",
+                          i({ class: "fas fa-exclamation-triangle ms-1" })
+                        )
+                      : td(diskUsage, "%")
+                  ),
+                  tr(th(req.__("CPU usage")), td(cpuUsage, "%")),
+                  tr(th(req.__("Mem usage")), td(memUsage, "%"))
                 )
               ),
               p(
@@ -1307,7 +1321,7 @@ router.get(
   "/configuration-check",
   isAdmin,
   error_catcher(async (req, res) => {
-    const filename = `${moment().format("YYYMMDDHHmm")}.html`;
+    const filename = `${moment().format("YYYYMMDDHHmm")}.html`;
     await File.new_folder("configuration_checks");
     const go = async () => {
       const { passes, errors, pass, warnings } = await runConfigurationCheck(

package/routes/api.js

@@ -421,29 +421,29 @@ router.post(
           readState(row, fields);
           let errors = [];
           let hasErrors = false;
-          Object.keys(row).forEach((k) => {
+          for (const k of Object.keys(row)) {
             const field = fields.find((f) => f.name === k);
             if (!field && k.includes(".")) {
               const [fnm, jkey] = k.split(".");
               const jfield = fields.find((f) => f.name === fnm);
               if (jfield?.type?.name === "JSON") {
-                if (!row[fnm]) row[fnm] = { [jkey]: row[k] };
-                else row[fnm][jkey] = row[k];
+                if (typeof row[fnm] === "undefined") {
+                  const dbrow = await table.getRow({ [table.pk_name]: id });
+                  row[fnm] = dbrow[fnm] || {};
+                }
+                row[fnm][jkey] = row[k];
                 delete row[k];
               }
             } else if (!field || field.calculated) {
               delete row[k];
-              return;
-            }
-
-            if (field?.type && field.type.validate) {
+            } else if (field?.type && field.type.validate) {
               const vres = field.type.validate(field.attributes || {})(row[k]);
               if (vres.error) {
                 hasErrors = true;
                 errors.push(`${k}: ${vres.error}`);
               }
             }
-          });
+          }
           if (hasErrors) {
             res.status(400).json({ error: errors.join(", ") });
             return;

package/routes/tables.js

@@ -762,18 +762,22 @@ router.get(
             })
           )
         ),
+      !table.external &&
+        div(
+          { class: "mx-auto" },
+          a(
+            { href: `/table/constraints/${table.id}` },
+            i({ class: "fas fa-2x fa-tasks" }),
+            "<br/>",
+            req.__("Constraints")
+          )
+        ),
+
       // only if table is not external
       !table.external &&
         div(
           { class: "mx-auto" },
           settingsDropdown(`dataMenuButton`, [
-            a(
-              {
-                class: "dropdown-item",
-                href: `/table/constraints/${table.id}`,
-              },
-              '<i class="fas fa-ban"></i>&nbsp;' + req.__("Constraints")
-            ),
             // rename table doesnt supported for sqlite
             !db.isSQLite &&
               table.name !== "users" &&
@@ -1154,8 +1158,15 @@ router.get(
               [
                 { label: req.__("Type"), key: "type" },
                 {
-                  label: req.__("Fields"),
-                  key: (r) => r.configuration.fields.join(", "),
+                  label: req.__("What"),
+                  key: (r) =>
+                    r.type === "Unique"
+                      ? r.configuration.fields.join(", ")
+                      : r.type === "Index"
+                      ? r.configuration.field
+                      : r.type === "Formula"
+                      ? r.configuration.formula
+                      : "",
                 },
                 {
                   label: req.__("Delete"),
@@ -1166,7 +1177,12 @@ router.get(
               cons,
               { hover: true }
             ),
-            link(`/table/add-constraint/${id}`, req.__("Add constraint")),
+            req.__("Add constraint: "),
+            link(`/table/add-constraint/${id}/Unique`, req.__("Unique")),
+            " | ",
+            link(`/table/add-constraint/${id}/Formula`, req.__("Formula")),
+            " | ",
+            link(`/table/add-constraint/${id}/Index`, req.__("Index")),
           ],
         },
       ],
@@ -1181,18 +1197,68 @@ router.get(
  * @param {object[]} fields
  * @returns {Form}
  */
-const constraintForm = (req, table_id, fields) =>
-  new Form({
-    action: `/table/add-constraint/${table_id}`,
-    blurb: req.__(
-      "Tick the boxes for the fields that should be jointly unique"
-    ),
-    fields: fields.map((f) => ({
-      name: f.name,
-      label: f.label,
-      type: "Bool",
-    })),
-  });
+const constraintForm = (req, table_id, fields, type) => {
+  switch (type) {
+    case "Formula":
+      return new Form({
+        action: `/table/add-constraint/${table_id}/${type}`,
+
+        fields: [
+          {
+            name: "formula",
+            label: req.__("Constraint formula"),
+            validator: expressionValidator,
+            type: "String",
+            class: "validate-expression",
+            sublabel:
+              req.__(
+                "Formula must evaluate to true for valid rows. In scope: "
+              ) +
+              fields
+                .map((f) => f.name)
+                .map((fn) => code(fn))
+                .join(", "),
+          },
+          {
+            name: "errormsg",
+            label: "Error message",
+            sublabel: "Shown the user if formula is false",
+            type: "String",
+          },
+        ],
+      });
+    case "Unique":
+      return new Form({
+        action: `/table/add-constraint/${table_id}/${type}`,
+        blurb: req.__(
+          "Tick the boxes for the fields that should be jointly unique"
+        ),
+        fields: fields.map((f) => ({
+          name: f.name,
+          label: f.label,
+          type: "Bool",
+        })),
+      });
+    case "Index":
+      return new Form({
+        action: `/table/add-constraint/${table_id}/${type}`,
+        blurb: req.__(
+          "Choose the field to be indexed. This make searching the table faster."
+        ),
+        fields: [
+          {
+            type: "String",
+            name: "field",
+            label: "Field",
+            required: true,
+            attributes: {
+              options: fields.map((f) => ({ label: f.label, name: f.name })),
+            },
+          },
+        ],
+      });
+  }
+};
 
 /**
  * Add constraint GET handler
@@ -1203,10 +1269,10 @@ const constraintForm = (req, table_id, fields) =>
  * @function
  */
 router.get(
-  "/add-constraint/:id",
+  "/add-constraint/:id/:type",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
+    const { id, type } = req.params;
     const table = await Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
@@ -1214,7 +1280,7 @@ router.get(
       return;
     }
     const fields = await table.getFields();
-    const form = constraintForm(req, table.id, fields);
+    const form = constraintForm(req, table.id, fields, type);
     res.sendWrap(req.__(`Add constraint to %s`, table.name), {
       above: [
         {
@@ -1231,7 +1297,7 @@ router.get(
         },
         {
           type: "card",
-          title: req.__(`Add constraint to %s`, table.name),
+          title: req.__(`Add %s constraint to %s`, type, table.name),
           contents: renderForm(form, req.csrfToken()),
         },
       ],
@@ -1247,10 +1313,10 @@ router.get(
  * @function
  */
 router.post(
-  "/add-constraint/:id",
+  "/add-constraint/:id/:type",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
+    const { id, type } = req.params;
     const table = await Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
@@ -1258,16 +1324,20 @@ router.post(
       return;
     }
     const fields = await table.getFields();
-    const form = constraintForm(req, table.id, fields);
+    const form = constraintForm(req, table.id, fields, type);
     form.validate(req.body);
     if (form.hasErrors) req.flash("error", req.__("An error occurred"));
     else {
+      let configuration = {};
+      if (type === "Unique")
+        configuration.fields = fields
+          .map((f) => f.name)
+          .filter((f) => form.values[f]);
+      else configuration = form.values;
       await TableConstraint.create({
         table_id: table.id,
-        type: "Unique",
-        configuration: {
-          fields: fields.map((f) => f.name).filter((f) => form.values[f]),
-        },
+        type,
+        configuration,
       });
     }
     res.redirect(`/table/constraints/${table.id}`);

package/routes/utils.js

@@ -18,6 +18,24 @@ const cookieSession = require("cookie-session");
 const is = require("contractis/is");
 const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
+const si = require("systeminformation");
+
+const get_sys_info = async () => {
+  const disks = await si.fsSize();
+  let size = 0;
+  let used = 0;
+  disks.forEach((d) => {
+    if (d && d.used && d.size) {
+      size += d.size;
+      used += d.used;
+    }
+  });
+  const diskUsage = Math.round(100 * (used / size));
+  const simem = await si.mem();
+  const memUsage = Math.round(100 - 100 * (simem.available / simem.total));
+  const cpuUsage = Math.round((await si.currentLoad()).currentLoad);
+  return { memUsage, diskUsage, cpuUsage };
+};
 
 /**
  * Checks that user logged or not.
@@ -314,4 +332,5 @@ module.exports = {
   get_tenant_from_req,
   addOnDoneRedirect,
   is_relative_url,
+  get_sys_info,
 };

package/tests/table.test.js

@@ -198,11 +198,11 @@ Gordon Kane, 217`;
       .set("Cookie", loginCookie)
       .expect(toInclude("books constraints"));
     await request(app)
-      .get("/table/add-constraint/" + id)
+      .get("/table/add-constraint/" + id + "/Unique")
       .set("Cookie", loginCookie)
       .expect(toInclude("Add constraint to books"));
     await request(app)
-      .post("/table/add-constraint/" + id)
+      .post("/table/add-constraint/" + id + "/Unique")
       .send("author=on")
       .send("pages=on")
       .set("Cookie", loginCookie)