@saltcorn/server 0.8.6-beta.2 → 0.8.6-beta.3

package/tests/crud.test.js

@@ -61,7 +61,7 @@ describe("notifications", () => {
       .expect(succeedJsonWith((n) => n === 0));
   });
   it("add notification", async () => {
-    const user = await User.findOne({ role_id: 4 });
+    const user = await User.findOne({ role_id: 40 });
     await Notification.create({
       user_id: user.id,
       title: "This is a staff announcement",
@@ -170,7 +170,7 @@ describe("homepage", () => {
       name: "anewview",
       viewtemplate: "List",
       configuration: { columns: [], default_state: { foo: "bar" } },
-      min_role: 10,
+      min_role: 100,
     });
     const loginCookie = await getAdminLoginCookie();
 

package/tests/files.test.js

@@ -33,7 +33,7 @@ beforeAll(async () => {
       size: 245752,
     },
     1,
-    4
+    40
   );
   await File.from_req_files(
     {
@@ -45,7 +45,7 @@ beforeAll(async () => {
       size: 219422,
     },
     1,
-    10
+    100
   );
 });
 afterAll(db.close);
@@ -121,7 +121,7 @@ describe("files admin", () => {
     await request(app)
       .post("/files/setrole/rick.png")
       .set("Cookie", loginCookie)
-      .send("role=10")
+      .send("role=100")
       .expect(toRedirect("/files?dir=."));
   });
   it("serve file to public after role change", async () => {
@@ -150,7 +150,7 @@ describe("files admin", () => {
 describe("files edit", () => {
   it("creates table and view", async () => {
     const table = await Table.create("thefiletable");
-    await table.update({ min_role_read: 8, min_role_write: 8 });
+    await table.update({ min_role_read: 80, min_role_write: 80 });
     await Field.create({
       table,
       name: "first_name",
@@ -171,7 +171,7 @@ describe("files edit", () => {
         columns: [
           { type: "Field", field_name: "mugshot", fieldview: "upload" },
           { type: "Field", field_name: "first_name", fieldview: "edit" },
-          { type: "Action", action_name: "Save", minRole: 10 },
+          { type: "Action", action_name: "Save", minRole: 100 },
         ],
         layout: {
           above: [
@@ -188,7 +188,7 @@ describe("files edit", () => {
           ],
         },
       },
-      min_role: 10,
+      min_role: 100,
     });
   });
   it("shows edit view", async () => {

package/tests/kittens.test.js

@@ -24,8 +24,8 @@ const pack = {
   tables: [
     {
       name: "cats",
-      min_role_read: 10,
-      min_role_write: 10,
+      min_role_read: 100,
+      min_role_write: 100,
       versioned: false,
       fields: [
         {
@@ -75,7 +75,7 @@ const pack = {
         latitude_field: "lat",
         longtitude_field: "long",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -100,7 +100,7 @@ const pack = {
         ],
         viewname: "ShowName",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -115,7 +115,7 @@ const pack = {
         reload_on_drag: false,
         view_to_create: "",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -130,7 +130,7 @@ const pack = {
         reload_on_drag: false,
         view_to_create: "",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -151,7 +151,7 @@ const pack = {
         columns: [],
         viewname: "NestedShow",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -165,7 +165,7 @@ const pack = {
         latitude_field: "lat",
         longtitude_field: "long",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -180,7 +180,7 @@ const pack = {
         reload_on_drag: false,
         view_to_create: "",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -201,7 +201,7 @@ const pack = {
         columns: [],
         viewname: "NestedShowNoPop",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
     {
@@ -216,7 +216,7 @@ const pack = {
         reload_on_drag: false,
         view_to_create: "",
       },
-      min_role: 10,
+      min_role: 100,
       table: "cats",
     },
   ],

package/tests/page.test.js

@@ -44,7 +44,7 @@ describe("page create", () => {
     const loginCookie = await getAdminLoginCookie();
     await request(app)
       .post("/pageedit/edit-properties")
-      .send("name=whales&title=Whales&description=about+whales&min_role=10")
+      .send("name=whales&title=Whales&description=about+whales&min_role=100")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/pageedit/edit/whales"));
   });
@@ -76,7 +76,7 @@ describe("page action", () => {
       name: "pagewithaction",
       title: "",
       description: "",
-      min_role: 10,
+      min_role: 100,
       id: 2,
       layout: {
         widths: [6, 6],
@@ -85,7 +85,7 @@ describe("page action", () => {
           {
             type: "action",
             rndid: "56f3ac",
-            minRole: 10,
+            minRole: 100,
             isFormula: {},
             action_icon: "far fa-angry",
             action_name: "run_js_code",
@@ -142,7 +142,7 @@ describe("pageedit", () => {
       .send("name=a_page")
       .send("title=mytitle")
       .send("description=mydescript")
-      .send("min_role=8")
+      .send("min_role=80")
       .send("id=1")
       .expect(toRedirect("/pageedit/"));
   });
@@ -153,7 +153,6 @@ describe("pageedit", () => {
       .get("/pageedit/edit/a_page")
       .set("Cookie", loginCookie)
       .expect(toInclude("<script>builder.renderBuilder"));
-
   });
 
   it("sets root page", async () => {

package/tests/sync.test.js

@@ -0,0 +1,187 @@
+const request = require("supertest");
+const getApp = require("../app");
+const {
+  getUserLoginCookie,
+  getStaffLoginCookie,
+  getAdminLoginCookie,
+  resetToFixtures,
+} = require("../auth/testhelp");
+const db = require("@saltcorn/data/db");
+
+const Table = require("@saltcorn/data/models/table");
+
+beforeAll(async () => {
+  await resetToFixtures();
+});
+afterAll(db.close);
+
+describe("Load offline data", () => {
+  it("public request", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const resp = await request(app).get("/sync/table_data");
+    for (const [k, v] of Object.entries(resp._body)) {
+      expect(v.rows.length).toBe(k === "books" ? 2 : 0);
+    }
+  });
+
+  it("user request", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getUserLoginCookie();
+    const resp = await request(app)
+      .get("/sync/table_data")
+      .set("Cookie", loginCookie);
+    const data = resp._body;
+    expect(data.patients.rows.length).toBe(0);
+  });
+
+  it("admin request", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    const resp = await request(app)
+      .get("/sync/table_data")
+      .set("Cookie", loginCookie);
+    const data = resp._body;
+    expect(data.patients.rows.length).toBe(2);
+  });
+});
+
+describe("Synchronise with mobile offline data", () => {
+  if (!db.isSQLite) {
+    it("not permitted", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getUserLoginCookie();
+      const uploadResp = await request(app)
+        .post("/sync/table_data")
+        .set("Cookie", loginCookie)
+        .send({
+          data: {
+            patients: [
+              {
+                name: "Brad Pitt",
+                favbook: 2,
+                parent: 1,
+              },
+              {
+                id: 84,
+                name: "Pitt Brad",
+                favbook: 2,
+                parent: 1,
+              },
+            ],
+          },
+        });
+      const translateIds = uploadResp._body.translateIds;
+      expect(translateIds).toBeDefined();
+      expect(Object.keys(translateIds).length).toBe(0);
+
+      const adminCookie = await getAdminLoginCookie();
+      const downloadResp = await request(app)
+        .get("/sync/table_data")
+        .set("Cookie", adminCookie);
+      const data = downloadResp._body;
+      expect(data.patients.rows.length).toBe(2);
+    });
+
+    it("upload patients and books", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const adminCookie = await getAdminLoginCookie();
+      const uploadResp = await request(app)
+        .post("/sync/table_data")
+        .set("Cookie", adminCookie)
+        .send({
+          data: {
+            patients: [
+              {
+                name: "Brad Pitt",
+                favbook: 2,
+                parent: 1,
+              },
+              {
+                id: 84, // will be translated to 3
+                name: "Pitt Brad",
+                favbook: 2,
+                parent: 1,
+              },
+            ],
+            books: [
+              {
+                id: 3, // stays at 3
+                author: "foo",
+                pages: 20,
+                publisher: 1,
+              },
+            ],
+          },
+        });
+      const translateIds = uploadResp._body.translateIds;
+      expect(translateIds).toBeDefined();
+      expect(Object.keys(translateIds).length).toBe(1);
+      expect(translateIds.patients.length).toBe(1);
+      expect(translateIds.patients[0]).toEqual({ from: 84, to: 3 });
+
+      const staffCookie = await getStaffLoginCookie();
+      const downloadResp = await request(app)
+        .get("/sync/table_data")
+        .set("Cookie", staffCookie);
+      const data = downloadResp._body;
+      expect(data.patients.rows.length).toBe(3);
+      expect(data.books.rows.length).toBe(3);
+    });
+
+    it("upload with ownership_field", async () => {
+      const messagesTbl = Table.findOne({ name: "messages" });
+      const userField = messagesTbl
+        .getFields()
+        .find((field) => field.name === "user");
+      await messagesTbl.update({
+        min_role_read: 1,
+        min_role_write: 1,
+        ownership_field_id: userField.id,
+      });
+      const staffMsgId = await db.insert("messages", {
+        content: "message from staff",
+        user: 2,
+        room: 1,
+      });
+      const userMsgId = await db.insert("messages", {
+        content: "message from user",
+        user: 3,
+        room: 1,
+      });
+
+      const app = await getApp({ disableCsrf: true });
+      const userCookie = await getUserLoginCookie();
+      const uploadResp = await request(app)
+        .post("/sync/table_data")
+        .set("Cookie", userCookie)
+        .send({
+          data: {
+            messages: [
+              {
+                id: staffMsgId, // will be skipped
+                user: 3,
+                room: 1,
+                content: "offline change",
+              },
+              {
+                id: userMsgId, // will be updated because user is the owner
+                user: 2,
+                room: 1,
+                content: "offline change",
+              },
+            ],
+          },
+        });
+      const translateIds = uploadResp._body.translateIds;
+      expect(translateIds).toBeDefined();
+      expect(Object.keys(translateIds).length).toBe(0);
+      // load the admin data
+      const adminCookie = await getAdminLoginCookie();
+      const resp = await request(app)
+        .get("/sync/table_data")
+        .set("Cookie", adminCookie);
+      const data = resp._body;
+      expect(data.messages.rows.length).toBe(4);
+    });
+  }
+});

package/tests/table.test.js

@@ -35,7 +35,7 @@ describe("Table Endpoints", () => {
       .post("/table/")
       .send("name=mypostedtable")
       .set("Cookie", loginCookie)
-      .expect(toRedirect("/table/10"));
+      .expect(toRedirect("/table/16"));
     await request(app)
       .get("/table/10")
       .set("Cookie", loginCookie)
@@ -98,19 +98,19 @@ describe("Table Endpoints", () => {
     await request(app)
       .post(`/table`)
       .set("Cookie", loginCookie)
-      .send("min_role_read=10&min_role_write=1&id=" + tbl.id)
+      .send("min_role_read=100&min_role_write=1&id=" + tbl.id)
       .expect(toRedirect(`/table/${tbl.id}`));
     await request(app).get(`/table/${tbl.id}`).set("Cookie", loginCookie);
     await request(app)
       .post(`/table`)
       .set("Cookie", loginCookie)
-      .send("min_role_read=10&min_role_write=1&id=" + tbl.id)
+      .send("min_role_read=100&min_role_write=1&id=" + tbl.id)
       .expect(toRedirect(`/table/${tbl.id}`));
     await request(app).get(`/table/${tbl.id}`).set("Cookie", loginCookie);
     await request(app)
       .post(`/table`)
       .set("Cookie", loginCookie)
-      .send("min_role_read=10&min_role_write=1&id=" + tbl.id)
+      .send("min_role_read=100&min_role_write=1&id=" + tbl.id)
       .expect(toRedirect(`/table/${tbl.id}`));
     await request(app).get(`/table/${tbl.id}`).set("Cookie", loginCookie);
   });
@@ -121,7 +121,7 @@ describe("Table Endpoints", () => {
     await request(app)
       .post(`/table`)
       .set("Cookie", loginCookie)
-      .send("min_role_read=8&name=exttab&external=on")
+      .send("min_role_read=80&name=exttab&external=on")
       .expect(toRedirect(`/table/exttab`));
   });
   it("should download csv ", async () => {
@@ -151,7 +151,7 @@ Pencil, 0.5,2, t`;
       .set("Cookie", loginCookie)
       .field("name", "expenses")
       .attach("file", Buffer.from(csv, "utf-8"))
-      .expect(toRedirect("/table/11"));
+      .expect(toRedirect("/table/17"));
   });
   it("should upload csv to existing table", async () => {
     const csv = `author,Pages

package/tests/tenant.test.js

@@ -27,7 +27,7 @@ describe("tenant routes", () => {
   if (!db.isSQLite) {
     it("shows create form", async () => {
       db.enable_multi_tenant();
-      await getState().setConfig("role_to_create_tenant", "10");
+      await getState().setConfig("role_to_create_tenant", "100");
 
       const app = await getApp({ disableCsrf: true });
       await request(app).get("/tenant/create").expect(toInclude("subdomain"));
@@ -43,7 +43,7 @@ describe("tenant routes", () => {
 
     it("creates tenant with capital letter", async () => {
       db.enable_multi_tenant();
-      await getState().setConfig("role_to_create_tenant", "10");
+      await getState().setConfig("role_to_create_tenant", "100");
 
       const app = await getApp({ disableCsrf: true });
       await request(app)
@@ -55,7 +55,7 @@ describe("tenant routes", () => {
 
     it("rejects existing tenant", async () => {
       db.enable_multi_tenant();
-      await getState().setConfig("role_to_create_tenant", "10");
+      await getState().setConfig("role_to_create_tenant", "100");
       const app = await getApp({ disableCsrf: true });
       await request(app)
         .post("/tenant/create")

package/tests/view.test.js

@@ -99,7 +99,7 @@ describe("view with routes", () => {
       name: "aviewwithroutes",
       viewtemplate: "ViewWithRoutes",
       configuration: {},
-      min_role: 8,
+      min_role: 80,
     });
   });
   it("should redirect if not auth", async () => {
@@ -177,3 +177,130 @@ describe("render view with slug", () => {
       .expect(toInclude(`Herman Melville`));
   });
 });
+
+describe("inbound relations", () => {
+  it("view with inbound relation", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/show_user_with_blog_posts_feed?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+
+    await request(app)
+      .get("/view/show_user_with_blog_posts_feed?id=2")
+      .set("Cookie", loginCookie)
+      .expect(toNotInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toNotInclude("Content of post CPost C"));
+
+    await request(app)
+      .get("/view/show_user_with_blog_posts_feed?id=3")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+  });
+
+  it("view without inbound relation", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/show_user_with_independent_feed?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+    await request(app)
+      .get("/view/show_user_with_independent_feed?id=2")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+    await request(app)
+      .get("/view/show_user_with_independent_feed?id=3")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+  });
+
+  it("inbound relation from query", async () => {
+    const queryObj = {
+      relation:
+        ".users.user_interested_in_topic$user.topic.blog_in_topic$topic.post",
+      srcId: 1,
+    };
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+
+    queryObj.srcId = 2;
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toNotInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toNotInclude("Content of post CPost C"));
+
+    queryObj.srcId = 3;
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+  });
+
+  it("inbound relation with levels from query", async () => {
+    const queryObj = {
+      relation:
+        ".users.user_interested_in_topic$user.topic.inbound_inbound$topic.bp_inbound.post",
+      srcId: 1,
+    };
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Content of post APost A"))
+      .expect(toNotInclude("Content of post BPost B"))
+      .expect(toInclude("Content of post CPost C"));
+
+    queryObj.srcId = 2;
+    await request(app)
+      .get(
+        `/view/blog_posts_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toNotInclude("Content of post APost A"))
+      .expect(toNotInclude("Content of post BPost B"))
+      .expect(toNotInclude("Content of post CPost C"));
+  });
+});

package/tests/viewedit.test.js

@@ -53,7 +53,7 @@ describe("viewedit edit endpoint", () => {
       .send("table_name=books")
       .send("id=" + v.id)
       .send("name=authorlist")
-      .send("min_role=10")
+      .send("min_role=100")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/authorlist"));
   });
@@ -95,7 +95,7 @@ describe("viewedit new List", () => {
       .send("viewtemplate=List")
       .send("table_name=books")
       .send("name=mybooklist")
-      .send("min_role=8")
+      .send("min_role=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/mybooklist"));
     //expect(res.text.includes("View configuration")).toBe(true);
@@ -212,7 +212,7 @@ describe("viewedit new List with one field", () => {
       .send("viewtemplate=List")
       .send("table_name=books")
       .send("name=mybooklist1")
-      .send("min_role=8")
+      .send("min_role=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/mybooklist1"));
     //expect(res.text.includes("View configuration")).toBe(true);
@@ -334,7 +334,7 @@ describe("viewedit new Show", () => {
       .send("viewtemplate=Show")
       .send("table_name=books")
       .send("name=mybook")
-      .send("min_role=8")
+      .send("min_role=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit/config/mybook"));
     //expect(res.text.includes("View configuration")).toBe(true);

package/wrapper.js

@@ -27,7 +27,7 @@ const getFlashes = (req) =>
 const get_menu = (req) => {
   const isAuth = req.user && req.user.id;
   const state = getState();
-  const role = (req.user || {}).role_id || 10;
+  const role = (req.user || {}).role_id || 100;
 
   const allow_signup = state.getConfig("allow_signup");
   const notification_in_menu = state.getConfig("notification_in_menu");
@@ -192,6 +192,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
     { css: `/static_assets/${version_tag}/saltcorn.css` },
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },
     { script: `/static_assets/${version_tag}/saltcorn.js` },
+    { script: `/static_assets/${version_tag}/dayjs.min.js` },
   ];
   let from_cfg = [];
   if (state.getConfig("page_custom_css", ""))
@@ -245,7 +246,7 @@ module.exports = (version_tag) =>
    * @param next
    */
   function (req, res, next) {
-    const role = (req.user || {}).role_id || 10;
+    const role = (req.user || {}).role_id || 100;
 
     res.sendAuthWrap = function (title, form, authLinks, ...html) {
       const state = getState();