@saltcorn/server 0.7.0-beta.0 → 0.7.0-beta.3

package/locales/en.json

@@ -867,5 +867,9 @@
 	"Save before going back": "Save before going back",
 	"Reload after going back": "Reload after going back",
 	"2FA policy": "2FA policy",
-	"Steps to go back": "Steps to go back"
+	"Steps to go back": "Steps to go back",
+	"Place in dropdown": "Place in dropdown",
+	"Hide null columns": "Hide null columns",
+	"Do not display a column if it contains entirely missing values": "Do not display a column if it contains entirely missing values",
+	"Show a warning to users creating a tenant disclaiming warrenty of availability or security": "Show a warning to users creating a tenant disclaiming warrenty of availability or security"
 }

package/markup/admin.js

@@ -46,14 +46,21 @@ const restore_backup = (csrf, inner, action = `/admin/restore`) =>
       encType: "multipart/form-data",
     },
     input({ type: "hidden", name: "_csrf", value: csrf }),
-    label({ class: "btn-link", for: "upload_to_restore" }, inner),
+    label(
+      {
+        class: "btn-link",
+        for: "upload_to_restore",
+        style: { cursor: "pointer" },
+      },
+      inner
+    ),
     input({
       id: "upload_to_restore",
       class: "d-none",
       name: "file",
       type: "file",
       accept: "application/zip,.zip",
-      onchange: "this.form.submit();",
+      onchange: "notifyAlert('Restoring backup...', true);this.form.submit();",
     })
   );
 

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.0-beta.0",
+  "version": "0.7.0-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.7.0-beta.0",
-    "@saltcorn/builder": "0.7.0-beta.0",
-    "@saltcorn/data": "0.7.0-beta.0",
-    "@saltcorn/admin-models": "0.7.0-beta.0",
-    "@saltcorn/markup": "0.7.0-beta.0",
-    "@saltcorn/sbadmin2": "0.7.0-beta.0",
+    "@saltcorn/base-plugin": "0.7.0-beta.3",
+    "@saltcorn/builder": "0.7.0-beta.3",
+    "@saltcorn/data": "0.7.0-beta.3",
+    "@saltcorn/admin-models": "0.7.0-beta.3",
+    "@saltcorn/markup": "0.7.0-beta.3",
+    "@saltcorn/sbadmin2": "0.7.0-beta.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -31,7 +31,7 @@
     "greenlock": "^4.0.4",
     "greenlock-express": "^4.0.3",
     "helmet": "^3.23.3",
-    "i18n": "^0.13.2",
+    "i18n": "^0.14.0",
     "live-plugin-manager": "^0.16.0",
     "moment": "^2.27.0",
     "multer": "^1.4.3",

package/public/saltcorn-builder.css

@@ -361,3 +361,6 @@ Copyright (c) 2017 Taha Paksu
 .btn-builder-move {
   color: white;
 }
+.dropdown-menu.searchbar-dropdown.show {
+  transform: translate(0px, 40px);
+}

package/public/saltcorn.js

@@ -423,7 +423,7 @@ function tristateClick(nm) {
   }
 }
 
-function notifyAlert(note) {
+function notifyAlert(note, spin) {
   if (Array.isArray(note)) {
     note.forEach(notifyAlert);
     return;
@@ -438,10 +438,16 @@ function notifyAlert(note) {
   }
 
   $("#alerts-area")
-    .append(`<div class="alert alert-${type} alert-dismissible fade show" role="alert">
+    .append(`<div class="alert alert-${type} alert-dismissible fade show ${
+    spin ? "d-flex align-items-center" : ""
+  }" role="alert">
   ${txt}
-  <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
-  </button>
+  ${
+    spin
+      ? `<div class="spinner-border ms-auto" role="status" aria-hidden="true"></div>`
+      : `<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
+  </button>`
+  }
 </div>`);
 }
 
@@ -751,14 +757,33 @@ function room_older(viewname, room_id, btn) {
   );
 }
 
-function fill_formula_btn_click(btn) {
+async function fill_formula_btn_click(btn, k) {
   const formula = decodeURIComponent($(btn).attr("data-formula"));
+  const free_vars = JSON.parse(
+    decodeURIComponent($(btn).attr("data-formula-free-vars"))
+  );
+  const table = JSON.parse(
+    decodeURIComponent($(btn).attr("data-formula-table"))
+  );
   const rec = get_form_record($(btn), true);
+  const rec_ids = get_form_record($(btn));
+  for (const fv of free_vars) {
+    if (fv.includes(".")) {
+      const kpath = fv.split(".");
+      const [refNm, targetNm] = kpath;
+      const reffield = table.fields.find((f) => f.name === refNm);
+      const resp = await $.ajax(
+        `/api/${reffield.reftable_name}?id=${rec_ids[refNm]}`
+      );
+      rec[refNm] = resp.success[0];
+    }
+  }
   const val = new Function(
     `{${Object.keys(rec).join(",")}}`,
     "return " + formula
   )(rec);
   $(btn).closest(".input-group").find("input").val(val);
+  if (k) k();
 }
 
 /*

package/routes/api.js

@@ -111,6 +111,48 @@ function accessAllowed(req, user, trigger) {
   return role <= trigger.min_role;
 }
 
+router.get(
+  "/:tableName/distinct/:fieldName",
+  //passport.authenticate("api-bearer", { session: false }),
+  error_catcher(async (req, res, next) => {
+    let { tableName, fieldName } = req.params;
+    const table = await Table.findOne(
+      strictParseInt(tableName)
+        ? { id: strictParseInt(tableName) }
+        : { name: tableName }
+    );
+    if (!table) {
+      res.status(404).json({ error: req.__("Not found") });
+      return;
+    }
+
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user, table)) {
+          const field = (await table.getFields()).find(
+            (f) => f.name === fieldName
+          );
+          if (!field) {
+            res.status(404).json({ error: req.__("Not found") });
+            return;
+          }
+          let dvs;
+          if (field.is_fkey) {
+            dvs = await field.distinct_values();
+          } else {
+            dvs = await table.distinctValues(fieldName);
+          }
+          res.json({ success: dvs });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
+);
+
 /**
  * Select Table rows using GET
  * @name get/:tableName/

package/routes/homepage.js

@@ -265,7 +265,7 @@ const packTab = (req, packlist) =>
     { class: "pb-3 pt-2 pe-4" },
     p(req.__("Instead of building, get up and running in no time with packs")),
     p(
-      { class: "font-italic" },
+      { class: "fst-italic" },
       req.__(
         "Packs are collections of tables, views and plugins that give you a full application which you can then edit to suit your needs."
       )

package/routes/plugins.js

@@ -450,6 +450,7 @@ const store_actions_dropdown = (req) =>
           {
             class: "dropdown-item",
             href: `/plugins/upgrade`,
+            onClick: `notifyAlert('Upgrading plugins...', true)`,
           },
           '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
             req.__("Upgrade installed plugins")
@@ -646,7 +647,9 @@ router.get(
   error_catcher(async (req, res) => {
     const { plugin } = req.params;
     const filepath = req.params[0];
-    const location = getState().plugin_locations[plugin];
+    const location = getState().plugin_locations[
+      plugin.includes("@") ? plugin.split("@")[0] : plugin
+    ];
     if (location) {
       const safeFile = path
         .normalize(filepath)