@saltcorn/server 0.9.0-beta.1 → 0.9.0-beta.11

package/tests/admin.test.js

@@ -568,11 +568,11 @@ describe("tags", () => {
       .post("/tag")
       .set("Cookie", loginCookie)
       .send("name=MyNewTestTag")
-      .expect(toRedirect("/tag/1?show_list=tables"));
+      .expect(toRedirect("/tag/2?show_list=tables"));
   });
 
   itShouldIncludeTextForAdmin("/tag", "MyNewTestTag");
-  itShouldIncludeTextForAdmin("/tag/1", "MyNewTestTag");
+  itShouldIncludeTextForAdmin("/tag/2", "MyNewTestTag");
   itShouldIncludeTextForAdmin("/tag-entries/add/tables/1", "Add entries");
   itShouldIncludeTextForAdmin("/tag-entries/add/pages/1", "Add entries");
   itShouldIncludeTextForAdmin("/tag-entries/add/views/1", "Add entries");

package/tests/sync.test.js

@@ -5,11 +5,15 @@ const {
   getAdminLoginCookie,
   resetToFixtures,
   respondJsonWith,
+  toRedirect,
+  toInclude,
+  toSucceed,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const { sleep } = require("@saltcorn/data/tests/mocks");
 
 const Table = require("@saltcorn/data/models/table");
+const TableConstraint = require("@saltcorn/data/models/table_constraints");
 const Field = require("@saltcorn/data/models/field");
 const User = require("@saltcorn/data/models/user");
 
@@ -181,6 +185,52 @@ describe("load remote insert/updates", () => {
       }
     });
 
