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

package/locales/en.json

@@ -1436,5 +1436,7 @@
 	"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"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.6-beta.15",
+  "version": "0.9.6-beta.16",
   "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.16",
+    "@saltcorn/builder": "0.9.6-beta.16",
+    "@saltcorn/data": "0.9.6-beta.16",
+    "@saltcorn/admin-models": "0.9.6-beta.16",
+    "@saltcorn/filemanager": "0.9.6-beta.16",
+    "@saltcorn/markup": "0.9.6-beta.16",
+    "@saltcorn/plugins-loader": "0.9.6-beta.16",
+    "@saltcorn/sbadmin2": "0.9.6-beta.16",
     "@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/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/tests/jsdom.test.js

@@ -0,0 +1,159 @@
+const request = require("supertest");
+const getApp = require("../app");
+const { resetToFixtures } = 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");
+const jsdom = require("jsdom");
+const { JSDOM, ResourceLoader } = jsdom;
+afterAll(db.close);
+beforeAll(async () => {
+  await resetToFixtures();
+});
+
+jest.setTimeout(30000);
+
+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() {
+      //console.log("send1", this.url);
+      const url1 = this.url.replace("http://localhost", "");
+      //console.log("xhr fetching", url1);
+      let req = request(app).get(url1);
+      for (const [k, v] of this.requestHeaders) {
+        req = req.set(k, v);
+      }
+      const res = await req;
+      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 [];
+    }
+  }
+  dom.window.XMLHttpRequest = FakeXHR;
+  await new Promise(function (resolve, reject) {
+    dom.window.addEventListener("DOMContentLoaded", (event) => {
+      resolve();
+    });
+  });
+  return dom;
+};
+function traceMethodCalls(obj) {
+  let handler = {
+    get(target, propKey, receiver) {
+      console.log(propKey);
+      const origMethod = target[propKey];
+      return function (...args) {
+        let result = origMethod.apply(this, args);
+        console.log(
+          propKey + JSON.stringify(args) + " -> " + JSON.stringify(result)
+        );
+        return result;
+      };
+    },
+  };
+  return new Proxy(obj, handler);
+}
+describe("JSDOM 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(2000);
+    expect(dom.window.location.href).toBe(
+      "http://localhost/view/authorfilter1?author=Leo"
+    );
+
+    //console.log("dom", dom);
+  });
+});