@saltcorn/server 0.9.4-beta.2 → 0.9.4-beta.21

package/tests/admin.test.js

@@ -382,13 +382,13 @@ describe("actions", () => {
       .send("table_id=2")
       .send("name=mynewaction")
       .send("when_trigger=Insert")
-      .expect(toRedirect("/actions/configure/1"));
+      .expect(toRedirect("/actions/configure/3"));
   });
   it("show edit", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .get("/actions/edit/1")
+      .get("/actions/edit/3")
       .set("Cookie", loginCookie)
       .expect(toInclude("Edit trigger"))
       .expect(toInclude("run_js_code"));
@@ -397,7 +397,7 @@ describe("actions", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .get("/actions/configure/1")
+      .get("/actions/configure/3")
       .set("Cookie", loginCookie)
       .expect(toInclude("Configure trigger"))
       .expect(toInclude("Code"));
@@ -406,7 +406,7 @@ describe("actions", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .post("/actions/configure/1")
+      .post("/actions/configure/3")
       .set("Cookie", loginCookie)
       .send("code=console.log(12345678)")
       .expect(toRedirect("/actions/"));
@@ -415,7 +415,7 @@ describe("actions", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .get("/actions/testrun/1")
+      .get("/actions/testrun/3")
       .set("Cookie", loginCookie)
       .expect(toInclude("12345678"));
   });
@@ -423,7 +423,7 @@ describe("actions", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .post("/actions/configure/1")
+      .post("/actions/configure/3")
       .set("Cookie", loginCookie)
       .send("code=1")
       .expect(toRedirect("/actions/"));
@@ -432,7 +432,7 @@ describe("actions", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .get("/actions/testrun/1")
+      .get("/actions/testrun/2")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/actions/"));
   });
@@ -446,9 +446,9 @@ describe("actions", () => {
       .send("action=run_js_code")
       .send("when_trigger=API+call")
       .send("min_role=1")
-      .expect(toRedirect("/actions/configure/2"));
+      .expect(toRedirect("/actions/configure/4"));
     await request(app)
-      .post("/actions/configure/2")
+      .post("/actions/configure/4")
       .set("Cookie", loginCookie)
       .send("code=return 27")
       .expect(toRedirect("/actions/"));
@@ -463,7 +463,7 @@ describe("actions", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .post("/actions/delete/1")
+      .post("/actions/delete/3")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/actions/"));
   });
@@ -555,7 +555,7 @@ describe("diagram", () => {
 });
 
 /**
- * Diagram tests
+ * Tags tests
  */
 describe("tags", () => {
   itShouldRedirectUnauthToLogin("/tag");
@@ -604,6 +604,12 @@ describe("tags", () => {
       .expect(toRedirect("/tag"));
   });
 });
+
+describe("server logs viewer", () => {
+  itShouldRedirectUnauthToLogin("/admin/dev/logs_viewer");
+  itShouldIncludeTextForAdmin("/admin/dev/logs_viewer", "Server logs");
+});
+
 /**
  * Clear all tests
  */

package/tests/page_group.test.js

@@ -73,6 +73,7 @@ describe("edit Page groups", () => {
       name: nameAfterUpdate,
       description: null,
       min_role: 100,
+      random_allocation: false,
     });
   });
 

package/tests/table.test.js

@@ -254,11 +254,7 @@ Gordon Kane, 218`;
       await request(app)
         .get("/table/")
         .set("Cookie", loginCookie)
-        .expect(
-          toInclude(
-            "cannot drop table books because other objects depend on it"
-          )
-        );
+        .expect(toInclude("has views. Delete these first"));
   });
 });
 describe("deletion to table with row ownership", () => {

package/tests/view.test.js

@@ -419,6 +419,10 @@ describe("update matching rows", () => {
     await field.update({ is_unique: false });
   });
 
+  afterAll(async () => {
+    await resetToFixtures();
+  });
+
   it("update matching books normal", async () => {
     const table = Table.findOne({ name: "books" });
     await updateMatchingRows({
@@ -755,7 +759,7 @@ describe("relation path to query and state", () => {
       .expect(toNotInclude("album B"));
   });
 
-  it("OneToOneSHow", async () => {
+  it("OneToOneShow", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
@@ -805,7 +809,7 @@ describe("relation path to query and state", () => {
       .expect(toInclude(`value="artist B"`));
   });
 
-  it("Parent", async () => {
+  it("Parent one layer", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
@@ -833,6 +837,28 @@ describe("relation path to query and state", () => {
       .expect(toInclude("No row selected"));
   });
 
+  it("Parent two layers", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/view/show_patient_with_publisher?id=2`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/show_publisher?.patients.favbook.publisher=2"))
+      // embedded show
+      .expect(toInclude("Michael Douglas"))
+      .expect(toInclude("AK Press"));
+
+    await request(app)
+      .get(`/view/show_patient_with_publisher?id=1`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/show_publisher?.patients.favbook.publisher=1"))
+      // embedded show
+      .expect(toInclude("Kirk Douglas"))
+      .expect(toInclude("No row selected"));
+  });
+
   it("RelationPath", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
@@ -873,11 +899,23 @@ describe("edit-in-edit with relation path and legacy", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     await request(app)
-      .get("/view/edit_department_with_edit_in_edit_legacy?id=1")
+      .get("/view/edit_department_with_edit_in_edit_relation_path?id=1")
       .set("Cookie", loginCookie)
       .expect(toInclude("add_repeater"));
-
-    // TODO post
+    await request(app)
+      .post("/view/edit_department_with_edit_in_edit_relation_path?id=1")
+      .set("Cookie", loginCookie)
+      .send({
+        department_0: "1",
+        department_1: "1",
+        id: "1",
+        id_0: "1",
+        id_1: "2",
+        name: "my_department",
+        name_0: "manager",
+        name_1: "my_employee",
+      })
+      .expect(toRedirect("/"));
   });
 
   it("edit-in-edit with relation path two layer", async () => {
@@ -887,10 +925,21 @@ describe("edit-in-edit with relation path and legacy", () => {
       .get("/view/edit_cover_with_edit_artist_on_album_rel_path?id=1")
       .set("Cookie", loginCookie)
       .expect(toInclude("add_repeater"));
-
-    // TODO post
+    await request(app)
+      .post("/view/edit_cover_with_edit_artist_on_album_rel_path?id=1")
+      .set("Cookie", loginCookie)
+      .send({
+        album_0: "1",
+        album_1: "1",
+        artist_0: "1",
+        artist_1: "2",
+        id: "1",
+        id_0: "1",
+        id_1: "3",
+        name: "green cover",
+      })
+      .expect(toRedirect("/"));
   });
-
   it("edit-in-edit legacy one layer", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
@@ -898,8 +947,20 @@ describe("edit-in-edit with relation path and legacy", () => {
       .get("/view/edit_department_with_edit_in_edit_legacy?id=1")
       .set("Cookie", loginCookie)
       .expect(toInclude("add_repeater"));
-
-    // TODO post
+    await request(app)
+      .post("/view/edit_department_with_edit_in_edit_legacy?id=1")
+      .set("Cookie", loginCookie)
+      .send({
+        department_0: "1",
+        department_1: "1",
+        id: "1",
+        id_0: "1",
+        id_1: "2",
+        name: "my_department",
+        name_0: "manager",
+        name_1: "my_employee",
+      })
+      .expect(toRedirect("/"));
   });
 
   it("edit-in-edit with relation path two layer", async () => {
@@ -909,8 +970,20 @@ describe("edit-in-edit with relation path and legacy", () => {
       .get("/view/edit_cover_with_edit_artist_on_album_rel_path?id=1")
       .set("Cookie", loginCookie)
       .expect(toInclude("add_repeater"));
-
-    // TODO post
+    await request(app)
+      .post("/view/edit_cover_with_edit_artist_on_album_rel_path?id=1")
+      .set("Cookie", loginCookie)
+      .send({
+        album_0: "1",
+        album_1: "1",
+        artist_0: "1",
+        artist_1: "2",
+        id: "1",
+        id_0: "1",
+        id_1: "3",
+        name: "green cover",
+      })
+      .expect(toRedirect("/"));
   });
 
   it("edit-in-edit legacy two layer", async () => {
@@ -920,8 +993,20 @@ describe("edit-in-edit with relation path and legacy", () => {
       .get("/view/edit_cover_with_edit_artist_on_album_legacy?id=1")
       .set("Cookie", loginCookie)
       .expect(toInclude("add_repeater"));
-
-    // TODO post
+    await request(app)
+      .post("/view/edit_cover_with_edit_artist_on_album_legacy?id=1")
+      .set("Cookie", loginCookie)
+      .send({
+        album_0: "1",
+        album_1: "1",
+        artist_0: "1",
+        artist_1: "2",
+        id: "1",
+        id_0: "1",
+        id_1: "3",
+        name: "green cover",
+      })
+      .expect(toRedirect("/"));
   });
 });
 
@@ -982,6 +1067,21 @@ describe("legacy relations with relation path", () => {
     await request(app)
       .get("/view/authoredit_with_show?id=1")
       .set("Cookie", loginCookie)
-      .expect(toInclude(["Herman Melville", "agi"]));
+      .expect(toInclude("Herman Melville"));
+  });
+
+  it("edit-view with independent list", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/authoredit_with_independent_list")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Herman Melville"))
+      .expect(toInclude("Delete"));
+    await request(app)
+      .get("/view/authoredit_with_independent_list?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Herman Melville"))
+      .expect(toInclude("Delete"));
   });
 });

