@saltcorn/server 0.9.6-beta.15 → 0.9.6-beta.17

package/auth/routes.js

@@ -1155,7 +1155,11 @@ router.get(
     } else {
       const auth = getState().auth_methods[method];
       if (auth) {
-        passport.authenticate(method, auth.parameters)(req, res, next);
+        const passportParams =
+          typeof auth.parameters === "function"
+            ? auth.parameters(req)
+            : auth.parameters;
+        passport.authenticate(method, passportParams)(req, res, next);
       } else {
         req.flash(
           "danger",
@@ -1189,7 +1193,11 @@ router.post(
     const { method } = req.params;
     const auth = getState().auth_methods[method];
     if (auth) {
-      passport.authenticate(method, auth.parameters)(
+      const passportParams =
+        typeof auth.parameters === "function"
+          ? auth.parameters(req)
+          : auth.parameters;
+      passport.authenticate(method, passportParams)(
         req,
         res,
         loginCallback(req, res)
@@ -1227,7 +1235,12 @@ const callbackFn = async (req, res, next) => {
   const { method } = req.params;
   const auth = getState().auth_methods[method];
   if (auth) {
-    passport.authenticate(method, { failureRedirect: "/auth/login" })(
+    const passportParams =
+      typeof auth.parameters === "function"
+        ? auth.parameters(req)
+        : auth.parameters;
+    passportParams.failureRedirect = "/auth/login";
+    passport.authenticate(method, passportParams)(
       req,
       res,
       loginCallback(req, res)

package/auth/testhelp.js

@@ -9,6 +9,8 @@ const app = require("../app");
 const getApp = require("../app");
 const fixtures = require("@saltcorn/data/db/fixtures");
 const reset = require("@saltcorn/data/db/reset_schema");
+const jsdom = require("jsdom");
+const { JSDOM, ResourceLoader } = jsdom;
 
 /**
  *
@@ -307,6 +309,89 @@ const notFound = (res) => {
   }
 };
 
+const load_url_dom = async (url) => {
+  const app = await getApp({ disableCsrf: true });
+  class CustomResourceLoader extends ResourceLoader {
+    async fetch(url, options) {
+      const url1 = url.replace("http://localhost", "");
+      //console.log("fetching", url, url1);
+      const res = await request(app).get(url1);
+
+      return Buffer.from(res.text);
+    }
+  }
+  const reqres = await request(app).get(url);
+  //console.log("rr1", reqres.text);
+  const virtualConsole = new jsdom.VirtualConsole();
+  virtualConsole.sendTo(console);
+  const dom = new JSDOM(reqres.text, {
+    url: "http://localhost" + url,
+    runScripts: "dangerously",
+    resources: new CustomResourceLoader(),
+    pretendToBeVisual: true,
+    virtualConsole,
+  });
+
+  class FakeXHR {
+    constructor() {
+      this.readyState = 0;
+      this.requestHeaders = [];
+      //return traceMethodCalls(this);
+    }
+    open(method, url) {
+      //console.log("open xhr", method, url);
+      this.method = method;
+      this.url = url;
+    }
+
+    addEventListener(ev, reqListener) {
+      if (ev === "load") this.reqListener = reqListener;
+    }
+    setRequestHeader(k, v) {
+      this.requestHeaders.push([k, v]);
+    }
+    overrideMimeType() {}
+    async send(body) {
+      //console.log("send1", this.url);
+      const url1 = this.url.replace("http://localhost", "");
+      //console.log("xhr fetching", url1);
+      let req =
+        this.method == "POST"
+          ? request(app).post(url1)
+          : request(app).get(url1);
+      for (const [k, v] of this.requestHeaders) {
+        req = req.set(k, v);
+      }
+      if (this.method === "POST" && body) req.send(body);
+      const res = await req;
+      this.responseHeaders = res.headers;
+      if (res.headers["content-type"].includes("json"))
+        this.responseType = "json";
+      this.response = res.text;
+      this.responseText = res.text;
+      this.status = res.status;
+      this.statusText = "OK";
+      this.readyState = 4;
+      if (this.reqListener) this.reqListener(res.text);
+      if (this.onload) this.onload(res.text);
+      //console.log("agent res", res);
+      //console.log("xhr", this);
+    }
+    getAllResponseHeaders() {
+      return Object.entries(this.responseHeaders)
+        .map(([k, v]) => `${k}: ${v}`)
+        .join("\n");
+    }
+  }
+  dom.window.XMLHttpRequest = FakeXHR;
+  await new Promise(function (resolve, reject) {
+    dom.window.addEventListener("DOMContentLoaded", (event) => {
+      resolve();
+    });
+  });
+  return dom;
+};
+
 module.exports = {
   getStaffLoginCookie,
   getAdminLoginCookie,
@@ -328,4 +413,5 @@ module.exports = {
   succeedJsonWithWholeBody,
   resToLoginCookie,
   itShouldIncludeTextForAdmin,
+  load_url_dom,
 };

package/load_plugins.js

@@ -8,6 +8,8 @@
 const db = require("@saltcorn/data/db");
 const { getState, getRootState } = require("@saltcorn/data/db/state");
 const Plugin = require("@saltcorn/data/models/plugin");
+const { isRoot } = require("@saltcorn/data/utils");
+const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 
 const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
 
@@ -60,9 +62,23 @@ const loadPlugin = async (plugin, force) => {
       console.error(error); // todo i think that situation is not resolved
     }
   }
+
+  if (isRoot() && res.plugin_module.authentication)
+    await eachTenant(reloadAuthFromRoot);
   return res;
 };
 
+const reloadAuthFromRoot = () => {
+  if (isRoot()) return;
+  const rootState = getRootState();
+  const tenantState = getState();
+  if (!rootState || !tenantState || rootState === tenantState) return;
+  tenantState.auth_methods = {};
+  for (const [k, v] of Object.entries(rootState.auth_methods)) {
+    if (v.shareWithTenants) tenantState.auth_methods[k] = v;
+  }
+};
+
 /**
  * Install plugin
  * @param plugin - plugin name
@@ -90,6 +106,7 @@ const loadAllPlugins = async (force) => {
   }
   await getState().refreshUserLayouts();
   await getState().refresh(true);
+  if (!isRoot()) reloadAuthFromRoot();
 };
 
 /**
@@ -104,14 +121,14 @@ const loadAndSaveNewPlugin = async (
   plugin,
   force,
   noSignalOrDB,
-  __ = (str) => str
+  __ = (str) => str,
+  allowUnsafeOnTenantsWithoutConfigSetting
 ) => {
   const tenants_unsafe_plugins = getRootState().getConfig(
     "tenants_unsafe_plugins",
     false
   );
-  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
-  if (!isRoot && !tenants_unsafe_plugins) {
+  if (!isRoot() && !tenants_unsafe_plugins) {
     if (plugin.source !== "npm") {
       console.error("\nWARNING: Skipping unsafe plugin ", plugin.name);
       return;
@@ -126,7 +143,10 @@ const loadAndSaveNewPlugin = async (
 
     const instore = getRootState().getConfig("available_plugins", []);
     const safes = instore.filter((p) => !p.unsafe).map((p) => p.location);
-    if (!safes.includes(plugin.location)) {
+    if (
+      !safes.includes(plugin.location) &&
+      !allowUnsafeOnTenantsWithoutConfigSetting
+    ) {
       console.error("\nWARNING: Skipping unsafe plugin ", plugin.name);
       return;
     }
@@ -196,6 +216,10 @@ const loadAndSaveNewPlugin = async (
     }
   }
   if (version) plugin.version = version;
+
+  if (isRoot() && plugin_module.authentication)
+    await eachTenant(reloadAuthFromRoot);
+
   if (!noSignalOrDB) {
     await plugin.upsert();
     getState().processSend({

package/locales/en.json

@@ -1436,5 +1436,17 @@
 	"Older": "Older",
 	"Newest": "Newest",
 	"Delete all read": "Delete all read",
-	"Trigger %s duplicated as %s": "Trigger %s duplicated as %s"
+	"Trigger %s duplicated as %s": "Trigger %s duplicated as %s",
+	"Tooltip": "Tooltip",
+	"Tooltip formula": "Tooltip formula",
+	"Install a different version": "Install a different version",
+	"Page group": "Page group",
+	"Starting upgrade, please wait...\n": "Starting upgrade, please wait...\n",
+	"Upgrade done (if it was available) with code 0.\n\nPress the BACK button in your browser, then RELOAD the page.": "Upgrade done (if it was available) with code 0.\n\nPress the BACK button in your browser, then RELOAD the page.",
+	"Installing %s, please wait...\n": "Installing %s, please wait...\n",
+	"Install done with code 0.\n\nPress the BACK button in your browser, then RELOAD the page.": "Install done with code 0.\n\nPress the BACK button in your browser, then RELOAD the page.",
+	"Pulling the cordova-builder docker image...": "Pulling the cordova-builder docker image...",
+	"Check updates": "Check updates",
+	"Choose version": "Choose version",
+	"Unknown authentication method %s": "Unknown authentication method %s"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.6-beta.15",
+  "version": "0.9.6-beta.17",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.6-beta.15",
-    "@saltcorn/builder": "0.9.6-beta.15",
-    "@saltcorn/data": "0.9.6-beta.15",
-    "@saltcorn/admin-models": "0.9.6-beta.15",
-    "@saltcorn/filemanager": "0.9.6-beta.15",
-    "@saltcorn/markup": "0.9.6-beta.15",
-    "@saltcorn/plugins-loader": "0.9.6-beta.15",
-    "@saltcorn/sbadmin2": "0.9.6-beta.15",
+    "@saltcorn/base-plugin": "0.9.6-beta.17",
+    "@saltcorn/builder": "0.9.6-beta.17",
+    "@saltcorn/data": "0.9.6-beta.17",
+    "@saltcorn/admin-models": "0.9.6-beta.17",
+    "@saltcorn/filemanager": "0.9.6-beta.17",
+    "@saltcorn/markup": "0.9.6-beta.17",
+    "@saltcorn/plugins-loader": "0.9.6-beta.17",
+    "@saltcorn/sbadmin2": "0.9.6-beta.17",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -1317,10 +1317,12 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
     }
   };
   if (res.notify) await handle(res.notify, notifyAlert);
-  if (res.error)
+  if (res.error) {
+    if (window._sc_loglevel > 4) console.trace("error response", res.error);
     await handle(res.error, (text) =>
       notifyAlert({ type: "danger", text: text })
     );
+  }
   if (res.notify_success)
     await handle(res.notify_success, (text) =>
       notifyAlert({ type: "success", text: text })

package/routes/admin.js

@@ -108,6 +108,7 @@ const stream = require("stream");
 const Crash = require("@saltcorn/data/models/crash");
 const { get_help_markup } = require("../help/index.js");
 const Docker = require("dockerode");
+const npmFetch = require("npm-registry-fetch");
 
 const router = new Router();
 module.exports = router;
@@ -1004,6 +1005,7 @@ router.get(
       "custom_ssl_certificate",
       false
     );
+    const rndid = `bs${Math.round(Math.random() * 100000)}`;
     let expiry = "";
     if (custom_ssl_certificate && X509Certificate) {
       const { validTo } = new X509Certificate(custom_ssl_certificate);
@@ -1062,7 +1064,8 @@ router.get(
                 " ",
                 req.__("Clear all"),
                 " »"
-              )
+              ),
+              hr()
             ),
           },
           {
@@ -1075,32 +1078,45 @@ router.get(
                   tr(
                     th(req.__("Saltcorn version")),
                     td(
-                      packagejson.version +
-                        (isRoot && can_update
-                          ? post_btn(
-                              "/admin/upgrade",
-                              req.__("Upgrade"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm",
-                                formClass: "d-inline",
-                              }
-                            )
-                          : isRoot && is_latest
-                          ? span(
-                              { class: "badge bg-primary ms-2" },
-                              req.__("Latest")
-                            ) +
-                            post_btn(
-                              "/admin/check-for-upgrade",
-                              req.__("Check for updates"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm px-1 py-0",
-                                formClass: "d-inline",
-                              }
-                            )
-                          : "")
+                      packagejson.version,
+                      isRoot && can_update
+                        ? post_btn(
+                            "/admin/upgrade",
+                            req.__("Upgrade"),
+                            req.csrfToken(),
+                            {
+                              btnClass: "btn-primary btn-sm",
+                              formClass: "d-inline",
+                            }
+                          )
+                        : isRoot && is_latest
+                        ? span(
+                            { class: "badge bg-primary ms-2" },
+                            req.__("Latest")
+                          ) +
+                          post_btn(
+                            "/admin/check-for-upgrade",
+                            req.__("Check updates"),
+                            req.csrfToken(),
+                            {
+                              btnClass: "btn-primary btn-sm px-1 py-0",
+                              formClass: "d-inline",
+                            }
+                          )
+                        : "",
+                      !git_commit &&
+                        a(
+                          {
+                            id: rndid,
+                            class: "btn btn-sm btn-secondary ms-1 px-1 py-0",
+                            onClick: "press_store_button(this, true)",
+                            href:
+                              `javascript:ajax_modal('/admin/install_dialog', ` +
+                              `{ onOpen: () => { restore_old_button('${rndid}'); }, ` +
+                              ` onError: (res) => { selectVersionError(res, '${rndid}') } });`,
+                          },
+                          req.__("Choose version")
+                        )
                     )
                   ),
                   git_commit &&
@@ -1222,6 +1238,137 @@ const pullCordovaBuilder = (req, res) => {
   });
 };
 
+/*
+ * fetch available saltcorn versions and show a dialog to select one
+ */
+router.get(
+  "/install_dialog",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    try {
+      const pkgInfo = await npmFetch.json(
+        "https://registry.npmjs.org/@saltcorn/cli"
+      );
+      if (!pkgInfo?.versions)
+        throw new Error(req.__("Unable to fetch versions"));
+      const versions = Object.keys(pkgInfo.versions);
+      if (versions.length === 0) throw new Error(req.__("No versions found"));
+      res.set("Page-Title", req.__("%s versions", "Saltcorn"));
+      let selected = packagejson.version;
+      res.send(
+        form(
+          {
+            action: `/admin/install`,
+            method: "post",
+          },
+          input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+          div(
+            { class: "form-group" },
+            label(
+              {
+                for: "version_select",
+                class: "form-label fw-bold",
+              },
+              req.__("Version")
+            ),
+            select(
+              {
+                id: "version_select",
+                class: "form-control form-select",
+                name: "version",
+              },
+              versions.map((version) =>
+                option({
+                  id: `${version}_opt`,
+                  value: version,
+                  label: version,
+                  selected: version === selected,
+                })
+              )
+            )
+          ),
+          div(
+            { class: "d-flex justify-content-end" },
+            button(
+              {
+                type: "button",
+                class: "btn btn-secondary me-2",
+                "data-bs-dismiss": "modal",
+              },
+              req.__("Close")
+            ),
+            button(
+              {
+                type: "submit",
+                class: "btn btn-primary",
+                onClick: "press_store_button(this)",
+              },
+              req.__("Install")
+            )
+          )
+        )
+      );
+    } catch (error) {
+      getState().log(
+        2,
+        `GET /install_dialog: ${error.message || "unknown error"}`
+      );
+      return res.status(500).json({ error: error.message || "unknown error" });
+    }
+  })
+);
+
+const doInstall = async (req, res, version, runPull) => {
+  if (db.getTenantSchema() !== db.connectObj.default_schema) {
+    req.flash("error", req.__("Not possible for tenant"));
+    res.redirect("/admin");
+  } else {
+    res.write(
+      version === "latest"
+        ? req.__("Starting upgrade, please wait...\n")
+        : req.__("Installing %s, please wait...\n", version)
+    );
+    const child = spawn(
+      "npm",
+      ["install", "-g", `@saltcorn/cli@${version}`, "--unsafe"],
+      {
+        stdio: ["ignore", "pipe", "pipe"],
+      }
+    );
+    child.stdout.on("data", (data) => {
+      res.write(data);
+    });
+    child.stderr?.on("data", (data) => {
+      res.write(data);
+    });
+    child.on("exit", async function (code, signal) {
+      if (code === 0 && runPull) {
+        res.write(req.__("Pulling the cordova-builder docker image...") + "\n");
+        const pullCode = await pullCordovaBuilder(req, res);
+        res.write(req.__("Pull done with code %s", pullCode) + "\n");
+      }
+      res.end(
+        version === "latest"
+          ? req.__(
+              `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+            )
+          : req.__(
+              `Install done with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+            )
+      );
+      setTimeout(() => {
+        getState().processSend("RestartServer");
+        process.exit(0);
+      }, 100);
+    });
+  }
+};
+
+router.post("/install", isAdmin, async (req, res) => {
+  const { version } = req.body;
+  await doInstall(req, res, version, false);
+});
+
 /**
  * Do Upgrade
  * @name post/upgrade
@@ -1232,43 +1379,7 @@ router.post(
   "/upgrade",
   isAdmin,
   error_catcher(async (req, res) => {
-    if (db.getTenantSchema() !== db.connectObj.default_schema) {
-      req.flash("error", req.__("Not possible for tenant"));
-      res.redirect("/admin");
-    } else {
-      res.write(req.__("Starting upgrade, please wait...\n"));
-      const child = spawn(
-        "npm",
-        ["install", "-g", "@saltcorn/cli@latest", "--unsafe"],
-        {
-          stdio: ["ignore", "pipe", "pipe"],
-        }
-      );
-      child.stdout.on("data", (data) => {
-        res.write(data);
-      });
-      child.stderr?.on("data", (data) => {
-        res.write(data);
-      });
-      child.on("exit", async function (code, signal) {
-        if (code === 0) {
-          res.write(
-            req.__("Pulling the cordova-builder docker image...") + "\n"
-          );
-          const pullCode = await pullCordovaBuilder(req, res);
-          res.write(req.__("Pull done with code %s", pullCode) + "\n");
-        }
-        res.end(
-          req.__(
-            `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
-          )
-        );
-        setTimeout(() => {
-          getState().processSend("RestartServer");
-          process.exit(0);
-        }, 100);
-      });
-    }
+    await doInstall(req, res, "latest", true);
   })
 );
 /**

package/routes/menu.js

@@ -15,6 +15,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const User = require("@saltcorn/data/models/user");
 const View = require("@saltcorn/data/models/view");
 const Page = require("@saltcorn/data/models/page");
+const PageGroup = require("@saltcorn/data/models/page_group");
 const { save_menu_items } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 
@@ -43,6 +44,10 @@ module.exports = router;
 const menuForm = async (req) => {
   const views = await View.find({}, { orderBy: "name", nocase: true });
   const pages = await Page.find({}, { orderBy: "name", nocase: true });
+  const pageGroups = await PageGroup.find(
+    {},
+    { orderBy: "name", nocase: true }
+  );
   const roles = await User.get_roles();
   const tables = await Table.find_with_external({});
   const dynTableOptions = tables.map((t) => t.name);
@@ -101,6 +106,7 @@ const menuForm = async (req) => {
         options: [
           "View",
           "Page",
+          "Page Group",
           "Link",
           "Header",
           "Dynamic",
@@ -141,6 +147,14 @@ const menuForm = async (req) => {
         attributes: { options: views.map((r) => r.select_option) },
         showIf: { type: "View" },
       },
+      {
+        name: "page_group",
+        label: req.__("Page group"),
+        input_type: "select",
+        class: "item-menu",
+        options: pageGroups.map((r) => r.name),
+        showIf: { type: "Page Group" },
+      },
       {
         name: "action_name",
         label: req.__("Action"),
@@ -194,6 +208,14 @@ const menuForm = async (req) => {
         required: true,
         showIf: { type: "Dynamic" },
       },
+      {
+        name: "dyn_tooltip_fml",
+        label: req.__("Tooltip formula"),
+        class: "item-menu",
+        type: "String",
+        required: false,
+        showIf: { type: "Dynamic" },
+      },
       {
         name: "dyn_url_fml",
         label: req.__("URL formula"),
@@ -223,6 +245,7 @@ const menuForm = async (req) => {
           type: [
             "View",
             "Page",
+            "Page Group",
             "Link",
             "Header",
             "Dynamic",
@@ -238,13 +261,34 @@ const menuForm = async (req) => {
         attributes: {
           html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
         },
-        showIf: { type: ["View", "Page", "Link", "Header", "Action"] },
+        showIf: {
+          type: ["View", "Page", "Page Group", "Link", "Header", "Action"],
+        },
       },
       {
         name: "icon",
         class: "item-menu",
         input_type: "hidden",
       },
+      {
+        name: "tooltip",
+        label: req.__("Tooltip"),
+        class: "item-menu",
+        input_type: "text",
+        required: false,
+        showIf: {
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Search",
+            "Action",
+          ],
+        },
+      },
       {
         name: "min_role",
         label: req.__("Minimum role"),
@@ -277,7 +321,7 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
+        showIf: { type: ["View", "Page", "Page Group", "Link"] },
       },
       {
         name: "in_modal",
@@ -285,7 +329,7 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
+        showIf: { type: ["View", "Page", "Page Group", "Link"] },
       },
       {
         name: "style",
@@ -295,7 +339,15 @@ const menuForm = async (req) => {
         type: "String",
         required: true,
         showIf: {
-          type: ["View", "Page", "Link", "Header", "Dynamic", "Action"],
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Action",
+          ],
         },
         attributes: {
           options: [
@@ -322,6 +374,7 @@ const menuForm = async (req) => {
           type: [
             "View",
             "Page",
+            "Page Group",
             "Link",
             "Header",
             "Dynamic",

package/routes/plugins.js

@@ -865,9 +865,13 @@ router.get(
     if (!module) {
       module = getState().plugins[getState().plugin_module_names[plugin.name]];
     }
+    const userLayout =
+      user._attributes?.layout?.plugin === plugin.name
+        ? user._attributes.layout.config || {}
+        : {};
     const form = await module.user_config_form({
       ...(plugin.configuration || {}),
-      ...(user._attributes?.layout?.config || {}),
+      ...userLayout,
     });
     form.action = `/plugins/user_configure/${encodeURIComponent(plugin.name)}`;
     form.onChange = `applyViewConfig(this, '/plugins/user_saveconfig/${encodeURIComponent(

package/routes/search.js

@@ -202,7 +202,8 @@ const runSearch = async ({ q, _page, table }, req, res) => {
   let tablesWithResults = [];
   let tablesConfigured = 0;
   for (const [tableName, viewName] of Object.entries(cfg)) {
-    if (!viewName || viewName === "") continue;
+    if (!viewName || viewName === "" || viewName === "search_table_description")
+      continue;
     tablesConfigured += 1;
     if (table && tableName !== table) continue;
     let sectionHeader = tableName;
@@ -232,7 +233,7 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     }
 
     if (vresps.length > 0) {
-      tablesWithResults.push(tableName);
+      tablesWithResults.push({ tableName, label: sectionHeader });
       resp.push({
         type: "card",
         title: span({ id: tableName }, sectionHeader),
@@ -273,8 +274,13 @@ const runSearch = async ({ q, _page, table }, req, res) => {
               req.__("Show only matches in table:"),
               " ",
               tablesWithResults
-                .map((t) =>
-                  a({ href: `javascript:set_state_field('table', '${t}')` }, t)
+                .map(({ tableName, label }) =>
+                  a(
+                    {
+                      href: `javascript:set_state_field('table', '${tableName}')`,
+                    },
+                    label
+                  )
                 )
                 .join(" | ")
             )

package/routes/tenant.js

@@ -132,7 +132,7 @@ const is_ip_address = (hostname) => {
 const get_cfg_tenant_base_url = (req) =>
   remove_leading_chars(
     ".",
-    getRootState().getConfig("tenant_baseurl", req.hostname)
+    getRootState().getConfig("tenant_baseurl", req.hostname) || req.hostname
   )
     .replace("http://", "")
     .replace("https://", "");
@@ -268,7 +268,8 @@ router.post(
       return;
     }
     // declare  ui form
-    const form = tenant_form(req);
+    const base_url = get_cfg_tenant_base_url(req);
+    const form = tenant_form(req, base_url);
     // validate ui form
     const valres = form.validate(req.body);
     if (valres.errors)

package/routes/utils.js

@@ -77,11 +77,9 @@ function loggedIn(req, res, next) {
  * @returns {void}
  */
 function isAdmin(req, res, next) {
-  if (
-    req.user &&
-    req.user.role_id === 1 &&
-    req.user.tenant === db.getTenantSchema()
-  ) {
+  const cur_tenant = db.getTenantSchema();
+  //console.log({ cur_tenant, user: req.user });
+  if (req.user && req.user.role_id === 1 && req.user.tenant === cur_tenant) {
     next();
   } else {
     req.flash("danger", req.__("Must be admin"));

package/tests/edit.test.js

@@ -0,0 +1,426 @@
+const request = require("supertest");
+const getApp = require("../app");
+const { resetToFixtures, load_url_dom } = require("../auth/testhelp");
+const db = require("@saltcorn/data/db");
+const { getState } = require("@saltcorn/data/db/state");
+const View = require("@saltcorn/data/models/view");
+const Field = require("@saltcorn/data/models/field");
+const Table = require("@saltcorn/data/models/table");
+const { plugin_with_routes, sleep } = require("@saltcorn/data/tests/mocks");
+
+afterAll(db.close);
+beforeAll(async () => {
+  await resetToFixtures();
+  const table = Table.findOne("books");
+  await table.update({ min_role_read: 100 });
+  await Field.create({
+    table,
+    name: "sequel_to",
+    type: "Key to books",
+    attributes: { summary_field: "author" },
+  });
+  await Field.create({
+    table,
+    label: "pagesp1",
+    type: "Integer",
+    calculated: true,
+    expression: "pages+1",
+  });
+  await table.insertRow({
+    author: "Peter Kropotkin",
+    pages: 189,
+    publisher: 1,
+  });
+
+  await table.insertRow({
+    author: "Mary Boas",
+    pages: 864,
+    publisher: 2,
+  });
+  const ptable = Table.findOne("publisher");
+  await ptable.update({ min_role_read: 100 });
+
+  //await getState().setConfig("log_level", 6);
+});
+
+jest.setTimeout(30000);
+
+const makeJoinSelectView = async ({ name, showIfFormula }) => {
+  await View.create({
+    viewtemplate: "Edit",
+    description: "",
+    min_role: 100,
+    name,
+    table_id: Table.findOne("books")?.id,
+    default_render_page: "",
+    slug: {},
+    attributes: {},
+    configuration: {
+      layout: {
+        above: [
+          {
+            gx: null,
+            gy: null,
+            style: {
+              "margin-bottom": "1.5rem",
+            },
+            aligns: ["end", "start"],
+            widths: [2, 10],
+            besides: [
+              {
+                font: "",
+                type: "blank",
+                block: false,
+                style: {},
+                inline: false,
+                contents: "Publisher",
+                labelFor: "publisher",
+                isFormula: {},
+                textStyle: "",
+              },
+              {
+                above: [
+                  {
+                    type: "field",
+                    block: false,
+                    fieldview: "select",
+                    textStyle: "",
+                    field_name: "publisher",
+                    configuration: {},
+                  },
+                  {
+                    type: "container",
+                    style: {},
+                    bgType: "None",
+                    hAlign: "left",
+                    margin: [0, 0, 0, 0],
+                    rotate: 0,
+                    vAlign: "top",
+                    bgColor: "#ffffff",
+                    display: "block",
+                    padding: [0, 0, 0, 0],
+                    bgFileId: 0,
+                    contents: {
+                      above: [
+                        {
+                          font: "",
+                          icon: "",
+                          type: "blank",
+                          block: false,
+                          style: {},
+                          inline: false,
+                          contents: "Warning",
+                          labelFor: "",
+                          isFormula: {},
+                          textStyle: "",
+                        },
+                        {
+                          type: "join_field",
+                          block: false,
+                          fieldview: "as_text",
+                          textStyle: "",
+                          join_field: "publisher.name",
+                          configuration: {},
+                        },
+                      ],
+                    },
+                    imageSize: "contain",
+                    isFormula: {},
+                    minHeight: 0,
+                    textColor: "#ffffff",
+                    widthUnit: "px",
+                    heightUnit: "px",
+                    customClass: "pubwarn",
+                    htmlElement: "div",
+                    showForRole: [],
+                    gradEndColor: "#88ff88",
+                    setTextColor: false,
+                    fullPageWidth: false,
+                    gradDirection: "0",
+                    minHeightUnit: "px",
+                    showIfFormula,
+                    gradStartColor: "#ff8888",
+                    maxScreenWidth: "",
+                    minScreenWidth: "",
+                    show_for_owner: false,
+                  },
+                ],
+              },
+            ],
+            breakpoints: ["", ""],
+          },
+          {
+            gx: null,
+            gy: null,
+            style: {
+              "margin-bottom": "1.5rem",
+            },
+            aligns: ["end", "start"],
+            widths: [2, 10],
+            besides: [
+              {
+                font: "",
+                type: "blank",
+                block: false,
+                style: {},
+                inline: false,
+                contents: "sequel_to",
+                labelFor: "sequel_to",
+                isFormula: {},
+                textStyle: "",
+              },
+              {
+                type: "field",
+                block: false,
+                fieldview: "select",
+                textStyle: "",
+                field_name: "sequel_to",
+                configuration: {
+                  where: "publisher == $publisher",
+                },
+              },
+            ],
+            breakpoints: ["", ""],
+          },
+          {
+            gx: null,
+            gy: null,
+            style: {
+              "margin-bottom": "1.5rem",
+            },
+            aligns: ["end", "start"],
+            widths: [2, 10],
+            besides: [
+              {
+                font: "",
+                icon: "",
+                type: "blank",
+                block: false,
+                style: {},
+                inline: false,
+                contents: "Pages",
+                labelFor: "sequel_to",
+                isFormula: {},
+                textStyle: "",
+              },
+              {
+                above: [
+                  {
+                    type: "field",
+                    block: false,
+                    fieldview: "edit",
+                    textStyle: "",
+                    field_name: "pages",
+                    configuration: {
+                      where: "publisher == $publisher",
+                    },
+                  },
+                  {
+                    type: "field",
+                    block: false,
+                    fieldview: "show",
+                    textStyle: "",
+                    field_name: "pagesp1",
+                    configuration: {
+                      input_type: "text",
+                    },
+                  },
+                ],
+              },
+            ],
+            breakpoints: ["", ""],
+          },
+          {
+            type: "action",
+            block: false,
+            rndid: "cb94bd",
+            nsteps: "",
+            minRole: 100,
+            isFormula: {},
+            action_icon: "",
+            action_name: "Save",
+            action_size: "",
+            action_bgcol: "",
+            action_label: "",
+            action_style: "btn-primary",
+            action_title: "",
+            configuration: {},
+            step_only_ifs: "",
+            action_textcol: "",
+            action_bordercol: "",
+            step_action_names: "",
+          },
+        ],
+      },
+      columns: [
+        {
+          type: "Field",
+          block: false,
+          fieldview: "select",
+          textStyle: "",
+          field_name: "publisher",
+          configuration: {},
+        },
+        {
+          type: "JoinField",
+          block: false,
+          fieldview: "as_text",
+          textStyle: "",
+          join_field: "publisher.name",
+          configuration: {},
+        },
+        {
+          type: "Field",
+          block: false,
+          fieldview: "select",
+          textStyle: "",
+          field_name: "sequel_to",
+          configuration: {
+            where: "publisher == $publisher",
+          },
+        },
+        {
+          type: "Field",
+          block: false,
+          fieldview: "edit",
+          textStyle: "",
+          field_name: "pages",
+          configuration: {
+            where: "publisher == $publisher",
+          },
+        },
+        {
+          type: "Field",
+          block: false,
+          fieldview: "show",
+          textStyle: "",
+          field_name: "pagesp1",
+          configuration: {
+            input_type: "text",
+          },
+        },
+        {
+          type: "Action",
+          rndid: "cb94bd",
+          nsteps: "",
+          minRole: 100,
+          isFormula: {},
+          action_icon: "",
+          action_name: "Save",
+          action_size: "",
+          action_bgcol: "",
+          action_label: "",
+          action_style: "btn-primary",
+          action_title: "",
+          configuration: {},
+          step_only_ifs: "",
+          action_textcol: "",
+          action_bordercol: "",
+          step_action_names: "",
+        },
+      ],
+      viewname: "AuthorEditForTest",
+      auto_save: false,
+      split_paste: false,
+      exttable_name: null,
+      page_when_done: null,
+      view_when_done: "authorlist",
+      dest_url_formula: null,
+      destination_type: "View",
+      formula_destinations: [],
+      page_group_when_done: null,
+    },
+  });
+};
+
+const newEvent = (dom, type) =>
+  new dom.window.CustomEvent(type, {
+    bubbles: true,
+    cancelable: true,
+  });
+
+describe("JSDOM-E2E edit test", () => {
+  it("join select should set dynamic where and show if with joinfield", async () => {
+    await makeJoinSelectView({
+      name: "AuthorEditForTest",
+      showIfFormula: 'publisher?.name == "AK Press"',
+    });
+    const dom = await load_url_dom("/view/AuthorEditForTest");
+    await sleep(1000);
+    const pubwarn = dom.window.document.querySelector("div.pubwarn");
+    //console.log(dom.serialize());
+    expect(pubwarn.style.display).toBe("none");
+
+    const select_seq = dom.window.document.querySelector(
+      "select[name=sequel_to]"
+    );
+    expect([...select_seq.options].map((o) => o.text)).toStrictEqual([
+      "",
+      "Herman Melville",
+    ]);
+    const select = dom.window.document.querySelector("select[name=publisher]");
+    select.value = "1";
+    select.dispatchEvent(newEvent(dom, "change"));
+
+    await sleep(1000);
+    expect([...select_seq.options].map((o) => o.text)).toStrictEqual([
+      "",
+      "Leo Tolstoy",
+      "Peter Kropotkin",
+    ]);
+
+    expect(pubwarn.style.display).toBe("");
+
+    const jf = dom.window.document.querySelector(
+      "div.pubwarn div[data-source-url]"
+    );
+    expect(jf.innerHTML).toBe("AK Press");
+  });
+  it("calculated field", async () => {
+    const dom = await load_url_dom("/view/AuthorEditForTest");
+    const input = dom.window.document.querySelector("input[name=pages]");
+    input.value = "13";
+    input.dispatchEvent(newEvent(dom, "change"));
+    await sleep(1000);
+    const cf = dom.window.document.querySelector(
+      `div[data-source-url="/field/show-calculated/books/pagesp1/show?input_type=text"]`
+    );
+    expect(cf.innerHTML).toBe("14");
+  });
+
+  it("join select should set dynamic where and show if with no joinfield", async () => {
+    await makeJoinSelectView({
+      name: "AuthorEditForTest1",
+      showIfFormula: "publisher == 1",
+    });
+    const dom = await load_url_dom("/view/AuthorEditForTest1");
+    await sleep(1000);
+    const pubwarn = dom.window.document.querySelector("div.pubwarn");
+
+    expect(pubwarn.style.display).toBe("none");
+
+    const select_seq = dom.window.document.querySelector(
+      "select[name=sequel_to]"
+    );
+    expect([...select_seq.options].map((o) => o.text)).toStrictEqual([
+      "",
+      "Herman Melville",
+    ]);
+    const select = dom.window.document.querySelector("select[name=publisher]");
+    select.value = "1";
+    select.dispatchEvent(newEvent(dom, "change"));
+
+    await sleep(1000);
+    expect([...select_seq.options].map((o) => o.text)).toStrictEqual([
+      "",
+      "Leo Tolstoy",
+      "Peter Kropotkin",
+    ]);
+
+    expect(pubwarn.style.display).toBe("");
+    const jf = dom.window.document.querySelector(
+      "div.pubwarn div[data-source-url]"
+    );
+    expect(jf.innerHTML).toBe("AK Press");
+  });
+});

package/tests/filter.test.js

@@ -0,0 +1,68 @@
+const request = require("supertest");
+const getApp = require("../app");
+const { resetToFixtures, load_url_dom } = require("../auth/testhelp");
+const db = require("@saltcorn/data/db");
+const { getState } = require("@saltcorn/data/db/state");
+const View = require("@saltcorn/data/models/view");
+const Table = require("@saltcorn/data/models/table");
+const { plugin_with_routes, sleep } = require("@saltcorn/data/tests/mocks");
+
+afterAll(db.close);
+beforeAll(async () => {
+  await resetToFixtures();
+});
+
+jest.setTimeout(30000);
+
+describe("JSDOM-E2E filter test", () => {
+  it("should load authorlist", async () => {
+    const dom = await load_url_dom("/view/authorlist");
+    //console.log("dom", dom);
+  });
+  it("should user filter to change url", async () => {
+    await View.create({
+      viewtemplate: "Filter",
+      description: "",
+      min_role: 100,
+      name: `authorfilter1`,
+      table_id: Table.findOne("books")?.id,
+      default_render_page: "",
+      slug: {},
+      attributes: {},
+      configuration: {
+        layout: {
+          type: "field",
+          block: false,
+          fieldview: "edit",
+          textStyle: "",
+          field_name: "author",
+          configuration: {},
+        },
+        columns: [
+          {
+            type: "Field",
+            block: false,
+            fieldview: "edit",
+            textStyle: "",
+            field_name: "author",
+            configuration: {},
+          },
+        ],
+      },
+    });
+    const dom = await load_url_dom("/view/authorfilter1");
+    expect(dom.window.location.href).toBe(
+      "http://localhost/view/authorfilter1"
+    );
+    //console.log(dom.serialize());
+    const input = dom.window.document.querySelector("input[name=author]");
+    input.value = "Leo";
+    input.dispatchEvent(new dom.window.Event("change"));
+    await sleep(1000);
+    expect(dom.window.location.href).toBe(
+      "http://localhost/view/authorfilter1?author=Leo"
+    );
+
+    //console.log("dom", dom);
+  });
+});