+    it("sync table with capitals", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      // create table
+      await request(app)
+        .post("/table")
+        .set("Cookie", loginCookie)
+        .send(`name=${encodeURIComponent("Table with capitals")}`)
+        .expect(toRedirect("/table/16"));
+      // add a field
+      await request(app)
+        .post("/field/")
+        .send("stepName=Basic properties")
+        .send("name=string_field")
+        .send("label=StringField")
+        .send("type=String")
+        .send(
+          `contextEnc=${encodeURIComponent(JSON.stringify({ table_id: 16 }))}`
+        )
+        .set("Cookie", loginCookie)
+        .expect(toInclude("options"));
+      // init sync_info table
+      await request(app)
+        .post("/table")
+        .send("id=16")
+        .send("has_sync_info=on")
+        .set("Cookie", loginCookie)
+        .expect(toRedirect("/table/16"));
+      const dbTime = await db.time();
+
+      // call load changes
+      await request(app)
+        .post("/sync/load_changes")
+        .set("Cookie", loginCookie)
+        .send({
+          loadUntil: (await db.time()).valueOf(),
+          syncInfos: {
+            "Table with capitals": {
+              maxLoadedId: 0,
+              syncFrom: dbTime.valueOf(),
+            },
+          },
+        })
+        .expect(toSucceed());
+    });
+
     it("load sync not authorized", async () => {
       const app = await getApp({ disableCsrf: true });
       const loginCookie = await getUserLoginCookie();
@@ -300,8 +350,9 @@ describe("Upload changes", () => {
         .get(`/sync/upload_finished?dir_name=${encodeURIComponent(syncDir)}`)
         .set("Cookie", loginCookie);
       expect(resp.status).toBe(200);
-      const { finished, translatedIds, error } = resp._body;
-      if (finished) return translatedIds ? translatedIds : error;
+      const { finished, translatedIds, uniqueConflicts, error } = resp._body;
+      if (finished)
+        return translatedIds ? { translatedIds, uniqueConflicts } : error;
       await sleep(1000);
     }
     return null;
@@ -352,7 +403,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       expect(translatedIds).toEqual({
@@ -365,6 +416,89 @@ describe("Upload changes", () => {
       });
     });
 
+    it("handles inserts with TableConstraint conflicts", async () => {
+      const books = Table.findOne({ name: "books" });
+      const oldCount = await books.countRows();
+      // unique constraint for author + pages
+      const constraint = await TableConstraint.create({
+        table: books,
+        type: "Unique",
+        configuration: {
+          fields: ["author", "pages"],
+        },
+      });
+
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      const resp = await doUpload(app, loginCookie, new Date().valueOf(), {
+        books: {
+          inserts: [
+            {
+              author: "Herman Melville",
+              pages: 967,
+              publisher: 1,
+            },
+            {
+              author: "Leo Tolstoy",
+              pages: "728",
+              publisher: 2,
+            },
+          ],
+        },
+      });
+
+      expect(resp.status).toBe(200);
+      const { syncDir } = resp._body;
+      const { uniqueConflicts } = await getResult(app, loginCookie, syncDir);
+      await constraint.delete();
+      await cleanSyncDir(app, loginCookie, syncDir);
+      expect(uniqueConflicts).toBeDefined();
+      expect(uniqueConflicts).toEqual({
+        books: [
+          { id: 1, author: "Herman Melville", pages: 967, publisher: null },
+          { id: 2, author: "Leo Tolstoy", pages: 728, publisher: 1 },
+        ],
+      });
+      const newCount = await books.countRows();
+      expect(newCount).toBe(oldCount);
+    });
+
+    it("denies updates with TableConstraint conflicts", async () => {
+      const books = Table.findOne({ name: "books" });
+      const oldCount = await books.countRows();
+      // unique constraint for author + pages
+      const constraint = await TableConstraint.create({
+        table: books,
+        type: "Unique",
+        configuration: {
+          fields: ["author", "pages"],
+        },
+      });
+
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      const resp = await doUpload(app, loginCookie, new Date().valueOf(), {
+        books: {
+          updates: [
+            {
+              id: 2,
+              author: "Herman Melville",
+              pages: 967,
+            },
+          ],
+        },
+      });
+      expect(resp.status).toBe(200);
+      const { syncDir } = resp._body;
+      const error = await getResult(app, loginCookie, syncDir);
+      await constraint.delete();
+      await cleanSyncDir(app, loginCookie, syncDir);
+      expect(error).toBeDefined();
+      expect(error).toEqual({
+        message: "Duplicate value for unique field: author_pages",
+      });
+    });
+
     it("update with translation", async () => {
       const app = await getApp({ disableCsrf: true });
       const loginCookie = await getAdminLoginCookie();
@@ -389,7 +523,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       expect(translatedIds).toEqual({
@@ -427,7 +561,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       const afterDelete = await books.getRows();
@@ -471,7 +605,7 @@ describe("Upload changes", () => {
       });
       expect(resp.status).toBe(200);
       const { syncDir } = resp._body;
-      const translatedIds = await getResult(app, loginCookie, syncDir);
+      const { translatedIds } = await getResult(app, loginCookie, syncDir);
       await cleanSyncDir(app, loginCookie, syncDir);
       expect(translatedIds).toBeDefined();
       const afterDelete = await books.getRows();

package/tests/viewedit.test.js

@@ -396,7 +396,7 @@ describe("viewedit new Show", () => {
   it("delete new view", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
-    const id = (await View.findOne({ name: "mybook" })).id;
+    const id = View.findOne({ name: "mybook" }).id;
 
     await request(app)
       .post("/viewedit/delete/" + id)
@@ -404,6 +404,249 @@ describe("viewedit new Show", () => {
       .expect(toRedirect("/viewedit"));
   });
 });
+
+describe("viewedit new Edit", () => {
+  // create two edit views for 'books'
+  // the first has inputs for all books-fields
+  //   => 'Fixed and blocked fields (step 2 / max 3)' won't show up
+  // the second has no input for 'pages'
+  //   => 'Fixed and blocked fields (step 2 / max 3)' shows up
+  //       and the configration gets a fixed property
+  const colsWithoutPages = [
+    {
+      type: "Field",
+      fieldview: "edit",
+      field_name: "author",
+    },
+    {
+      type: "Field",
+      fieldview: "select",
+      field_name: "publisher",
+    },
+    {
+      type: "Action",
+      rndid: "f61f38",
+      minRole: 100,
+      action_name: "Save",
+      action_style: "btn-primary",
+    },
+  ];
+  const colsWithPages = [
+    {
+      type: "Field",
+      fieldview: "edit",
+      field_name: "pages",
+    },
+    ...colsWithoutPages,
+  ];
+
+  const layoutWithoutPages = {
+    above: [
+      {
+        type: "field",
+        fieldview: "edit",
+        field_name: "author",
+      },
+
+      {
+        type: "field",
+        fieldview: "select",
+        field_name: "publisher",
+      },
+      {
+        type: "action",
+        rndid: "f61f38",
+        minRole: 100,
+        action_name: "Save",
+        action_style: "btn-primary",
+      },
+    ],
+  };
+  const layoutWithPages = {
+    above: [
+      {
+        type: "field",
+        fieldview: "edit",
+        field_name: "pages",
+      },
+      ...layoutWithoutPages.above,
+    ],
+  };
+
+  it("submits new view", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/save")
+      .send("viewtemplate=Edit")
+      .send("table_name=books")
+      .send("name=edit_mybook")
+      .send("min_role=100")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit/config/edit_mybook"));
+    // edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/save")
+      .send("viewtemplate=Edit")
+      .send("table_name=books")
+      .send("name=edit_mybook_without_pages")
+      .send("min_role=100")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit/config/edit_mybook_without_pages"));
+  });
+
+  it("saves new view layout", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+    const app = await getApp({ disableCsrf: true });
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/config/edit_mybook")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook",
+            })
+          )
+      )
+      .send("stepName=Layout")
+      .send("columns=" + encodeURIComponent(JSON.stringify(colsWithPages)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layoutWithPages)))
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Edit options (step 3 / 3)"));
+    // edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/config/edit_mybook_without_pages")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook_without_pages",
+            })
+          )
+      )
+      .send("stepName=Layout")
+      .send("columns=" + encodeURIComponent(JSON.stringify(colsWithoutPages)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layoutWithoutPages)))
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Fixed and blocked fields (step 2 / max 3)"));
+  });
+
+  it("saves new view fixed fields", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+    const app = await getApp({ disableCsrf: true });
+    // only edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/config/edit_mybook_without_pages")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook_without_pages",
+              layout: layoutWithoutPages,
+              columns: colsWithoutPages,
+            })
+          )
+      )
+      .send("stepName=Fixed+and+blocked+fields")
+      .send("pages=2")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Edit options (step 3 / 3)"));
+  });
+
+  it("saves view when done", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+    const app = await getApp({ disableCsrf: true });
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/config/edit_mybook")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook",
+              layout: layoutWithPages,
+              columns: colsWithPages,
+            })
+          )
+      )
+      .send("stepName=Edit+options")
+      .send("destination_type=View")
+      .send("view_when_done=authorlist")
+      .send("auto_save=on")
+      .send("split_paste=on")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+    const viewWithPages = View.findOne({ name: "edit_mybook" });
+    expect(viewWithPages.configuration.layout).toEqual(layoutWithPages);
+    expect(viewWithPages.configuration.columns).toEqual(colsWithPages);
+    // edit_mybook_without_pages
+    await request(app)
+      .post("/viewedit/config/edit_mybook_without_pages")
+      .send(
+        "contextEnc=" +
+          encodeURIComponent(
+            JSON.stringify({
+              table_id: table.id,
+              viewname: "edit_mybook_without_pages",
+              layout: layoutWithoutPages,
+              columns: colsWithoutPages,
+              fixed: {
+                pages: 22,
+                _block_pages: false,
+              },
+            })
+          )
+      )
+      .send("stepName=Edit+options")
+      .send("destination_type=View")
+      .send("view_when_done=authorlist")
+      .send("auto_save=on")
+      .send("split_paste=on")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+
+    const viewWithoutPages = View.findOne({
+      name: "edit_mybook_without_pages",
+    });
+    expect(viewWithoutPages.configuration.fixed).toEqual({
+      pages: 22,
+      _block_pages: false,
+    });
+    expect(viewWithoutPages.configuration.layout).toEqual(layoutWithoutPages);
+    expect(viewWithoutPages.configuration.columns).toEqual(colsWithoutPages);
+  });
+
+  it("deletes new view", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    const idA = View.findOne({ name: "edit_mybook" }).id;
+    // edit_mybook
+    await request(app)
+      .post("/viewedit/delete/" + idA)
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+    // edit_mybook_without_pages
+    const idB = View.findOne({ name: "edit_mybook_without_pages" }).id;
+    await request(app)
+      .post("/viewedit/delete/" + idB)
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit"));
+  });
+});
+
+describe("viewedit new Edit with fixed fields", () => {
+  it("submit new view", async () => {});
+});
+
 describe("Library", () => {
   it("should save new from builder", async () => {
     const loginCookie = await getAdminLoginCookie();

package/wrapper.js

@@ -187,7 +187,9 @@ const get_headers = (req, version_tag, description, extras = []) => {
     : [];
   const stdHeaders = [
     {
-      headerTag: `<script>var _sc_globalCsrf = "${req.csrfToken()}"; var _sc_version_tag = "${version_tag}";</script>`,
+      headerTag: `<script>var _sc_loglevel = ${
+        state.logLevel
+      }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}";</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },
@@ -309,6 +311,7 @@ module.exports = (version_tag) =>
       const alerts = getFlashes(req);
       const state = getState();
       const layout = state.getLayout(req.user);
+      const no_menu = opts.no_menu;
 
       if (req.xhr) {
         const renderToHtml = layout.renderBody
@@ -335,8 +338,8 @@ module.exports = (version_tag) =>
       res.send(
         layout.wrap({
           title,
-          brand: get_brand(state),
-          menu: get_menu(req),
+          brand: no_menu ? undefined : get_brand(state),
+          menu: no_menu ? undefined : get_menu(req),
           currentUrl,
           originalUrl: req.originalUrl,