@saltcorn/server 0.9.4-beta.2 → 0.9.4-beta.21

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/list.js

@@ -161,6 +161,11 @@ const typeToGridType = (t, field) => {
     jsgField.formatterParams = {
       inputFormat: "iso",
     };
+
+    if (field.attributes?.day_only) {
+      jsgField.editorParams = { dayOnly: true };
+      jsgField.formatter = "__isoDateFormatter";
+    }
   } else if (t.name === "Color") {
     jsgField.editor = "__colorEditor";
     jsgField.formatter = "__colorFormatter";

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

@@ -21,6 +21,8 @@ const { getViews, traverseSync } = require("@saltcorn/data/models/layout");
 const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
 const db = require("@saltcorn/data/db");
 const { getPageList, getPageGroupList } = require("./common_lists");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
+const Tag = require("@saltcorn/data/models/tag");
 
 const {
   isAdmin,
@@ -184,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);
@@ -217,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,
@@ -293,7 +296,18 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
-    const pages = await Page.find({}, { orderBy: "name", nocase: true });
+    const pageq = {};
+    let filterOnTag;
+
+    if (req.query._tag) {
+      const tagEntries = await TagEntry.find({
+        tag_id: +req.query._tag,
+        not: { page_id: null },
+      });
+      pageq.id = { in: tagEntries.map((te) => te.page_id).filter(Boolean) };
+      filterOnTag = await Tag.findOne({ id: +req.query._tag });
+    }
+    const pages = await Page.find(pageq, { orderBy: "name", nocase: true });
     const pageGroups = await PageGroup.find(
       {},
       { orderBy: "name", nocase: true }
@@ -311,7 +325,7 @@ router.get(
           title: req.__("Your pages"),
           class: "mt-0",
           contents: div(
-            getPageList(pages, roles, req),
+            await getPageList(pages, roles, req, { filterOnTag }),
             a(
               {
                 href: `/pageedit/new`,
@@ -370,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") },
       ],
     },
@@ -677,9 +691,11 @@ router.post(
 
     if (id && req.body.layout) {
       await Page.update(+id, { layout: req.body.layout });
-      res.json({ success: "ok" });
+      res.json({
+        success: "ok",
+      });
     } else {
-      res.json({ error: "no page or no layout." });
+      res.json({ error: req.__("Unable to save: No page or no layout") });
     }
   })
 );

package/routes/tables.js

@@ -13,6 +13,7 @@ const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
 const Model = require("@saltcorn/data/models/model");
 const Trigger = require("@saltcorn/data/models/trigger");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
 const {
   mkTable,
   renderForm,
@@ -59,10 +60,12 @@ const { tablesList, viewsList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
+  comparingCaseInsensitive,
 } = require("@saltcorn/data/utils");
 const { EOL } = require("os");
 
 const path = require("path");
+const Tag = require("@saltcorn/data/models/tag");
 /**
  * @type {object}
  * @const
@@ -714,6 +717,7 @@ router.get(
       ...new Set(child_relations.map(({ table }) => table.name)),
     ];
     const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
+    triggers.sort(comparingCaseInsensitive("name"));
     let fieldCard;
     if (fields.length === 0) {
       fieldCard = [
@@ -785,7 +789,16 @@ router.get(
         triggers.length
           ? req.__("Table triggers: ") +
             triggers
-              .map((t) => link(`/actions/configure/${t.id}`, t.name))
+              .map((t) =>
+                link(
+                  `/actions/configure/${
+                    t.id
+                  }?on_done_redirect=${encodeURIComponent(
+                    `table/${table.name}`
+                  )}`,
+                  t.name
+                )
+              )
               .join(", ") +
             "<br>"
           : "",
@@ -819,6 +832,7 @@ router.get(
       }
       viewCard = {
         type: "card",
+        id: "table-views",
         title: req.__("Views of this table"),
         contents:
           viewCardContents +
@@ -1160,6 +1174,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));
@@ -1211,13 +1251,23 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
-    const rows = await Table.find_with_external(
-      {},
-      { orderBy: "name", nocase: true }
-    );
+    const tblq = {};
+    let filterOnTag;
+    if (req.query._tag) {
+      const tagEntries = await TagEntry.find({
+        tag_id: +req.query._tag,
+        not: { table_id: null },
+      });
+      tblq.id = { in: tagEntries.map((te) => te.table_id).filter(Boolean) };
+      filterOnTag = await Tag.findOne({ id: +req.query._tag });
+    }
+    const rows = await Table.find_with_external(tblq, {
+      orderBy: "name",
+      nocase: true,
+    });
     const roles = await User.get_roles();
     const getRole = (rid) => roles.find((r) => r.id === rid).role;
-    const mainCard = await tablesList(rows, req);
+    const mainCard = await tablesList(rows, req, { filterOnTag });
     const createCard = div(
       a(
         { href: `/table/new`, class: "btn btn-primary mt-1 me-3" },

package/routes/tag_entries.js

@@ -5,6 +5,7 @@ const {
   select,
   option,
   label,
+  text,
 } = require("@saltcorn/markup/tags");
 
 const Tag = require("@saltcorn/data/models/tag");
@@ -29,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 });
           })
@@ -94,15 +100,21 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { entry_type, tag_id } = req.params;
-    res.sendWrap(req.__("Add %s to tag"), {
+    const tag = await Tag.findOne({ id: tag_id });
+
+    res.sendWrap(req.__("Add %s to tag %s", entry_type, tag.name), {
       above: [
         {
           type: "breadcrumbs",
-          crumbs: [{ text: req.__(`Tag entry`) }],
+          crumbs: [
+            { text: req.__(`Tags`), href: "/tag" },
+            { text: tag.name, href: `/tag/${tag.id}` },
+            { text: req.__(`Add %s`, text(entry_type)) },
+          ],
         },
         {
           type: "card",
-          title: req.__(`Add entries to tag`),
+          title: req.__(`Add entries to tag %s`, tag.name),
           contents: buildForm(
             entry_type,
             tag_id,
@@ -148,9 +160,10 @@ router.post(
       req.flash("error", req.__("Please select at least one item"));
       return res.redirect(`/tag-entries/add/${entry_type}/${tag_id}`);
     }
+    const ids_array = Array.isArray(ids) ? ids : [ids];
     const fieldName = idField(entry_type);
     const tag = await Tag.findOne({ id: tag_id });
-    for (const id of ids) {
+    for (const id of ids_array) {
       await tag.addEntry({ [fieldName]: id });
     }
     res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);