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

package/routes/pageedit.js

@@ -9,7 +9,8 @@ const View = require("@saltcorn/data/models/view");
 const Field = require("@saltcorn/data/models/field");
 const Table = require("@saltcorn/data/models/table");
 const Page = require("@saltcorn/data/models/page");
-const { div, a, iframe, script } = require("@saltcorn/markup/tags");
+const PageGroup = require("@saltcorn/data/models/page_group");
+const { div, a, iframe, script, p } = require("@saltcorn/markup/tags");
 const { getState } = require("@saltcorn/data/db/state");
 const User = require("@saltcorn/data/models/user");
 const Workflow = require("@saltcorn/data/models/workflow");
@@ -19,13 +20,14 @@ const Trigger = require("@saltcorn/data/models/trigger");
 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 } = require("./common_lists");
+const { getPageList, getPageGroupList } = require("./common_lists");
 
 const {
   isAdmin,
   error_catcher,
   addOnDoneRedirect,
   is_relative_url,
+  setRole,
 } = require("./utils.js");
 const { asyncMap } = require("@saltcorn/data/utils");
 const {
@@ -61,6 +63,7 @@ module.exports = router;
 const pagePropertiesForm = async (req, isNew) => {
   const roles = await User.get_roles();
   const pages = (await Page.find()).map((p) => p.name);
+  const groups = (await PageGroup.find()).map((g) => g.name);
   const htmlFiles = await File.find(
     {
       mime_super: "text",
@@ -86,6 +89,8 @@ const pagePropertiesForm = async (req, isNew) => {
           if (s.length < 1) return req.__("Missing name");
           if (pages.includes(s) && isNew)
             return req.__("A page with this name already exists");
+          if (groups.includes(s) && isNew)
+            return req.__("A page group with this name already exists");
         },
         sublabel: req.__("A short name that will be in your URL"),
         type: "String",
@@ -148,6 +153,7 @@ const pagePropertiesForm = async (req, isNew) => {
 const pageBuilderData = async (req, context) => {
   const views = await View.find();
   const pages = await Page.find();
+  const page_groups = (await PageGroup.find()).map((g) => ({ name: g.name }));
   const images = await File.find({ mime_super: "image" });
   images.forEach((im) => (im.location = im.path_to_serve));
   const roles = await User.get_roles();
@@ -216,6 +222,7 @@ const pageBuilderData = async (req, context) => {
     views,
     images,
     pages,
+    page_groups,
     actions,
     builtInActions: ["GoBack"],
     library,
@@ -278,6 +285,10 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const pages = await Page.find({}, { orderBy: "name", nocase: true });
+    const pageGroups = await PageGroup.find(
+      {},
+      { orderBy: "name", nocase: true }
+    );
     const roles = await User.get_roles();
 
     res.sendWrap(req.__("Pages"), {
@@ -301,6 +312,27 @@ router.get(
             )
           ),
         },
+        {
+          type: "card",
+          title: req.__("Your page groups"),
+          contents: div(
+            p(
+              req.__(
+                "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."
+              )
+            ),
+            getPageGroupList(pageGroups, roles, req),
+            a(
+              {
+                href: `/page_groupedit/new`,
+                class: "btn btn-primary",
+              },
+              req.__("Create page group")
+            )
+          ),
+        },
         {
           type: "card",
           title: req.__("Root pages"),
@@ -352,7 +384,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
-    const page = await Page.findOne({ name: pagename });
+    const page = Page.findOne({ name: pagename });
     if (!page) {
       req.flash("error", req.__(`Page %s not found`, pagename));
       res.redirect(`/pageedit`);
@@ -699,7 +731,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const page = await Page.findOne({ id });
+    const page = Page.findOne({ id });
     await add_to_menu({
       label: page.name,
       type: "Page",
@@ -748,19 +780,6 @@ router.post(
   "/setrole/:id",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
-    const role = req.body.role;
-    await Page.update(+id, { min_role: role });
-    const page = await Page.findOne({ id });
-    const roles = await User.get_roles();
-    const roleRow = roles.find((r) => r.id === +role);
-    const message =
-      roleRow && page
-        ? req.__(`Minimum role for %s updated to %s`, page.name, roleRow.role)
-        : req.__(`Minimum role updated`);
-    if (!req.xhr) {
-      req.flash("success", message);
-      res.redirect("/pageedit");
-    } else res.json({ okay: true, responseText: message });
+    await setRole(req, res, Page);
   })
 );

package/routes/utils.js

@@ -19,6 +19,7 @@ const is = require("contractis/is");
 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 si = require("systeminformation");
 const {
   config_fields_form,
@@ -415,6 +416,23 @@ const sendHtmlFile = async (req, res, file) => {
   }
 };
 
+const setRole = async (req, res, model) => {
+  const { id } = req.params;
+  const role = req.body.role;
+  await model.update(+id, { min_role: role });
+  const page = model.findOne({ id });
+  const roles = await User.get_roles();
+  const roleRow = roles.find((r) => r.id === +role);
+  const message =
+    roleRow && page
+      ? req.__(`Minimum role for %s updated to %s`, page.name, roleRow.role)
+      : req.__(`Minimum role updated`);
+  if (!req.xhr) {
+    req.flash("success", message);
+    res.redirect("/pageedit");
+  } else res.json({ okay: true, responseText: message });
+};
+
 module.exports = {
   sqlsanitize,
   csrfField,
@@ -432,4 +450,5 @@ module.exports = {
   get_sys_info,
   admin_config_route,
   sendHtmlFile,
+  setRole,
 };

package/tests/admin.test.js

@@ -625,6 +625,7 @@ describe("clear all page", () => {
       .set("Cookie", loginCookie)
       .send("tables=on")
       .send("views=on")
+      .send("page_groups=on")
       .send("pages=on")
       .send("files=on")
       .send("users=on")

package/tests/page_group.test.js

@@ -0,0 +1,366 @@
+const request = require("supertest");
+const getApp = require("../app");
+const {
+  getAdminLoginCookie,
+  prepScreenInfoCookie,
+  prepUserAgent,
+  toRedirect,
+  toInclude,
+  notFound,
+  toNotInclude,
+  resetToFixtures,
+} = require("../auth/testhelp");
+const db = require("@saltcorn/data/db");
+const Page = require("@saltcorn/data/models/page");
+const PageGroup = require("@saltcorn/data/models/page_group");
+const PageGroupMember = require("@saltcorn/data/models/page_group_member");
+
+beforeAll(async () => {
+  await resetToFixtures();
+});
+afterAll(db.close);
+
+describe("edit Page groups", () => {
+  it("shows the create new page group form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/page_groupedit/new")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("New"))
+      .expect(toInclude(`action="/page_groupedit/edit-properties"`))
+      .expect(toInclude("Save"));
+  });
+
+  let pageGroupName = "new page group";
+  let nameAfterUpdate = "updated page group";
+  it("creates a new page group", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/page_groupedit/edit-properties")
+      .set("Cookie", loginCookie)
+      .send({ name: pageGroupName })
+      .expect(
+        toRedirect(`/page_groupedit/${encodeURIComponent(pageGroupName)}`)
+      );
+    const fromDb = PageGroup.findOne({ name: pageGroupName });
+    expect(fromDb).toBeTruthy();
+  });
+
+  it("shows the page group editor", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/page_groupedit/${encodeURIComponent(pageGroupName)}`)
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Members"))
+      .expect(toInclude("Edit group properties"))
+      .expect(toNotInclude("Save"))
+      .expect(toInclude(pageGroupName));
+  });
+
+  it("updates the page group properties", async () => {
+    const oldGroup = PageGroup.findOne({ name: pageGroupName });
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    const resp = await request(app)
+      .post("/page_groupedit/edit-properties")
+      .set("Cookie", loginCookie)
+      .send({ id: oldGroup.id, name: nameAfterUpdate, min_role: 100 });
+    expect(resp.statusCode).toEqual(200);
+    expect(resp._body.row).toEqual({
+      name: nameAfterUpdate,
+      description: null,
+      min_role: 100,
+    });
+  });
+
+  it("shows the add-member form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    const res = await request(app)
+      .get(`/page_groupedit/add-member/${nameAfterUpdate}`)
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Page to be served"))
+      .expect(toInclude("Eligible Formula"))
+      .expect(toInclude("Cancel"))
+      .expect(toInclude("Save"));
+  });
+
+  it("adds members to the page group", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post(`/page_groupedit/add-member/${nameAfterUpdate}`)
+      .set("Cookie", loginCookie)
+      .send({ page_name: "a_page", eligible_formula: "true" })
+      .expect(
+        toRedirect(`/page_groupedit/${encodeURIComponent(nameAfterUpdate)}`)
+      );
+    await request(app)
+      .post(`/page_groupedit/add-member/${nameAfterUpdate}`)
+      .set("Cookie", loginCookie)
+      .send({ page_name: "page_with_html_file", eligible_formula: "true" })
+      .expect(
+        toRedirect(`/page_groupedit/${encodeURIComponent(nameAfterUpdate)}`)
+      );
+  });
+
+  it("shows members in the page group editor", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/page_groupedit/${encodeURIComponent(nameAfterUpdate)}`)
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Members"))
+      .expect(toInclude("a_page"))
+      .expect(toInclude("page_with_html_file"))
+      .expect(toInclude("Edit group properties"))
+      .expect(toNotInclude("Save"))
+      .expect(toInclude(nameAfterUpdate));
+  });
+
+  it("updates members of the page group", async () => {
+    const page = Page.findOne({ name: "a_page" });
+    const group = PageGroup.findOne({ name: nameAfterUpdate });
+    const members = await PageGroupMember.find({
+      page_group_id: group.id,
+      page_id: page.id,
+    });
+    expect(members.length).toBe(1);
+    const member = members[0];
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post(`/page_groupedit/edit-member/${member.id}`)
+      .set("Cookie", loginCookie)
+      .send({ id: member.id, page_name: "a_page", eligible_formula: "1>0" })
+      .expect(
+        toRedirect(`/page_groupedit/${encodeURIComponent(nameAfterUpdate)}`)
+      );
+    await request(app)
+      .get(`/page_groupedit/edit-member/${member.id}`)
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Page to be served"))
+      .expect(toInclude("Eligible Formula"))
+      .expect(toInclude("Cancel"))
+      .expect(toInclude("Save"))
+      .expect(toInclude("1>0"));
+  });
+
+  it("removes members from the page group", async () => {
+    const page = Page.findOne({ name: "a_page" });
+    const group = PageGroup.findOne({ name: nameAfterUpdate });
+    const members = await PageGroupMember.find({
+      page_group_id: group.id,
+      page_id: page.id,
+    });
+    expect(members.length).toBe(1);
+    const member = members[0];
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post(`/page_groupedit/remove-member/${member.id}`)
+      .set("Cookie", loginCookie)
+      .expect(toRedirect(`/page_groupedit/${encodeURIComponent(group.name)}`));
+    await request(app)
+      .get(`/page_groupedit/${encodeURIComponent(nameAfterUpdate)}`)
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Members"))
+      .expect(toNotInclude(page.name));
+  });
+
+  it("deletes the page group", async () => {
+    const group = PageGroup.findOne({ name: nameAfterUpdate });
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post(`/page_groupedit/delete/${group.id}`)
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/pageedit"));
+  });
+});
+
+describe("run page group", () => {
+  it("width and height with Cookie", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/page/page_group`)
+      .set("Cookie", `${loginCookie}; ${prepScreenInfoCookie(912, 1360)}`)
+      .set("accept-language", "en")
+      .expect(toInclude("Surface Pro 7"))
+      .expect(toNotInclude("iPhone XR"))
+      .expect(toNotInclude("iPhone SE"));
+    await request(app)
+      .get(`/page/page_group`)
+      .set("Cookie", `${loginCookie}; ${prepScreenInfoCookie(414, 896)};`)
+      .set("accept-language", "en")
+      .expect(toNotInclude("Surface Pro 7"))
+      .expect(toInclude("iPhone XR"))
+      .expect(toNotInclude("iPhone SE"));
+    await request(app)
+      .get(`/page/page_group`)
+      .set("Cookie", `${loginCookie}; ${prepScreenInfoCookie(370, 660)};`)
+      .set("accept-language", "en")
+      .expect(toNotInclude("Surface Pro 7"))
+      .expect(toNotInclude("iPhone XR"))
+      .expect(toInclude("iPhone SE"));
+  });
+
+  it("locale mismatch", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/page/page_group`)
+      .set("Cookie", `${loginCookie}; ${prepScreenInfoCookie(912, 1360)}`)
+      .set("accept-language", "es")
+      .expect(notFound);
+    await request(app)
+      .get(`/page/page_group`)
+      .set("Cookie", `${loginCookie}; ${prepScreenInfoCookie(414, 896)};`)
+      .set("accept-language", "es")
+      .expect(notFound);
+    await request(app)
+      .get(`/page/page_group`)
+      .set("Cookie", `${loginCookie}; ${prepScreenInfoCookie(370, 660)};`)
+      .set("accept-language", "es")
+      .expect(notFound);
+  });
+
+  it("width an height without Cookie", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/page/page_group`)
+      .set("Cookie", `${loginCookie}`)
+      .set("User-Agent", prepUserAgent())
+      .expect(toInclude("Laptop"))
+      .expect(toNotInclude("Surface Pro 7"))
+      .expect(toNotInclude("iPhone XR"))
+      .expect(toNotInclude("iPhone SE"));
+  });
+});
+
+describe("page group settings", () => {
+  it("shows the settings page", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/page_group/settings")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("User Agent screen infos"))
+      .expect(toInclude("web"))
+      .expect(toNotInclude("mobile"))
+      .expect(toInclude("Add screen info"))
+      .expect(toInclude("Page Group settings"))
+      .expect(toInclude("Missing screen info"))
+      .expect(toInclude(`value="guess_from_user_agent" selected`))
+      .expect(toInclude("reload"));
+  });
+
+  it("loads the add-screen info form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/page_group/settings/add-device")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Add screen info"));
+  });
+
+  it("adds a screen-info", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/page_group/settings/add-device")
+      .set("Cookie", loginCookie)
+      .send({
+        device: "mobile",
+        width: "100", // check type Number ?
+        height: "200",
+        innerWidth: "100",
+        innerHeight: "200",
+      })
+      .expect(toRedirect("/page_group/settings"));
+
+    await request(app)
+      .get("/page_group/settings")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("web"))
+      .expect(toInclude("mobile"));
+  });
+
+  it("removes a screen-info", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/page_group/settings/remove-device/mobile")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/page_group/settings"));
+
+    await request(app)
+      .get("/page_group/settings")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("web"))
+      .expect(toNotInclude("mobile"));
+  });
+
+  it("loads the edit-screen info form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/page_group/settings/edit-device/web")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Edit screen info"))
+      .expect(toInclude("web"))
+      .expect(toInclude(`value="1920"`))
+      .expect(toInclude(`value="1000"`))
+      .expect(toInclude(`value="1848"`))
+      .expect(toInclude(`value="980"`));
+  });
+
+  it("edits a screen-info", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/page_group/settings/edit-device/web")
+      .set("Cookie", loginCookie)
+      .send({
+        device: "web",
+        width: "1000",
+        height: "201",
+        innerWidth: "100",
+        innerHeight: "202",
+      })
+      .expect(toRedirect("/page_group/settings"));
+
+    await request(app)
+      .get("/page_group/settings/edit-device/web")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Edit screen info"))
+      .expect(toInclude("web"))
+      .expect(toInclude(`value="1000"`))
+      .expect(toInclude(`value="201"`))
+      .expect(toInclude(`value="100"`))
+      .expect(toInclude(`value="202"`));
+  });
+
+  it("edits the missing_screen_info_strategy", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/page_group/settings/config")
+      .set("Cookie", loginCookie)
+      .send({
+        missing_screen_info_strategy: "reload",
+      })
+      .expect(toRedirect("/page_group/settings"));
+
+    await request(app)
+      .get("/page_group/settings")
+      .set("Cookie", loginCookie)
+      .expect(toInclude(`value="reload" selected`))
+      .expect(toInclude("guess_from_user_agent"));
+  });
+});