@saltcorn/server 0.9.4-beta.9 → 0.9.4

package/routes/page.js

@@ -16,6 +16,7 @@ const {
   isAdmin,
   sendHtmlFile,
   getEligiblePage,
+  getRandomPage,
 } = require("../routes/utils.js");
 const { isTest } = require("@saltcorn/data/utils");
 const { add_edit_bar } = require("../markup/admin.js");
@@ -88,20 +89,36 @@ const runPage = async (page, req, res, tic) => {
 const runPageGroup = async (pageGroup, req, res, tic) => {
   const role = req.user && req.user.id ? req.user.role_id : 100;
   if (role <= pageGroup.min_role) {
-    const eligible = await getEligiblePage(pageGroup, req, res);
-    if (typeof eligible === "string") {
-      getState().log(2, eligible);
-      res.status(400).sendWrap(req.__("Internal Error"), eligible);
-    } else if (eligible) {
-      if (!eligible.isReload) await runPage(eligible, req, res, tic);
+    if (pageGroup.random_allocation) {
+      const page = getRandomPage(pageGroup, req);
+      if (typeof page === "string") {
+        getState().log(2, page);
+        res.status(400).sendWrap(req.__("Internal Error"), page);
+      } else if (!page) {
+        getState().log(2, `Unable to find a random page in ${pageGroup.name}`);
+        res
+          .status(404)
+          .sendWrap(
+            req.__("Internal Error"),
+            req.__("Unable to find a random page in %s", pageGroup.name)
+          );
+      } else await runPage(page, req, res, tic);
     } else {
-      getState().log(2, `Pagegroup ${pageGroup.name} has no eligible page`);
-      res
-        .status(404)
-        .sendWrap(
-          req.__("Internal Error"),
-          req.__("%s has no eligible page", pageGroup.name)
-        );
+      const eligible = await getEligiblePage(pageGroup, req, res);
+      if (typeof eligible === "string") {
+        getState().log(2, eligible);
+        res.status(400).sendWrap(req.__("Internal Error"), eligible);
+      } else if (eligible) {
+        if (!eligible.isReload) await runPage(eligible, req, res, tic);
+      } else {
+        getState().log(2, `Pagegroup ${pageGroup.name} has no eligible page`);
+        res
+          .status(404)
+          .sendWrap(
+            req.__("Internal Error"),
+            req.__("%s has no eligible page", pageGroup.name)
+          );
+      }
     }
   } else {
     getState().log(2, `Pagegroup ${pageGroup.name} not authorized`);

package/routes/page_groupedit.js

@@ -29,9 +29,17 @@ const groupPropsForm = async (req, isNew) => {
     ...(isNew
       ? {}
       : {
-          onChange: `saveAndContinue(this, (res) => {
-  history.replaceState(null, '', res.responseJSON.row.name);
-});`,
+          onChange: `
+  saveAndContinue(this, (res) => {
+    history.replaceState(null, '', res.responseJSON.row.name);
+    const arrowsVisible = $('#upDownArrowsId').length > 0;
+    if (
+      arrowsVisible && res.responseJSON.row.random_allocation ||
+      !arrowsVisible && !res.responseJSON.row.random_allocation
+    ) {
+      window.location.reload();
+    }    
+  });`,
         }),
     noSubmitButton: !isNew,
     fields: [
@@ -68,65 +76,78 @@ const groupPropsForm = async (req, isNew) => {
         input_type: "select",
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       },
+      {
+        name: "random_allocation",
+        label: req.__("Random allocation"),
+        type: "Bool",
+        sublabel: req.__(
+          "Serve a random page, ignoring the eligible formula. " +
+            "Within a session, reloads will always deliver the same page. " +
+            "This is a basic requirement for A/B testing."
+        ),
+      },
     ],
   });
 };
 
-const memberForm = async (action, req, groupName, pageValidator) => {
+const memberForm = async (action, req, group, pageValidator) => {
   const pageOptions = (await Page.find()).map((p) => p.name);
-  return new Form({
-    action,
-    fields: [
-      {
-        name: "page_name",
-        label: req.__("Page"),
-        sublabel: req.__("Page to be served"),
-        type: "String",
-        required: true,
-        validator: pageValidator,
-        attributes: {
-          options: pageOptions,
-        },
-      },
-      {
-        name: "description",
-        label: req.__("Description"),
-        type: "String",
-        sublabel: req.__("A description of the group member"),
+  const fields = [
+    {
+      name: "page_name",
+      label: req.__("Page"),
+      sublabel: req.__("Page to be served"),
+      type: "String",
+      required: true,
+      validator: pageValidator,
+      attributes: {
+        options: pageOptions,
       },
-      {
-        name: "eligible_formula",
-        label: req.__("Eligible Formula"),
-        sublabel:
-          req.__("Formula to determine if this page should be served.") +
-          br() +
-          span(
-            "Variables in scope: ",
-            [
-              "width",
-              "height",
-              "innerWidth",
-              "innerHeight",
-              "user",
-              "locale",
-              "device",
-            ]
-              .map((f) => code(f))
-              .join(", ")
-          ),
-        help: {
-          topic: "Eligible Formula",
-        },
-        type: "String",
-        required: true,
-        class: "validate-expression",
+    },
+    {
+      name: "description",
+      label: req.__("Description"),
+      type: "String",
+      sublabel: req.__("A description of the group member"),
+    },
+  ];
+  if (!group.random_allocation) {
+    fields.push({
+      name: "eligible_formula",
+      label: req.__("Eligible Formula"),
+      sublabel:
+        req.__("Formula to determine if this page should be served.") +
+        br() +
+        span(
+          "Variables in scope: ",
+          [
+            "width",
+            "height",
+            "innerWidth",
+            "innerHeight",
+            "user",
+            "locale",
+            "device",
+          ]
+            .map((f) => code(f))
+            .join(", ")
+        ),
+      help: {
+        topic: "Eligible Formula",
       },
-    ],
+      type: "String",
+      required: true,
+      class: "validate-expression",
+    });
+  }
+  return new Form({
+    action,
+    fields,
     additionalButtons: [
       {
         label: req.__("Cancel"),
         class: "btn btn-primary",
-        onclick: `cancelMemberEdit('${groupName}');`,
+        onclick: `cancelMemberEdit('${group.name}');`,
       },
     ],
   });
@@ -142,7 +163,7 @@ const editMemberForm = async (member, req) => {
   return await memberForm(
     `/page_groupedit/edit-member/${member.id}`,
     req,
-    group.name,
+    group,
     validator
   );
 };
@@ -156,7 +177,7 @@ const addMemberForm = async (group, req) => {
   return await memberForm(
     `/page_groupedit/add-member/${group.name}`,
     req,
-    group.name,
+    group,
     validator
   );
 };
@@ -224,7 +245,7 @@ const pageGroupMembers = async (pageGroup, req) => {
     if (members.length <= 1) return "";
     else
       return div(
-        { class: "container" },
+        { class: "container", id: "upDownArrowsId" },
         div(
           { class: "row" },
           div(
@@ -266,38 +287,38 @@ const pageGroupMembers = async (pageGroup, req) => {
         )
       );
   };
-
-  return mkTable(
-    [
-      {
-        label: req.__("Page"),
-        key: (r) =>
-          link(`/page/${pageIdToName[r.page_id]}`, pageIdToName[r.page_id]),
-      },
-      {
-        label: "",
-        key: (r) => upDownBtns(r, req),
-      },
-      {
-        label: req.__("Edit"),
-        key: (member) =>
-          link(`/page_groupedit/edit-member/${member.id}`, req.__("Edit")),
-      },
-      {
-        label: req.__("Delete"),
-        key: (member) =>
-          post_delete_btn(
-            `/page_groupedit/remove-member/${member.id}`,
-            req,
-            req.__("Member %s", member.sequence)
-          ),
-      },
-    ],
-    members,
+  const tblArr = [
+    {
+      label: req.__("Page"),
+      key: (r) =>
+        link(`/page/${pageIdToName[r.page_id]}`, pageIdToName[r.page_id]),
+    },
+  ];
+  if (!pageGroup.random_allocation) {
+    tblArr.push({
+      label: "",
+      key: (r) => upDownBtns(r, req),
+    });
+  }
+  tblArr.push(
     {
-      hover: true,
+      label: req.__("Edit"),
+      key: (member) =>
+        link(`/page_groupedit/edit-member/${member.id}`, req.__("Edit")),
+    },
+    {
+      label: req.__("Delete"),
+      key: (member) =>
+        post_delete_btn(
+          `/page_groupedit/remove-member/${member.id}`,
+          req,
+          req.__("Member %s", member.sequence)
+        ),
     }
   );
+  return mkTable(tblArr, members, {
+    hover: true,
+  });
 };
 
 /**

package/routes/pageedit.js

@@ -186,7 +186,7 @@ const pageBuilderData = async (req, context) => {
   for (const view of views) {
     fixed_state_fields[view.name] = [];
     const table = Table.findOne(view.table_id || view.exttable_name);
-
+    if (table) view.table_name = table.name;
     const fs = await view.get_state_fields();
     for (const frec of fs) {
       const f = new Field(frec);
@@ -219,9 +219,10 @@ const pageBuilderData = async (req, context) => {
       }
     }
   }
+
   //console.log(fixed_state_fields.ListTasks);
   return {
-    views,
+    views: views.map((v) => v.select_option),
     images,
     pages,
     page_groups,
@@ -383,7 +384,7 @@ const wrap = (contents, noCard, req, page) => ({
       crumbs: [
         { text: req.__("Pages"), href: "/pageedit" },
         page
-          ? { href: `/page/${page.name}`, text: page.name }
+          ? { href: `/page/${encodeURIComponent(page.name)}`, text: page.name }
           : { text: req.__("New") },
       ],
     },

package/routes/tables.js

@@ -832,6 +832,7 @@ router.get(
       }
       viewCard = {
         type: "card",
+        id: "table-views",
         title: req.__("Views of this table"),
         contents:
           viewCardContents +
@@ -994,6 +995,13 @@ router.get(
                 req,
                 true
               ),
+            table.name !== "users" &&
+              post_dropdown_item(
+                `/table/delete/${table.id}`,
+                '<i class="fas fa-trash"></i>&nbsp;' + req.__("Delete table"),
+                req,
+                true
+              ),
           ])
         )
     );
@@ -1173,6 +1181,32 @@ router.post(
       res.redirect(`/table`);
       return;
     }
+    const views = await View.find(
+      t.id ? { table_id: t.id } : { exttable_name: t.name }
+    );
+    if (views.length) {
+      req.flash(
+        "error",
+        `${text(t.name)} has views. Delete these first: <a href="/table/${
+          t.name
+        }#table-views">Views for ${text(t.name)}</a>`
+      );
+      res.redirect(`/table`);
+      return;
+    }
+    if (t.id) {
+      const triggers = await Trigger.find({ table_id: t.id });
+      if (triggers.length) {
+        req.flash(
+          "error",
+          `${text(
+            t.name
+          )} has triggers. Delete these first: <a href="/actions">Trigger list</a>`
+        );
+        res.redirect(`/table`);
+        return;
+      }
+    }
     try {
       await t.delete();
       req.flash("success", req.__(`Table %s deleted`, t.name));

package/routes/tag_entries.js

@@ -30,7 +30,12 @@ const buildFields = (entryType, formOptions, req) => {
       div(
         { class: "col-sm-10" },
         select(
-          { name: "ids", class: "form-control form-select", multiple: true },
+          {
+            name: "ids",
+            class: "form-control form-select",
+            multiple: true,
+            size: 20,
+          },
           list.map((entry) => {
             return option({ value: entry.id, label: entry.name });
           })

package/routes/tags.js

@@ -27,6 +27,7 @@ const {
 const db = require("@saltcorn/data/db");
 const { getState } = require("@saltcorn/data/db/state");
 const { create_pack_from_tag } = require("@saltcorn/admin-models/models/pack");
+const Table = require("@saltcorn/data/models/table");
 
 const router = new Router();
 module.exports = router;
@@ -161,6 +162,9 @@ router.get(
     await setTableRefs(views);
     const pages = await tag.getPages();
     const triggers = await tag.getTriggers();
+    triggers.forEach((tr) => {
+      if (tr.table_id) tr.table_name = Table.findOne(tr.table_id)?.name;
+    });
     const roles = await User.get_roles();
 
     const tablesDomId = "tablesListId";

package/routes/utils.js

@@ -13,6 +13,7 @@ const {
   features,
 } = require("@saltcorn/data/db/state");
 const { get_base_url } = require("@saltcorn/data/models/config");
+const { hash } = require("@saltcorn/data/utils");
 const { input, script, domReady } = require("@saltcorn/markup/tags");
 const session = require("express-session");
 const cookieSession = require("cookie-session");
@@ -21,6 +22,7 @@ const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
+const Page = require("@saltcorn/data/models/page");
 const si = require("systeminformation");
 const {
   config_fields_form,
@@ -30,6 +32,7 @@ const {
 } = require("../markup/admin.js");
 const path = require("path");
 const { UAParser } = require("ua-parser-js");
+const crypto = require("crypto");
 
 const get_sys_info = async () => {
   const disks = await si.fsSize();
@@ -144,9 +147,10 @@ const set_custom_http_headers = (res, req, state) => {
 /**
  * Tries to recognize tenant from HTTP Request
  * @param {object} req
+ * @param {number|undefined} hostPartsOffset (optional) for socketIO, to get the tenant with localhost
  * @returns {string}
  */
-const get_tenant_from_req = (req) => {
+const get_tenant_from_req = (req, hostPartsOffset) => {
   if (req.subdomains && req.subdomains.length > 0)
     return req.subdomains[req.subdomains.length - 1];
 
@@ -154,7 +158,8 @@ const get_tenant_from_req = (req) => {
     return db.connectObj.default_schema;
   if (!req.subdomains && req.headers.host) {
     const parts = req.headers.host.split(".");
-    if (parts.length < 3) return db.connectObj.default_schema;
+    if (parts.length < (!hostPartsOffset ? 3 : 3 - hostPartsOffset))
+      return db.connectObj.default_schema;
     else return parts[0];
   }
 };
@@ -505,6 +510,21 @@ const getEligiblePage = async (pageGroup, req, res) => {
   }
 };
 
+/**
+ * @param {PageGroup} pageGroup
+ * @param {any} req
+ * @returns the page, null or an error msg
+ */
+const getRandomPage = (pageGroup, req) => {
+  if (pageGroup.members.length === 0)
+    return req.__("Pagegroup %s has no members", pageGroup.name);
+  const hash = crypto.createHash("sha1").update(req.sessionID).digest("hex");
+  const idx =
+    parseInt(hash.substring(hash.length - 4), 16) % pageGroup.members.length;
+  const sessionMember = pageGroup.members[idx];
+  return Page.findOne({ id: sessionMember.page_id });
+};
+
 module.exports = {
   sqlsanitize,
   csrfField,
@@ -524,4 +544,5 @@ module.exports = {
   sendHtmlFile,
   setRole,
   getEligiblePage,
+  getRandomPage,
 };

package/routes/view.js

@@ -79,6 +79,7 @@ router.get(
     if ((title || "").includes("{{")) {
       title = await view.interpolate_title_string(title, query);
     }
+    title = { title };
     if (isModal && view.attributes?.popup_width)
       res.set(
         "SaltcornModalWidth",
@@ -102,7 +103,10 @@ router.get(
       if ((description || "").includes("{{")) {
         description = await view.interpolate_title_string(description, query);
       }
-      title = { title, description };
+      title.description = description;
+    }
+    if (view.attributes?.no_menu) {
+      title.no_menu = true;
     }
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();

package/routes/viewedit.js

@@ -217,6 +217,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         ),
       }),
       new Field({
+        // legacy
         name: "default_render_page",
         label: req.__("Show on page"),
         sublabel: req.__(
@@ -243,6 +244,14 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         },
         showIf: { viewtemplate: hasTable },
       }),
+      new Field({
+        name: "no_menu",
+        label: req.__("No menu"),
+        sublabel: req.__("Omit the menu from this view"),
+        tab: "View settings",
+        parent_field: "attributes",
+        type: "Bool",
+      }),
       new Field({
         name: "popup_title",
         label: req.__("Title"),