@saltcorn/server 0.8.6-beta.1 → 0.8.6-beta.10

package/routes/view.js

@@ -42,7 +42,7 @@ router.get(
     const { viewname } = req.params;
     const query = { ...req.query };
     const view = await View.findOne({ name: viewname });
-    const role = req.user && req.user.id ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 100;
     const state = getState();
     state.log(3, `Route /view/${viewname} user=${req.user?.id}`);
     if (!view) {
@@ -157,7 +157,7 @@ router.post(
   "/:viewname/:route",
   error_catcher(async (req, res) => {
     const { viewname, route } = req.params;
-    const role = req.user && req.user.id ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 100;
     const state = getState();
     state.log(
       3,
@@ -191,7 +191,7 @@ router.post(
   setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
-    const role = req.user && req.user.id ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 100;
     const query = { ...req.query };
     const state = getState();
     state.log(3, `Route /view/${viewname} POST user=${req.user?.id}`);

package/routes/viewedit.js

@@ -8,16 +8,9 @@
 const Router = require("express-promise-router");
 
 const { renderForm, renderBuilder, alert } = require("@saltcorn/markup");
-const {
-  p,
-  a,
-  div,
-  script,
-  text,
-  domReady,
-  code,
-  pre,
-} = require("@saltcorn/markup/tags");
+const tags = require("@saltcorn/markup/tags");
+const { p, a, div, script, text, domReady, code, pre, tbody, tr, th, td } =
+  tags;
 
 const { getState } = require("@saltcorn/data/db/state");
 const { isAdmin, error_catcher, addOnDoneRedirect } = require("./utils.js");
@@ -30,6 +23,7 @@ const Workflow = require("@saltcorn/data/models/workflow");
 const User = require("@saltcorn/data/models/user");
 const Page = require("@saltcorn/data/models/page");
 const db = require("@saltcorn/data/db");
+const { sleep } = require("@saltcorn/data/utils");
 
 const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
 
@@ -305,6 +299,7 @@ router.get(
     const roles = await User.get_roles();
     const pages = await Page.find();
     const form = await viewForm(req, tableOptions, roles, pages, viewrow);
+    const inbound_connected = await viewrow.inbound_connected_objects();
     form.hidden("id");
     res.sendWrap(req.__(`Edit view`), {
       above: [
@@ -328,7 +323,6 @@ router.get(
         },
         {
           type: "card",
-
           title: req.__("View configuration"),
           contents: {
             type: "tabs",
@@ -340,6 +334,24 @@ router.get(
             titles: [req.__("Show configuration object")],
           },
         },
+        {
+          type: "card",
+          title: req.__("Connected views"),
+          contents: tags.table(
+            tbody(
+              tr(
+                th({ class: "me-2" }, req.__("Embedded in")),
+                td(
+                  inbound_connected.embeddedViews.map((v) => v.name).join(", ")
+                )
+              ),
+              tr(
+                th({ class: "me-2" }, req.__("Linked from")),
+                td(inbound_connected.linkedViews.map((v) => v.name).join(", "))
+              )
+            )
+          ),
+        },
       ],
     });
   })
@@ -458,6 +470,7 @@ router.post(
           else v.configuration = {};
           //console.log(v);
           await View.create(v);
+          await sleep(500); // Allow other workers to load this view
         }
         res.redirect(
           addOnDoneRedirect(
@@ -480,14 +493,22 @@ router.post(
  * @param {object} res
  * @returns {void}
  */
-const respondWorkflow = (view, wf, wfres, req, res) => {
+const respondWorkflow = (view, wf, wfres, req, res, table) => {
   const wrap = (contents, noCard, previewURL) => ({
     above: [
       {
         type: "breadcrumbs",
         crumbs: [
           { text: req.__("Views"), href: "/viewedit" },
-          { href: `/view/${view.name}`, text: view.name },
+          {
+            href: `/view/${view.name}`,
+            text: view.name,
+            postLinkText: `[${view.viewtemplate}${
+              table
+                ? ` on ${a({ href: `/table/` + table.name }, table.name)}`
+                : ""
+            }]`,
+          },
           { workflow: wf, step: wfres },
         ],
       },
@@ -571,6 +592,9 @@ router.get(
     (view.configuration?.columns || []).forEach((c) => {
       c._columndef = JSON.stringify(c);
     });
+    let table;
+    if (view.table_id) table = Table.findOne({ id: view.table_id });
+    if (view.exttable_name) table = Table.findOne({ name: view.exttable_name });
     const configFlow = await view.get_config_flow(req);
     const hasConfig =
       view.configuration && Object.keys(view.configuration).length > 0;
@@ -585,7 +609,7 @@ router.get(
       },
       req
     );
-    respondWorkflow(view, configFlow, wfres, req, res);
+    respondWorkflow(view, configFlow, wfres, req, res, table);
   })
 );
 
@@ -604,7 +628,11 @@ router.post(
     const view = await View.findOne({ name });
     const configFlow = await view.get_config_flow(req);
     const wfres = await configFlow.run(req.body, req);
-    respondWorkflow(view, configFlow, wfres, req, res);
+
+    let table;
+    if (view.table_id) table = Table.findOne({ id: view.table_id });
+    if (view.exttable_name) table = Table.findOne({ name: view.exttable_name });
+    respondWorkflow(view, configFlow, wfres, req, res, table);
   })
 );
 

package/tests/admin.test.js

@@ -29,7 +29,7 @@ beforeAll(async () => {
   await File.from_req_files(
     { mimetype: "image/png", name: "rick.png", mv, size: 245752 },
     1,
-    4
+    40
   );
 });
 
@@ -272,7 +272,7 @@ describe("menu editor", () => {
         url: "",
         type: "View",
         label: "BarMenu",
-        min_role: "10",
+        min_role: "100",
         pagename: null,
         viewname: "dqwdw",
       },
@@ -321,32 +321,32 @@ describe("roleadmin", () => {
     await request(app)
       .post("/roleadmin/edit")
       .set("Cookie", loginCookie)
-      .send("id=5")
+      .send("id=50")
       .send("role=muppets")
       .expect(toRedirect("/roleadmin"));
     const roles = await User.get_roles();
-    expect(roles).toContainEqual({ id: 5, role: "muppets" });
+    expect(roles).toContainEqual({ id: 50, role: "muppets" });
   });
   it("show set layout for role", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .post("/roleadmin/setrolelayout/5")
+      .post("/roleadmin/setrolelayout/50")
       .set("Cookie", loginCookie)
       .send("layout=tabler")
       .expect(toRedirect("/roleadmin"));
     const roles = await User.get_roles();
-    expect(roles).toContainEqual({ id: 5, role: "muppets" });
+    expect(roles).toContainEqual({ id: 50, role: "muppets" });
   });
   it("show delete role", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .post("/roleadmin/delete/5")
+      .post("/roleadmin/delete/50")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/roleadmin"));
     const roles = await User.get_roles();
-    expect(roles).not.toContainEqual({ id: 5, role: "muppets" });
+    expect(roles).not.toContainEqual({ id: 50, role: "muppets" });
   });
 });
 /**

package/tests/auth.test.js

@@ -205,7 +205,7 @@ describe("user admin", () => {
       .post("/useradmin/save")
       .send("email=staff2@foo.com")
       .send("password=fideRGE54lio")
-      .send("role_id=8")
+      .send("role_id=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/useradmin"));
   });
@@ -223,7 +223,7 @@ describe("user admin", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     const user = await User.findOne({ email: "staff2@foo.com" });
-    expect(user.role_id).toBe(8);
+    expect(user.role_id).toBe(80);
     await request(app)
       .get(`/useradmin/${user.id}`)
       .set("Cookie", loginCookie)
@@ -238,11 +238,11 @@ describe("user admin", () => {
       .post("/useradmin/save")
       .send("email=staff2@foo.com")
       .send(`id=${user.id}`)
-      .send("role_id=4")
+      .send("role_id=40")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/useradmin"));
     const edituser = await User.findOne({ email: "staff2@foo.com" });
-    expect(edituser.role_id).toBe(4);
+    expect(edituser.role_id).toBe(40);
   });
   it("tries to create new user with existing email", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -251,7 +251,7 @@ describe("user admin", () => {
       .post("/useradmin/save")
       .send("email=staff2@foo.com")
       .send("password=fideRGE54lio")
-      .send("role_id=8")
+      .send("role_id=80")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/useradmin"));
     const editusers = await User.find({ email: "staff2@foo.com" });
@@ -342,7 +342,7 @@ describe("User fields", () => {
       configuration: {
         columns: [
           { type: "Field", fieldview: "edit", field_name: "height" },
-          { type: "Action", minRole: 10, action_name: "Save" },
+          { type: "Action", minRole: 100, action_name: "Save" },
         ],
         layout: {
           above: [
@@ -368,7 +368,7 @@ describe("User fields", () => {
               ],
             },
             { type: "line_break" },
-            { type: "action", minRole: 10, action_name: "Save" },
+            { type: "action", minRole: 100, action_name: "Save" },
           ],
         },
       },
@@ -466,7 +466,7 @@ describe("signup with custom login form", () => {
             {
               type: "action",
               rndid: "63f01b",
-              minRole: 10,
+              minRole: 100,
               isFormula: {},
               action_name: "Login",
               action_label: "Login",
@@ -476,7 +476,7 @@ describe("signup with custom login form", () => {
             {
               type: "action",
               rndid: "45dd57",
-              minRole: 10,
+              minRole: 100,
               isFormula: {},
               action_name: "Login with github",
               configuration: {},
@@ -489,7 +489,7 @@ describe("signup with custom login form", () => {
           {
             type: "Action",
             rndid: "63f01b",
-            minRole: 10,
+            minRole: 100,
             isFormula: {},
             action_name: "Login",
             action_label: "Login",
@@ -499,7 +499,7 @@ describe("signup with custom login form", () => {
           {
             type: "Action",
             rndid: "45dd57",
-            minRole: 10,
+            minRole: 100,
             isFormula: {},
             action_name: "Login with github",
             configuration: {},
@@ -573,7 +573,7 @@ describe("signup with custom login form", () => {
             {
               type: "action",
               rndid: "63f01b",
-              minRole: 10,
+              minRole: 100,
               isFormula: {},
               action_name: "Sign up",
               action_style: "btn-primary",
@@ -588,7 +588,7 @@ describe("signup with custom login form", () => {
           {
             type: "Action",
             rndid: "63f01b",
-            minRole: 10,
+            minRole: 100,
             isFormula: {},
             action_name: "Sign up",
             action_style: "btn-primary",

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,108 @@
+const request = require("supertest");
+const getApp = require("../app");
+const {
+  getUserLoginCookie,
+  getAdminLoginCookie,
+  resetToFixtures,
+  notAuthorized,
+  respondJsonWith,
+} = require("../auth/testhelp");
+const db = require("@saltcorn/data/db");
+
+const Table = require("@saltcorn/data/models/table");
+
+beforeAll(async () => {
+  await resetToFixtures();
+});
+afterAll(db.close);
+
+describe("Synchronise with mobile offline data", () => {
+  it("not permitted", async () => {
+    if (!db.isSQLite) {
+      const patients = Table.findOne({ name: "patients" });
+      const books = Table.findOne({ name: "books" });
+      const patientsBefore = await patients.countRows();
+      const booksBefore = await books.countRows();
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getUserLoginCookie();
+      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,
+              },
+            ],
+            books: [
+              {
+                id: 3,
+                author: "foo",
+                pages: 20,
+                publisher: 1,
+              },
+            ],
+          },
+        })
+        .expect(notAuthorized);
+      const patientsAfter = await patients.countRows();
+      const booksAfter = await books.countRows();
+      expect(patientsAfter).toBe(patientsBefore);
+      expect(booksAfter).toBe(booksBefore);
+    }
+  });
+
+  it("upload patients and books", async () => {
+    if (!db.isSQLite) {
+      const patients = Table.findOne({ name: "patients" });
+      const books = Table.findOne({ name: "books" });
+      const patientsBefore = await patients.countRows();
+      const booksBefore = await books.countRows();
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      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,
+              },
+            ],
+            books: [
+              {
+                id: 3,
+                author: "foo",
+                pages: 20,
+                publisher: 1,
+              },
+            ],
+          },
+        })
+        .expect(respondJsonWith(200, ({ success }) => success));
+      const patientsAfter = await patients.countRows();
+      const booksAfter = await books.countRows();
+      expect(patientsAfter).toBe(patientsBefore + 2);
+      expect(booksAfter).toBe(booksBefore + 1);
+      expect((await patients.getRows({ id: 84 })).length).toBe(0);
+    }
+  });
+});

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