@saltcorn/server 0.8.5-beta.3 → 0.8.5-beta.5

package/tests/crud.test.js

@@ -13,6 +13,7 @@ const {
 const db = require("@saltcorn/data/db");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
+const Notification = require("@saltcorn/data/models/notification");
 const User = require("@saltcorn/data/models/user");
 const reset = require("@saltcorn/data/db/reset_schema");
 
@@ -42,6 +43,58 @@ describe("standard edit form", () => {
   });
 });
 
+describe("notifications", () => {
+  it("show empty notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("No notifications"));
+  });
+  it("no unread notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications/count-unread")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((n) => n === 0));
+  });
+  it("add notification", async () => {
+    const user = await User.findOne({ role_id: 4 });
+    await Notification.create({
+      user_id: user.id,
+      title: "This is a staff announcement",
+      body: "Will a member of staff please proceed to the checkout area",
+      link: "https://www.sainsburys.co.uk/",
+    });
+  });
+  it("one unread notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications/count-unread")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((n) => n === 1));
+  });
+  it("show new notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("This is a staff announcement"))
+      .expect(toInclude("unread-notify"));
+  });
+  it("no unread notifications", async () => {
+    const loginCookie = await getStaffLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/notifications/count-unread")
+      .set("Cookie", loginCookie)
+      .expect(succeedJsonWith((n) => n === 0));
+  });
+});
 describe("homepage", () => {
   it("shows to admin", async () => {
     const loginCookie = await getAdminLoginCookie();

package/tests/plugins.test.js

@@ -318,7 +318,7 @@ describe("config endpoints", () => {
       .send("site_name=FooSiteName")
       .send("multitenancy_enabled=on")
       .set("Cookie", loginCookie)
-      .expect(toRedirect("/admin"));
+      .expect(toRedirect("/admin/"));
     await request(app)
       .get("/admin")
       .set("Cookie", loginCookie)

package/tests/table.test.js

@@ -5,11 +5,13 @@ const Field = require("@saltcorn/data/models/field");
 const {
   getStaffLoginCookie,
   getAdminLoginCookie,
+  getUserLoginCookie,
   itShouldRedirectUnauthToLogin,
   toInclude,
   toNotInclude,
   toRedirect,
   resetToFixtures,
+  succeedJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const User = require("@saltcorn/data/models/user");
@@ -262,7 +264,22 @@ describe("deletion to table with row ownership", () => {
     const row = await persons.insertRow({ name: "something", owner: user.id });
     expect(await persons.countRows()).toBe(1);
     const loginCookie = await getStaffLoginCookie();
+    const uloginCookie = await getUserLoginCookie();
     const app = await getApp({ disableCsrf: true });
+    await request(app).get("/api/owned").expect(401);
+    await request(app)
+      .get("/api/owned")
+      .set("Cookie", loginCookie)
+      .expect(
+        succeedJsonWith(
+          (rows) => rows.length == 1 && rows[0].name === "something"
+        )
+      );
+    await request(app)
+      .get("/api/owned")
+      .set("Cookie", uloginCookie)
+      .expect(succeedJsonWith((rows) => rows.length == 0));
+
     await request(app)
       .post("/delete/owned/" + row)
       .expect(toRedirect("/list/owned"));

package/wrapper.js

@@ -5,7 +5,7 @@
 const { getState } = require("@saltcorn/data/db/state");
 const { get_extra_menu } = require("@saltcorn/data/web-mobile-commons");
 //const db = require("@saltcorn/data/db");
-const { h3, div, small } = require("@saltcorn/markup/tags");
+const { h3, div, small, domReady } = require("@saltcorn/markup/tags");
 const { renderForm, link } = require("@saltcorn/markup");
 const renderLayout = require("@saltcorn/markup/layout");
 /**
@@ -30,6 +30,7 @@ const get_menu = (req) => {
   const role = (req.user || {}).role_id || 10;
 
   const allow_signup = state.getConfig("allow_signup");
+  const notification_in_menu = state.getConfig("notification_in_menu");
   const login_menu = state.getConfig("login_menu");
   const locale = req.getLocale();
   const __ = (s) => state.i18n.__({ phrase: s, locale }) || s;
@@ -42,6 +43,16 @@ const get_menu = (req) => {
           isUser: true,
           subitems: [
             { label: small((req.user.email || "").split("@")[0]) },
+            ...(notification_in_menu
+              ? [
+                  {
+                    label: req.__("Notifications"),
+                    icon: "far fa-bell",
+                    class: "notify-menu-item",
+                    link: "/notifications",
+                  },
+                ]
+              : []),
             {
               label: req.__("User Settings"),
               icon: "fas fa-user-cog",
@@ -58,10 +69,22 @@ const get_menu = (req) => {
       ]
     : [
         ...(allow_signup
-          ? [{ link: "/auth/signup", label: req.__("Sign up") }]
+          ? [
+              {
+                link: "/auth/signup",
+                icon: "fas fa-user-plus",
+                label: req.__("Sign up"),
+              },
+            ]
           : []),
         ...(login_menu
-          ? [{ link: "/auth/login", label: req.__("Login") }]
+          ? [
+              {
+                link: "/auth/login",
+                icon: "fas fa-sign-in-alt",
+                label: req.__("Login"),
+              },
+            ]
           : []),
       ];
   // const schema = db.getTenantSchema();
@@ -141,6 +164,8 @@ const get_menu = (req) => {
 const get_headers = (req, version_tag, description, extras = []) => {
   const state = getState();
   const favicon = state.getConfig("favicon_id", null);
+  const notification_in_menu = state.getConfig("notification_in_menu");
+  const pwa_enabled = state.getConfig("pwa_enabled");
 
   const iconHeader = favicon
     ? [
@@ -175,6 +200,18 @@ const get_headers = (req, version_tag, description, extras = []) => {
   for (const hs of Object.values(state.headers)) {
     state_headers.push(...hs);
   }
+  if (notification_in_menu)
+    from_cfg.push({ scriptBody: domReady(`check_saltcorn_notifications()`) });
+  if (pwa_enabled) {
+    from_cfg.push({
+      headerTag: `<link rel="manifest" href="/notifications/manifest.json">`,
+    });
+    from_cfg.push({
+      scriptBody: `if('serviceWorker' in navigator) {
+        navigator.serviceWorker.register('/serviceworker.js', { scope: '/' });
+      }`,
+    });
+  }
   return [
     ...stdHeaders,
     ...iconHeader,