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

package/routes/viewedit.js

@@ -29,6 +29,9 @@ const Workflow = require("@saltcorn/data/models/workflow");
 const User = require("@saltcorn/data/models/user");
 const Page = require("@saltcorn/data/models/page");
 const File = require("@saltcorn/data/models/file");
+const Tag = require("@saltcorn/data/models/tag");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
+
 const db = require("@saltcorn/data/db");
 const { sleep } = require("@saltcorn/data/utils");
 
@@ -56,7 +59,18 @@ router.get(
   error_catcher(async (req, res) => {
     let orderBy = "name";
     if (req.query._sortby === "viewtemplate") orderBy = "viewtemplate";
-    const views = await View.find({}, { orderBy, nocase: true });
+    const viewq = {};
+    let filterOnTag;
+    if (req.query._tag) {
+      const tagEntries = await TagEntry.find({
+        tag_id: +req.query._tag,
+        not: { view_id: null },
+      });
+      viewq.id = { in: tagEntries.map((te) => te.view_id).filter(Boolean) };
+      filterOnTag = await Tag.findOne({ id: +req.query._tag });
+    }
+
+    const views = await View.find(viewq, { orderBy, nocase: true });
     await setTableRefs(views);
 
     if (req.query._sortby === "table")
@@ -64,7 +78,7 @@ router.get(
         a.table.toLowerCase() > b.table.toLowerCase() ? 1 : -1
       );
 
-    const viewMarkup = await viewsList(views, req);
+    const viewMarkup = await viewsList(views, req, { filterOnTag });
     const tables = await Table.find();
 
     res.sendWrap(req.__(`Views`), {
@@ -182,6 +196,26 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         required: true,
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       }),
+      new Field({
+        name: "page_title",
+        label: req.__("Page title"),
+        type: "String",
+        parent_field: "attributes",
+        tab: "View settings",
+        sublabel: req.__(
+          "Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>"
+        ),
+      }),
+      new Field({
+        name: "page_description",
+        label: req.__("Page description"),
+        type: "String",
+        parent_field: "attributes",
+        tab: "View settings",
+        sublabel: req.__(
+          "For search engines. Some view patterns accept interpolations."
+        ),
+      }),
       new Field({
         name: "default_render_page",
         label: req.__("Show on page"),
@@ -215,6 +249,8 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         type: "String",
         parent_field: "attributes",
         tab: "Popup settings",
+        sublabel:
+          "Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>",
       }),
       {
         name: "popup_width",
@@ -236,6 +272,26 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
           options: ["px", "%", "vw", "em", "rem"],
         },
       },
+      {
+        name: "popup_minwidth",
+        label: req.__("Popup min width"),
+        type: "Integer",
+        tab: "Popup settings",
+        parent_field: "attributes",
+        attributes: { asideNext: true },
+      },
+      {
+        name: "popup_minwidth_units",
+        label: req.__("Units"),
+        type: "String",
+        tab: "Popup settings",
+        fieldview: "radio_group",
+        parent_field: "attributes",
+        attributes: {
+          inline: true,
+          options: ["px", "%", "vw", "em", "rem"],
+        },
+      },
       {
         name: "popup_save_indicator",
         label: req.__("Save indicator"),
@@ -569,7 +625,10 @@ const respondWorkflow = (view, wf, wfres, req, res, table) => {
   else if (wfres.renderBuilder) {
     wfres.renderBuilder.options.view_id = view.id;
     res.sendWrap(
-      req.__(`%s configuration`, view.name),
+      {
+        title: req.__(`%s configuration`, view.name),
+        requestFluidLayout: true,
+      },
       wrap(renderBuilder(wfres.renderBuilder, req.csrfToken()), true)
     );
   } else res.redirect(wfres.redirect);
@@ -757,7 +816,7 @@ router.post(
       await View.update({ configuration: newcfg }, +id);
       res.json({ success: "ok" });
     } else {
-      res.json({ error: "no view" });
+      res.json({ error: req.__("Unable to save: No view") });
     }
   })
 );

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/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

@@ -360,27 +360,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

@@ -195,7 +195,6 @@ const get_headers = (req, version_tag, description, extras = []) => {
     { 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` },
   ];
   let from_cfg = [];
   if (state.getConfig("page_custom_css", ""))
@@ -350,7 +349,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),