@saltcorn/server 0.7.2-beta.0 → 0.7.2-beta.4

package/routes/fields.js

@@ -181,6 +181,7 @@ const fieldFlow = (req) =>
       var attributes = context.attributes || {};
       attributes.default = context.default;
       attributes.summary_field = context.summary_field;
+      attributes.include_fts = context.include_fts;
       attributes.on_delete_cascade = context.on_delete_cascade;
       const {
         table_id,
@@ -370,6 +371,11 @@ const fieldFlow = (req) =>
               value: f.name,
               label: f.label,
             }));
+          const textfields = orderedFields
+            .filter(
+              (f) => (!f.calculated || f.stored) && f.type?.sql_name === "text"
+            )
+            .map((f) => f.name);
           return new Form({
             fields: [
               new Field({
@@ -378,6 +384,12 @@ const fieldFlow = (req) =>
                 input_type: "select",
                 options: keyfields,
               }),
+              new Field({
+                name: "include_fts",
+                label: req.__("Include in full-text search"),
+                type: "Bool",
+                showIf: { summary_field: textfields },
+              }),
               new Field({
                 name: "on_delete_cascade",
                 label: req.__("On delete cascade"),

package/routes/viewedit.js

@@ -775,3 +775,12 @@ router.post(
     res.redirect("/viewedit");
   })
 );
+
+router.post(
+  "/test/inserter",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const view = await View.create(req.body);
+    res.json({ view });
+  })
+);

package/tests/admin.test.js

@@ -12,6 +12,7 @@ const {
   respondJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
+const { sleep } = require("@saltcorn/data/tests/mocks");
 const fs = require("fs").promises;
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
@@ -30,7 +31,12 @@ beforeAll(async () => {
     4
   );
 });
-afterAll(db.close);
+
+afterAll(async () => {
+  await sleep(200);
+  db.close();
+});
+
 const adminPageContains = (specs) =>
   it("adminPageContains " + specs.map((s) => s[1]).join(","), async () => {
     const app = await getApp({ disableCsrf: true });
@@ -456,6 +462,71 @@ describe("actions", () => {
       .expect(toRedirect("/actions/"));
   });
 });
+describe("localizer", () => {
+  itShouldRedirectUnauthToLogin("/site-structure/localizer");
+  itShouldRedirectUnauthToLogin("/site-structure/localizer/add-lang");
+  it("redirects site struct to menu", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/menu"));
+  });
+  it("shows languages", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Languages"));
+  });
+  it("shows add language form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer/add-lang")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Locale identifier short code"));
+  });
+  it("add language", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/site-structure/localizer/save-lang")
+      .set("Cookie", loginCookie)
+      .send("name=dansk")
+      .send("locale=da")
+      .expect(toRedirect("/site-structure/localizer/edit/da"));
+  });
+  it("shows new in languages", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("dansk"));
+  });
+
+  it("shows edit language form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer/edit/da")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Hello world"));
+  });
+  it("set string language", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/site-structure/localizer/save-string/da/Hello%20world")
+      .set("Cookie", loginCookie)
+      .send("value=Hej+verden")
+      .expect(toRedirect("/site-structure/localizer/edit/da"));
+  });
+});
+
 /**
  * Pages tests
  */

package/tests/clientjs.test.js

@@ -14,6 +14,7 @@ const load_script = (fnm) => {
 };
 
 load_script("jquery-3.6.0.min.js");
+load_script("saltcorn-common.js");
 load_script("saltcorn.js");
 
 test("updateQueryStringParameter", () => {

package/tests/viewedit.test.js

@@ -8,6 +8,7 @@ const {
   toInclude,
   toNotInclude,
   resetToFixtures,
+  succeedJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const View = require("@saltcorn/data/models/view");
@@ -371,3 +372,96 @@ describe("viewedit new Show", () => {
       .expect(toRedirect("/viewedit"));
   });
 });
+describe("Library", () => {
+  it("should save new from builder", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .post("/library/savefrombuilder/")
+      .set("Cookie", loginCookie)
+      .send({
+        layout: {
+          columns: [],
+          layout: {
+            type: "card",
+            contents: {
+              above: [
+                null,
+                {
+                  besides: [
+                    {
+                      above: [
+                        null,
+                        {
+                          type: "blank",
+                          contents: "Hello world",
+                          block: false,
+                          inline: false,
+                          textStyle: "",
+                          isFormula: {},
+                          labelFor: "",
+                          style: {},
+                          font: "",
+                        },
+                      ],
+                    },
+                    {
+                      above: [
+                        null,
+                        {
+                          type: "blank",
+                          contents: "Bye bye",
+                          block: false,
+                          inline: false,
+                          textStyle: "",
+                          isFormula: {},
+                          labelFor: "",
+                          style: {},
+                          font: "",
+                        },
+                      ],
+                    },
+                  ],
+                  breakpoints: ["", ""],
+                  style: {},
+                  widths: [6, 6],
+                },
+              ],
+            },
+            title: "header",
+            style: {},
+          },
+        },
+        icon: "far fa-angry",
+        name: "ShinyCard",
+      })
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(succeedJsonWith(() => true));
+  });
+  it("shows library with item", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/library/list")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("ShinyCard"));
+  });
+  it("deletes in library", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/library/delete/1")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/library/list"));
+  });
+  it("shows empty library", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/library/list")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Library"))
+      .expect(toNotInclude("ShinyCard"))
+  });
+});

package/wrapper.js

@@ -167,6 +167,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
       headerTag: `<script>var _sc_globalCsrf = "${req.csrfToken()}"; var _sc_version_tag = "${version_tag}";</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },
+    { script: `/static_assets/${version_tag}/saltcorn-common.js` },
     { script: `/static_assets/${version_tag}/saltcorn.js` },
   ];
   let from_cfg = [];