@saltcorn/server 0.9.6-beta.2 → 0.9.6-beta.20

package/serve.js

@@ -235,6 +235,10 @@ module.exports =
       : defaultNCPUs;
 
     const letsEncrypt = await getConfig("letsencrypt", false);
+    const pruneSessionInterval = +(await getConfig(
+      "prune_session_interval",
+      900
+    ));
     const masterState = {
       started: false,
       listeningTo: new Set([]),
@@ -287,7 +291,11 @@ module.exports =
           })
           .ready((glx) => {
             const httpsServer = glx.httpsServer();
-            setupSocket(appargs?.subdomainOffset, httpsServer);
+            setupSocket(
+              appargs?.subdomainOffset,
+              pruneSessionInterval,
+              httpsServer
+            );
             httpsServer.setTimeout(timeout * 1000);
             process.on("message", workerDispatchMsg);
             glx.serveApp(app);
@@ -344,6 +352,10 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
   const cert = getState().getConfig("custom_ssl_certificate", "");
   const key = getState().getConfig("custom_ssl_private_key", "");
   const timeout = +getState().getConfig("timeout", 120);
+  const pruneSessionInterval = +(await getState().getConfig(
+    "prune_session_interval",
+    900
+  ));
   // Server with http on port 80 / https on 443
   // todo  resolve hardcode
   if (port === 80 && cert && key) {
@@ -354,7 +366,12 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
     // todo timeout to config
     httpServer.setTimeout(timeout * 1000);
     httpsServer.setTimeout(timeout * 1000);
-    setupSocket(appargs?.subdomainOffset, httpServer, httpsServer);
+    setupSocket(
+      appargs?.subdomainOffset,
+      pruneSessionInterval,
+      httpServer,
+      httpsServer
+    );
     httpServer.listen(port, () => {
       console.log("HTTP Server running on port 80");
     });
@@ -367,7 +384,7 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
     // server with http only
     const http = require("http");
     const httpServer = http.createServer(app);
-    setupSocket(appargs?.subdomainOffset, httpServer);
+    setupSocket(appargs?.subdomainOffset, pruneSessionInterval, httpServer);
 
     // todo timeout to config
     // todo refer in doc to httpserver doc
@@ -384,7 +401,7 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
  *
  * @param  {...*} servers
  */
-const setupSocket = (subdomainOffset, ...servers) => {
+const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
   // https://socket.io/docs/v4/middlewares/
   const wrap = (middleware) => (socket, next) =>
     middleware(socket.request, {}, next);
@@ -395,7 +412,7 @@ const setupSocket = (subdomainOffset, ...servers) => {
   }
 
   const passportInit = passport.initialize();
-  const sessionStore = getSessionStore();
+  const sessionStore = getSessionStore(pruneSessionInterval);
   const setupNamespace = (namespace) => {
     //io.of(namespace).use(wrap(setTenant));
     io.of(namespace).use(wrap(sessionStore));
@@ -452,6 +469,11 @@ const setupSocket = (subdomainOffset, ...servers) => {
             socketIds.push(socket.id);
             await getState().setConfig("joined_log_socket_ids", [...socketIds]);
             callback({ status: "ok" });
+            setTimeout(() => {
+              io.of("/")
+                .to(`_logs_${tenant}_`)
+                .emit("test_conn_msg", { text: "test message" });
+            }, 1000);
           }
         } catch (err) {
           getState().log(1, `Socket join_logs stream: ${err.stack}`);

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/fields.test.js

@@ -391,6 +391,27 @@ describe("Field Endpoints", () => {
       })
       .expect(toBeTrue((r) => +r.text > 2));
   });
+  it("should show calculated field with two single joinfields", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "patients" });
+    await Field.create({
+      table,
+      label: "pagesp12",
+      type: "Integer",
+      calculated: true,
+      stored: true,
+      expression: "favbook.pages+1+favbook.id",
+    });
+    const app = await getApp({ disableCsrf: true });
+
+    await request(app)
+      .post("/field/show-calculated/patients/pagesp12/show")
+      .set("Cookie", loginCookie)
+      .send({
+        id: 1,
+      })
+      .expect(toBeTrue((r) => +r.text > 2));
+  });
   it("should show calculated field with double joinfield", async () => {
     const loginCookie = await getAdminLoginCookie();
     const table = Table.findOne({ name: "readings" });

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);
+  });
+});

package/tests/page.test.js

@@ -76,7 +76,7 @@ describe("page create", () => {
     await request(app)
       .get("/pageedit/new")
       .set("Cookie", loginCookie)
-      .expect(toInclude("A short name that will be in your URL"));
+      .expect(toInclude("A short name that will be in the page URL"));
   });
   it("shows new with html file selector", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -237,7 +237,7 @@ describe("pageedit", () => {
     await request(app)
       .get("/pageedit/edit-properties/a_page")
       .set("Cookie", loginCookie)
-      .expect(toInclude("A short name that will be in your URL"));
+      .expect(toInclude("A short name that will be in the page URL"));
 
     //TODO full context
     const ctx = encodeURIComponent(JSON.stringify({}));

package/tests/plugins.test.js

@@ -137,8 +137,10 @@ describe("Plugin dependency resolution and upgrade", () => {
       .expect(toRedirect("/plugins"));
     const quill = await Plugin.findOne({ name: "quill-editor" });
     expect(quill.location).toBe("@saltcorn/quill-editor");
+    expect(quill.name).toBe("quill-editor");
     const html = await Plugin.findOne({ location: "@saltcorn/html" });
     expect(html.location).toBe("@saltcorn/html");
+    expect(html.name).toBe("html");
     const html_type = getState().types.HTML;
     expect(!!html_type.fieldviews.Quill).toBe(true);
   });