@saltcorn/server 0.9.4-beta.10 → 0.9.4-beta.12

package/locales/en.json

@@ -1360,5 +1360,11 @@
 	"Add entries to tag %s": "Add entries to tag %s",
 	"Tag not found": "Tag not found",
 	"Unable to save: No page or no layout": "Unable to save: No page or no layout",
-	"Unable to save: No view": "Unable to save: No view"
-}
+	"Unable to save: No view": "Unable to save: No view",
+	"%s has no eligible page": "%s has no eligible page",
+	"Random allocation": "Random allocation",
+	"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.": "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.",
+	"Pagegroup %s not found": "Pagegroup %s not found",
+	"Create trigger": "Create trigger",
+	"Omit the menu from this view": "Omit the menu from this view"
+}

package/markup/admin.js

@@ -95,23 +95,27 @@ const add_edit_bar = ({
   const singleton = view?.viewtemplateObj?.singleton;
 
   const bar = div(
-    { class: "alert alert-light d-print-none admin-edit-bar" },
-    title,
-    what && span({ class: "ms-1 me-2 badge bg-primary" }, what),
-    !singleton &&
-      a(
-        { class: "ms-2", href: url },
-        "Edit ",
-        i({ class: "fas fa-edit" })
-      ),
-    cfgUrl && !singleton
-      ? a(
-          { class: "ms-1 me-3", href: cfgUrl },
-          "Configure ",
-          i({ class: "fas fa-cog" })
-        )
-      : "",
-    !singleton && viewSpec
+    { class: "card p-1 mt-1 mb-3 d-print-none admin-edit-bar" },
+    div(
+      { class: "card-body p-1" },
+      i({ class: "fas fa-user-cog me-1" }),
+      what && span({ class: "ms-1 me-2 badge bg-secondary" }, what),
+      title,
+      !singleton &&
+        a(
+          { class: "ms-2", href: url },
+          "Edit ",
+          i({ class: "fas fa-edit" })
+        ),
+      cfgUrl && !singleton
+        ? a(
+            { class: "ms-1 me-3", href: cfgUrl },
+            "Configure ",
+            i({ class: "fas fa-cog" })
+          )
+        : "",
+      !singleton && viewSpec
+    )
   );
 
   if (contents.above) {
@@ -232,7 +236,7 @@ const send_infoarch_page = (args) => {
             { text: "Multitenancy", href: "/tenant/settings" },
           ]
         : []),
-      { text: "Pagegroups", href: "/page_group/settings"},
+      { text: "Pagegroups", href: "/page_group/settings" },
       { text: "Tags", href: "/tag" },
       { text: "Diagram", href: "/diagram" },
     ],

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.4-beta.10",
+  "version": "0.9.4-beta.12",
   "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.4-beta.10",
-    "@saltcorn/builder": "0.9.4-beta.10",
-    "@saltcorn/data": "0.9.4-beta.10",
-    "@saltcorn/admin-models": "0.9.4-beta.10",
-    "@saltcorn/filemanager": "0.9.4-beta.10",
-    "@saltcorn/markup": "0.9.4-beta.10",
-    "@saltcorn/sbadmin2": "0.9.4-beta.10",
+    "@saltcorn/base-plugin": "0.9.4-beta.12",
+    "@saltcorn/builder": "0.9.4-beta.12",
+    "@saltcorn/data": "0.9.4-beta.12",
+    "@saltcorn/admin-models": "0.9.4-beta.12",
+    "@saltcorn/filemanager": "0.9.4-beta.12",
+    "@saltcorn/markup": "0.9.4-beta.12",
+    "@saltcorn/sbadmin2": "0.9.4-beta.12",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -55,6 +55,7 @@
     "pluralize": "^8.0.0",
     "qrcode": "1.5.1",
     "resize-with-sharp-or-jimp": "0.1.7",
+    "semver": "^7.6.0",
     "socket.io": "4.6.0",
     "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",

package/public/saltcorn-builder.css

@@ -13,6 +13,10 @@ div.settings-panel {
   min-height: 150px;
 }
 
+div.settings-panel td {
+  vertical-align: top;
+}
+
 span.is-builder-link {
   color: blue;
   text-decoration: underline;
@@ -190,10 +194,16 @@ div.settings-panel div.rfipbtn {
 }
 
 div.componets-and-library-accordion {
-  min-height: 45vh;
   margin-top: -0.25rem;
 }
 
+.builder-left-enlarged .componets-and-library-accordion {
+  min-height: 20vh;
+}
+
+.builder-left-shrunk .componets-and-library-accordion {
+  min-height: 35vh;
+}
 .builder-layers {
   max-height: calc(45vh - 50px);
   overflow-y: scroll;
@@ -299,6 +309,13 @@ Copyright (c) 2017 Taha Paksu
   margin: 0px;
   padding: 1px;
   text-align: center;
+  cursor: pointer;
+}
+.boxmodel-container .boxmodel-input-container {
+  cursor: pointer;
+}
+.boxmodel-container .boxmodel-header {
+  cursor: pointer;
 }
 .boxmodel-container .dim-display {
   background: transparent;

package/public/saltcorn.js

@@ -154,7 +154,7 @@ $(function () {
   });
 });
 
-function reload_embedded_view(viewname) {
+function reload_embedded_view(viewname, new_query_string) {
   if (window._sc_loglevel > 4)
     console.log(
       "reload_embedded_view",
@@ -164,15 +164,16 @@ function reload_embedded_view(viewname) {
     );
   $(`[data-sc-embed-viewname="${viewname}"]`).each(function () {
     const $e = $(this);
-    const url =
-      $e.attr("data-sc-local-state") || $e.attr("data-sc-view-source");
+    let url = $e.attr("data-sc-local-state") || $e.attr("data-sc-view-source");
     if (!url) return;
-    const headers = {
-      pjaxpageload: "true",
-      localizedstate: "true", //no admin bar
-    };
+    if (new_query_string) {
+      url = url.split("?")[0] + "?" + new_query_string;
+    }
     $.ajax(url, {
-      headers,
+      headers: {
+        pjaxpageload: "true",
+        localizedstate: "true", //no admin bar
+      },
       success: function (res, textStatus, request) {
         $e.html(res);
         initialize_page();

package/routes/actions.js

@@ -105,7 +105,13 @@ router.get(
             title: req.__("Triggers"),
             contents: div(
               await getTriggerList(triggers, req, { filterOnTag }),
-              link("/actions/new", req.__("Add trigger"))
+              a(
+                {
+                  href: "/actions/new",
+                  class: "btn btn-primary",
+                },
+                req.__("Create trigger")
+              )
             ),
           },
           {

package/routes/admin.js

@@ -2427,6 +2427,7 @@ router.post(
       await PageGroup.delete({});
     }
     if (form.values.pages) {
+      await db.deleteWhere("_sc_tag_entries", { not: { page_id: null } });
       await db.deleteWhere("_sc_pages");
     }
     if (form.values.views) {

package/routes/common_lists.js

@@ -505,7 +505,7 @@ const getPageList = async (
     [
       {
         label: req.__("Name"),
-        key: (r) => link(`/page/${r.name}`, r.name),
+        key: (r) => link(`/page/${encodeURIComponent(r.name)}`, r.name),
       },
       ...(tagId
         ? []

package/routes/homepage.js

@@ -24,6 +24,7 @@ const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
 const { get_base_url, sendHtmlFile, getEligiblePage } = require("./utils.js");
+const semver = require("semver");
 
 /**
  * Tables List
@@ -519,8 +520,8 @@ const no_views_logged_in = async (req, res) => {
     const latest =
       isRoot && (await get_latest_npm_version("@saltcorn/cli", 500));
     const can_update =
-      packagejson.version !== latest &&
       latest &&
+      semver.gt(latest, packagejson.version) &&
       !process.env.SALTCORN_DISABLE_UPGRADE;
     if (latest && can_update && isRoot)
       req.flash(

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

@@ -383,7 +383,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/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/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();
@@ -505,6 +508,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 +542,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"),

package/tests/page_group.test.js

@@ -73,6 +73,7 @@ describe("edit Page groups", () => {
       name: nameAfterUpdate,
       description: null,
       min_role: 100,
+      random_allocation: false,
     });
   });