@saltcorn/server 0.9.3-beta.4 → 0.9.3-beta.5

package/auth/testhelp.js

@@ -156,6 +156,27 @@ const getAdminLoginCookie = async () => {
   return resToLoginCookie(res);
 };
 
+/**
+ *
+ * @param {*} width
+ * @param {*} height
+ * @param {*} innerWidth
+ * @param {*} innerHeight
+ * @returns
+ */
+const prepScreenInfoCookie = (width, height, innerWidth, innerHeight) => {
+  return `_sc_screen_info_=${JSON.stringify({
+    width,
+    height,
+    innerWidth: innerWidth || width,
+    innerHeight: innerHeight || height,
+  })}; Path=/;`;
+};
+
+const prepUserAgent = () => {
+  return `user-agent='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2"; Path=/;`;
+};
+
 /**
  *
  * @param {string} path
@@ -258,10 +279,20 @@ const notAuthorized = (res) => {
     throw new Error(`Expected status 401, received ${res.statusCode}`);
   }
 };
+
+const notFound = (res) => {
+  if (res.statusCode !== 404) {
+    console.log(res.text);
+    throw new Error(`Expected status 404, received ${res.statusCode}`);
+  }
+};
+
 module.exports = {
   getStaffLoginCookie,
   getAdminLoginCookie,
   getUserLoginCookie,
+  prepScreenInfoCookie,
+  prepUserAgent,
   itShouldRedirectUnauthToLogin,
   toRedirect,
   toInclude,
@@ -270,6 +301,7 @@ module.exports = {
   resetToFixtures,
   succeedJsonWith,
   notAuthorized,
+  notFound,
   respondJsonWith,
   toSucceedWithImage,
   succeedJsonWithWholeBody,

package/help/Eligible Formula.tmd

@@ -0,0 +1,69 @@
+Here you can write a formula to decide if the page is eligible for the request.
+
+### `Variables in scope`
+You have access to the following variables:
+
+```
+  width, height, innerWidth, innerHeight, 
+  user, locale, 
+  device
+```
+
+#### `width and height`
+This is the size of the whole screen.
+
+Example:
+```
+  width < 380 && height < 670
+```
+Note: Depending on your browser, this can get scaled with the zoom factor.
+
+##### `innerWidth and innerHeight`
+This is the size of your window.
+
+Example:
+```
+  innerWidth <= 375 && innerHeight <= 667
+```
+Note: Depending on your browser, this can get scaled with the zoom factor.
+
+#### `user`
+Here you'll find the user object or 
+```
+  { 
+    role_id: 100
+  }
+```
+for public requests.
+
+Example:
+```
+  user.id === 1 || user.role_id === 1
+```
+
+#### `locale`
+In locale, you'll find the locale of your browser.
+
+Example:
+```
+  locale === 'en' || locale === 'es' || local === 'de'
+```
+
+### `device`
+The device type is extracted from the user agent. The following values are valid:
+```
+  web, mobile, tablet,
+  console, smarttv, wearable,
+```
+Example:
+```
+  device === "mobile" || innerWidth <= 375 && innerHeight <= 667
+```
+
+Note: This value is independent of the browser zoom.
+
+## `Default member`
+If no member matches, you'll get an error message, or to catch this, add a member at the lowest level with just
+```
+  true
+```

package/locales/en.json

@@ -1294,5 +1294,48 @@
 	"Hoverable rows": "Hoverable rows",
 	"Highlight row under cursor": "Highlight row under cursor",
 	"Striped rows": "Striped rows",
-	"Add zebra stripes to rows": "Add zebra stripes to rows"
-}
+	"Add zebra stripes to rows": "Add zebra stripes to rows",
+	"New page group": "New page group",
+	"Page Groups": "Page Groups",
+	"%s edit": "%s edit",
+	"Members": "Members",
+	"Add member": "Add member",
+	"Edit group properties": "Edit group properties",
+	"Page to be served": "Page to be served",
+	"A description of the group member": "A description of the group member",
+	"Eligible Formula": "Eligible Formula",
+	"Formula to determine if this page should be served.": "Formula to determine if this page should be served.",
+	"Cancel": "Cancel",
+	"%s add-member": "%s add-member",
+	"add-member": "add-member",
+	"add member to %s": "add member to %s",
+	"Added member": "Added member",
+	"Member %s": "Member %s",
+	"Updated member": "Updated member",
+	"%s edit-member": "%s edit-member",
+	"edit member of %s": "edit member of %s",
+	"Removed member %s": "Removed member %s",
+	"Deleted page group %s": "Deleted page group %s",
+	"Missing screen info": "Missing screen info",
+	"What to do if no screen info is given. Reload with parmeters or guess it from the user-agent.": "What to do if no screen info is given. Reload with parmeters or guess it from the user-agent.",
+	"Guess from user agent": "Guess from user agent",
+	"Reload": "Reload",
+	"User Agent screen infos": "User Agent screen infos",
+	"This screen infos are used when the browser does not send them. With 'Missing screen info' set to 'Guess from user agent', the user agent gets mapped to a device with the following values.": "This screen infos are used when the browser does not send them. With 'Missing screen info' set to 'Guess from user agent', the user agent gets mapped to a device with the following values.",
+	"Add screen info": "Add screen info",
+	"Page Group settings": "Page Group settings",
+	"Pagegroups": "Pagegroups",
+	"width": "width",
+	"height": "height",
+	"innerWidth": "innerWidth",
+	"innerHeight": "innerHeight",
+	"Screen info added": "Screen info added",
+	"Screen info removed": "Screen info removed",
+	"Edit screen info": "Edit screen info",
+	"Screen info saved": "Screen info saved",
+	"Settings saved": "Settings saved",
+	"Destination page group": "Destination page group",
+	"Your page groups": "Your page groups",
+	"A group has pages with an eligible formula. When you request a group, then the first page where the formula matches gets served. This way, you can choose a page depending on the screen of the device.": "A group has pages with an eligible formula. When you request a group, then the first page where the formula matches gets served. This way, you can choose a page depending on the screen of the device.",
+	"Create page group": "Create page group"
+}

package/markup/admin.js

@@ -232,6 +232,7 @@ const send_infoarch_page = (args) => {
             { text: "Multitenancy", href: "/tenant/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.3-beta.4",
+  "version": "0.9.3-beta.5",
   "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.3-beta.4",
-    "@saltcorn/builder": "0.9.3-beta.4",
-    "@saltcorn/data": "0.9.3-beta.4",
-    "@saltcorn/admin-models": "0.9.3-beta.4",
-    "@saltcorn/filemanager": "0.9.3-beta.4",
-    "@saltcorn/markup": "0.9.3-beta.4",
-    "@saltcorn/sbadmin2": "0.9.3-beta.4",
+    "@saltcorn/base-plugin": "0.9.3-beta.5",
+    "@saltcorn/builder": "0.9.3-beta.5",
+    "@saltcorn/data": "0.9.3-beta.5",
+    "@saltcorn/admin-models": "0.9.3-beta.5",
+    "@saltcorn/filemanager": "0.9.3-beta.5",
+    "@saltcorn/markup": "0.9.3-beta.5",
+    "@saltcorn/sbadmin2": "0.9.3-beta.5",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -59,6 +59,7 @@
     "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",
+    "ua-parser-js": "^1.0.37",
     "underscore": "1.13.6",
     "uuid": "^8.2.0"
   },

package/public/saltcorn-common.js

@@ -8,6 +8,21 @@ jQuery.fn.swapWith = function (to) {
   });
 };
 
+function setScreenInfoCookie() {
+  document.cookie = `_sc_screen_info_=${JSON.stringify({
+    width: window.screen.width,
+    height: window.screen.height,
+    innerWidth: window.innerWidth,
+    innerHeight: window.innerHeight,
+  })}; expires=Thu, 01 Jan 2100 00:00:00 GMT; path=/; domain=.${
+    window.location.hostname
+  }`;
+}
+setScreenInfoCookie();
+$(window).resize(() => {
+  setScreenInfoCookie();
+});
+
 //avoids hiding in overflow:hidden
 function init_bs5_dropdowns() {
   $("body").on(
@@ -732,6 +747,7 @@ function initialize_page() {
       }
     }
   });
+
   function setExplainer(that) {
     var id = $(that).attr("id") + "_explainer";
 

package/public/saltcorn.css

@@ -97,6 +97,9 @@ div[data-inline-edit-dest-url]:hover .editicon {
 .search-bar button.search-bar {
   border-color: #95a5a6;
   background-color: #ffffff;
+  border-left: 1px solid #95a5a6 !important;
+  border-top: 1px solid #95a5a6 !important;
+  border-bottom: 1px solid #95a5a6 !important;
 }
 .search-bar button.dropdown-toggle {
   border-left: none;

package/public/saltcorn.js

@@ -57,6 +57,14 @@ function updateQueryStringParameter(uri1, key, value) {
   }
 }
 
+function updateQueryStringParameters(uri1, kvs) {
+  let uri = uri1;
+  Object.entries(kvs).forEach((kv) => {
+    uri = updateQueryStringParameter(uri, kv[0], kv[1]);
+  });
+  return uri;
+}
+
 function removeQueryStringParameter(uri1, key) {
   let hash = "";
   let uri = uri1;
@@ -885,6 +893,11 @@ function toggle_android_platform() {
   }
 }
 
+function cancelMemberEdit(groupName) {
+  const url = new URL(location.href);
+  location.href = `${url.origin}/page_groupedit/${groupName}`;
+}
+
 function join_field_clicked(e, fieldPath) {
   $("#inputjoin_field").val(fieldPath);
   apply_showif();

package/routes/admin.js

@@ -99,6 +99,7 @@ const {
 } = require("../markup/admin");
 const moment = require("moment");
 const View = require("@saltcorn/data/models/view");
+const PageGroup = require("@saltcorn/data/models/page_group");
 const { getConfigFile } = require("@saltcorn/data/db/connect");
 const os = require("os");
 const Page = require("@saltcorn/data/models/page");
@@ -1225,6 +1226,12 @@ const clearAllForm = (req) =>
         label: req.__("Pages"),
         default: true,
       },
+      {
+        type: "Bool",
+        name: "page_groups",
+        label: req.__("Page groups"),
+        default: true,
+      },
       {
         type: "Bool",
         name: "files",
@@ -2370,7 +2377,10 @@ router.post(
   error_catcher(async (req, res) => {
     const form = clearAllForm(req);
     form.validate(req.body);
-    //order: pages, views, user fields, tableconstraints, fields, table triggers, table history, tables, plugins, config+crashes+nontable triggers, users
+    //order: page_groups, pages, views, user fields, tableconstraints, fields, table triggers, table history, tables, plugins, config+crashes+nontable triggers, users
+    if (form.values.page_groups) {
+      await PageGroup.delete({});
+    }
     if (form.values.pages) {
       await db.deleteWhere("_sc_pages");
     }

package/routes/common_lists.js

@@ -9,7 +9,7 @@ const {
   post_dropdown_item,
 } = require("@saltcorn/markup");
 const { get_base_url } = require("./utils.js");
-const { h4, p, div, a, i, input, text } = require("@saltcorn/markup/tags");
+const { h4, p, div, a, i, text } = require("@saltcorn/markup/tags");
 
 /**
  * @param {string} col
@@ -273,6 +273,36 @@ const viewsList = async (
       );
 };
 
+const page_group_dropdown = (page_group, req) =>
+  settingsDropdown(`groupDropdownMenuButton${page_group.id}`, [
+    post_dropdown_item(
+      `/page_groupedit/add-to-menu/${page_group.id}`,
+      '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
+      req
+    ),
+    post_dropdown_item(
+      `/page_groupedit/clone/${page_group.id}`,
+      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
+      req
+    ),
+    a(
+      {
+        class: "dropdown-item",
+        // TODO check url why view for page, what do we need for page group
+        href: `javascript:ajax_modal('/admin/snapshot-restore/pagegroup/${page_group.name}')`,
+      },
+      '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
+    ),
+    div({ class: "dropdown-divider" }),
+    post_dropdown_item(
+      `/page_groupedit/delete/${page_group.id}`,
+      '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
+      req,
+      true,
+      page_group.name
+    ),
+  ]);
+
 /**
  * @param {object} page
  * @param {object} req
@@ -327,9 +357,9 @@ const page_dropdown = (page, req) =>
  * @param {object} req
  * @returns {Form}
  */
