@saltcorn/server 0.9.4-beta.9 → 0.9.5-beta.0

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"));
   });

package/wrapper.js

@@ -185,17 +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` },
   ];
+  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", "") });