package/tests/viewedit.test.js

@@ -78,6 +78,37 @@ describe("viewedit edit endpoint", () => {
 });
 
 describe("viewedit new List", () => {
+  const columns = [
+    { type: "Field", field_name: "author" },
+    { type: "Field", field_name: "pages" },
+  ];
+  const layout = {
+    besides: [
+      {
+        contents: {
+          type: "field",
+          fieldview: "as_text",
+          field_name: "author",
+          configuration: {},
+        },
+        alignment: "Default",
+        header_label: "Author",
+        col_width_units: "px",
+      },
+      {
+        contents: {
+          type: "field",
+          fieldview: "show",
+          field_name: "pages",
+          configuration: {},
+        },
+        alignment: "Default",
+        header_label: "Pages",
+        col_width_units: "px",
+      },
+    ],
+    list_columns: true,
+  };
   itShouldRedirectUnauthToLogin("/viewedit/new");
 
   it("show new view", async () => {
@@ -117,11 +148,8 @@ describe("viewedit new List", () => {
       .post("/viewedit/config/mybooklist")
       .send("contextEnc=" + ctx)
       .send("stepName=Columns")
-      .send("type_0=Field")
-      .send("field_name_0=author")
-      .send("type_1=Field")
-      .send("field_name_1=pages")
-      .send("create_view_display=Link")
+      .send("columns=" + encodeURIComponent(JSON.stringify(columns)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layout)))
       .set("Cookie", loginCookie)
       .expect(toInclude("Default state"));
   });
@@ -205,6 +233,23 @@ describe("viewedit new List", () => {
 });
 
 describe("viewedit new List with one field", () => {
+  const columns = [{ type: "Field", field_name: "author", state_field: "on" }];
+  const layout = {
+    besides: [
+      {
+        contents: {
+          type: "field",
+          fieldview: "as_text",
+          field_name: "author",
+          configuration: {},
+        },
+        alignment: "Default",
+        header_label: "Author",
+        col_width_units: "px",
+      },
+    ],
+    list_columns: true,
+  };
   it("submit new view", async () => {
     const loginCookie = await getAdminLoginCookie();
 
@@ -234,9 +279,8 @@ describe("viewedit new List with one field", () => {
       .post("/viewedit/config/mybooklist1")
       .send("contextEnc=" + ctx)
       .send("stepName=Columns")
-      .send("type_0=Field")
-      .send("field_name_0=author")
-      .send("create_view_display=Link")
+      .send("columns=" + encodeURIComponent(JSON.stringify(columns)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layout)))
       .set("Cookie", loginCookie)
       .expect(toInclude("Default state"));
   });
@@ -360,27 +404,6 @@ describe("viewedit new Show", () => {
       .send("columns=" + encodeURIComponent(JSON.stringify(columns)))
       .send("layout=" + encodeURIComponent(JSON.stringify(layout)))
       .set("Cookie", loginCookie)
-      .expect(toInclude("Set page title"));
-  });
-  it("save new view page title", async () => {
-    const loginCookie = await getAdminLoginCookie();
-    const table = Table.findOne({ name: "books" });
-
-    const ctx = encodeURIComponent(
-      JSON.stringify({
-        table_id: table.id,
-        viewname: "mybook",
-        layout,
-        columns,
-      })
-    );
-
-    const app = await getApp({ disableCsrf: true });
-    await request(app)
-      .post("/viewedit/config/mybook")
-      .send("contextEnc=" + ctx)
-      .send("stepName=Set+page+title")
-      .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit"));
   });
   it("should show new view", async () => {

package/wrapper.js

@@ -185,18 +185,25 @@ const get_headers = (req, version_tag, description, extras = []) => {
         },
       ]
     : [];
+  const locale = req.getLocale();
   const stdHeaders = [
     {
       headerTag: `<script>var _sc_loglevel = ${
         state.logLevel
-      }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}";</script>`,
+      }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}"${
+        locale ? `, _sc_locale = "${locale}"` : ""
+      };</script>`,
     },
     { 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` },
-    { script: `/static_assets/${version_tag}/relation_helpers.js` },
   ];
+  if (locale !== "en") {
+    stdHeaders.push({
+      script: `/static_assets/${version_tag}/dayjslocales/${locale}.js`,
+    });
+  }
   let from_cfg = [];
   if (state.getConfig("page_custom_css", ""))
     from_cfg.push({ style: state.getConfig("page_custom_css", "") });
@@ -350,7 +357,8 @@ module.exports = (version_tag) =>
           menu: no_menu ? undefined : get_menu(req),
           currentUrl,
           originalUrl: req.originalUrl,
-
+          requestFluidLayout:
+            typeof opts === "string" ? false : opts.requestFluidLayout,
           alerts,
           body: html.length === 1 ? html[0] : html.join(""),
           headers: get_headers(req, version_tag, opts.description, pageHeaders),