-const editPageRoleForm = (page, roles, req) =>
+const editPageRoleForm = (page, roles, req, isGroup) =>
   editRoleForm({
-    url: `/pageedit/setrole/${page.id}`,
+    url: `/${!isGroup ? "page" : "page_group"}edit/setrole/${page.id}`,
     current_role: page.min_role,
     roles,
     req,
@@ -380,6 +410,38 @@ const getPageList = (rows, roles, req, { tagId, domId, showList } = {}) => {
   );
 };
 
+/**
+ * @param {*} rows
+ * @param {*} roles
+ * @param {*} req
+ */
+const getPageGroupList = (rows, roles, req) => {
+  return mkTable(
+    [
+      {
+        label: req.__("Name"),
+        key: (r) => link(`/page/${r.name}`, r.name),
+      },
+      {
+        label: req.__("Role to access"),
+        key: (row) => editPageRoleForm(row, roles, req, true),
+      },
+      {
+        label: req.__("Edit"),
+        key: (r) => link(`/page_groupedit/${r.name}`, req.__("Edit")),
+      },
+      {
+        label: "",
+        key: (r) => page_group_dropdown(r, req),
+      },
+    ],
+    rows,
+    {
+      hover: true,
+    }
+  );
+};
+
 const getTriggerList = (triggers, req, { tagId, domId, showList } = {}) => {
   const base_url = get_base_url(req);
   return mkTable(
@@ -450,5 +512,6 @@ module.exports = {
   setTableRefs,
   viewsList,
   getPageList,
+  getPageGroupList,
   getTriggerList,
 };

package/routes/index.js

@@ -7,6 +7,8 @@ const field = require("./fields");
 const list = require("./list");
 const view = require("./view");
 const page = require("./page");
+const pagegroup = require("./page_group");
+const pagegroupedit = require("./page_groupedit");
 const pageedit = require("./pageedit");
 const search = require("./search");
 const files = require("./files");
@@ -58,6 +60,8 @@ module.exports =
     app.use("/models", models);
     app.use("/settings", settings);
     app.use("/pageedit", pageedit);
+    app.use("/page_group", pagegroup);
+    app.use("/page_groupedit", pagegroupedit);
     app.use("/actions", actions);
     app.use("/eventlog", eventlog);
     app.use("/library", library);

package/routes/packs.js

@@ -12,6 +12,7 @@ const Form = require("@saltcorn/data/models/form");
 const View = require("@saltcorn/data/models/view");
 const Plugin = require("@saltcorn/data/models/plugin");
 const Page = require("@saltcorn/data/models/page");
+const PageGroup = require("@saltcorn/data/models/page_group");
 const Tag = require("@saltcorn/data/models/tag");
 const EventLog = require("@saltcorn/data/models/eventlog");
 const Model = require("@saltcorn/data/models/model");
@@ -24,6 +25,7 @@ const {
   view_pack,
   plugin_pack,
   page_pack,
+  page_group_pack,
   role_pack,
   library_pack,
   trigger_pack,
@@ -86,6 +88,12 @@ router.get(
       name: `page.${t.name}`,
       type: "Bool",
     }));
+    const pageGroups = await PageGroup.find({});
+    const pageGroupFields = pageGroups.map((t) => ({
+      label: `${t.name} page group`,
+      name: `page_group.${t.name}`,
+      type: "Bool",
+    }));
     const libs = await Library.find({});
     const libFields = libs.map((l) => ({
       label: `${l.name} library item`,
@@ -157,6 +165,7 @@ router.get(
         ...viewFields,
         ...pluginFields,
         ...pageFields,
+        ...pageGroupFields,
         ...trigFields,
         ...roleFields,
         ...libFields,
@@ -205,6 +214,7 @@ router.post(
       views: [],
       plugins: [],
       pages: [],
+      page_groups: [],
       roles: [],
       library: [],
       triggers: [],
@@ -228,6 +238,9 @@ router.post(
         case "page":
           pack.pages.push(await page_pack(name));
           break;
+        case "page_group":
+          pack.page_groups.push(await page_group_pack(name));
+          break;
         case "library":
           pack.library.push(await library_pack(name));
           break;