@saltcorn/server 0.9.4-beta.0 → 0.9.4-beta.10

package/routes/tables.js

@@ -13,6 +13,7 @@ const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
 const Model = require("@saltcorn/data/models/model");
 const Trigger = require("@saltcorn/data/models/trigger");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
 const {
   mkTable,
   renderForm,
@@ -59,10 +60,12 @@ const { tablesList, viewsList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
+  comparingCaseInsensitive,
 } = require("@saltcorn/data/utils");
 const { EOL } = require("os");
 
 const path = require("path");
+const Tag = require("@saltcorn/data/models/tag");
 /**
  * @type {object}
  * @const
@@ -714,6 +717,7 @@ router.get(
       ...new Set(child_relations.map(({ table }) => table.name)),
     ];
     const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
+    triggers.sort(comparingCaseInsensitive("name"));
     let fieldCard;
     if (fields.length === 0) {
       fieldCard = [
@@ -785,7 +789,16 @@ router.get(
         triggers.length
           ? req.__("Table triggers: ") +
             triggers
-              .map((t) => link(`/actions/configure/${t.id}`, t.name))
+              .map((t) =>
+                link(
+                  `/actions/configure/${
+                    t.id
+                  }?on_done_redirect=${encodeURIComponent(
+                    `table/${table.name}`
+                  )}`,
+                  t.name
+                )
+              )
               .join(", ") +
             "<br>"
           : "",
@@ -1211,13 +1224,23 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
-    const rows = await Table.find_with_external(
-      {},
-      { orderBy: "name", nocase: true }
-    );
+    const tblq = {};
+    let filterOnTag;
+    if (req.query._tag) {
+      const tagEntries = await TagEntry.find({
+        tag_id: +req.query._tag,
+        not: { table_id: null },
+      });
+      tblq.id = { in: tagEntries.map((te) => te.table_id).filter(Boolean) };
+      filterOnTag = await Tag.findOne({ id: +req.query._tag });
+    }
+    const rows = await Table.find_with_external(tblq, {
+      orderBy: "name",
+      nocase: true,
+    });
     const roles = await User.get_roles();
     const getRole = (rid) => roles.find((r) => r.id === rid).role;
-    const mainCard = await tablesList(rows, req);
+    const mainCard = await tablesList(rows, req, { filterOnTag });
     const createCard = div(
       a(
         { href: `/table/new`, class: "btn btn-primary mt-1 me-3" },

package/routes/tag_entries.js

@@ -5,6 +5,7 @@ const {
   select,
   option,
   label,
+  text,
 } = require("@saltcorn/markup/tags");
 
 const Tag = require("@saltcorn/data/models/tag");
@@ -94,15 +95,21 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { entry_type, tag_id } = req.params;
-    res.sendWrap(req.__("Add %s to tag"), {
+    const tag = await Tag.findOne({ id: tag_id });
+
+    res.sendWrap(req.__("Add %s to tag %s", entry_type, tag.name), {
       above: [
         {
           type: "breadcrumbs",
-          crumbs: [{ text: req.__(`Tag entry`) }],
+          crumbs: [
+            { text: req.__(`Tags`), href: "/tag" },
+            { text: tag.name, href: `/tag/${tag.id}` },
+            { text: req.__(`Add %s`, text(entry_type)) },
+          ],
         },
         {
           type: "card",
-          title: req.__(`Add entries to tag`),
+          title: req.__(`Add entries to tag %s`, tag.name),
           contents: buildForm(
             entry_type,
             tag_id,
@@ -148,9 +155,10 @@ router.post(
       req.flash("error", req.__("Please select at least one item"));
       return res.redirect(`/tag-entries/add/${entry_type}/${tag_id}`);
     }
+    const ids_array = Array.isArray(ids) ? ids : [ids];
     const fieldName = idField(entry_type);
     const tag = await Tag.findOne({ id: tag_id });
-    for (const id of ids) {
+    for (const id of ids_array) {
       await tag.addEntry({ [fieldName]: id });
     }
     res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);

package/routes/tags.js

@@ -1,9 +1,10 @@
-const { a, text } = require("@saltcorn/markup/tags");
+const { a, text, i } = require("@saltcorn/markup/tags");
 
 const Tag = require("@saltcorn/data/models/tag");
 const Router = require("express-promise-router");
 const Form = require("@saltcorn/data/models/form");
 const User = require("@saltcorn/data/models/user");
+const stream = require("stream");
 
 const { isAdmin, error_catcher, csrfField } = require("./utils");
 const { send_infoarch_page } = require("../markup/admin");
@@ -23,6 +24,10 @@ const {
   getTriggerList,
 } = require("./common_lists");
 
+const db = require("@saltcorn/data/db");
+const { getState } = require("@saltcorn/data/db/state");
+const { create_pack_from_tag } = require("@saltcorn/admin-models/models/pack");
+
 const router = new Router();
 module.exports = router;
 
@@ -42,7 +47,7 @@ router.get(
           mkTable(
             [
               {
-                label: req.__("Tagname"),
+                label: req.__("Tag name"),
                 key: (r) =>
                   link(`/tag/${r.id || r.name}?show_list=tables`, text(r.name)),
               },
@@ -57,7 +62,7 @@ router.get(
           a(
             {
               href: `/tag/new`,
-              class: "btn btn-primary",
+              class: "btn btn-primary mt-3",
             },
             req.__("Create tag")
           ),
@@ -73,6 +78,13 @@ router.get(
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`New tag`), {
       above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__(`Tags`), href: "/tag" },
+            { text: req.__(`New`) },
+          ],
+        },
         {
           type: "card",
           title: req.__(`New tag`),
@@ -97,7 +109,26 @@ router.get(
   })
 );
 
-const headerWithCollapser = (title, cardId, showList) =>
+router.get(
+  "/download-pack/:idorname",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { idorname } = req.params;
+    const id = parseInt(idorname);
+    const tag = await Tag.findOne(id ? { id } : { name: idorname });
+    if (!tag) {
+      req.flash("error", req.__("Tag not found"));
+      return res.redirect(`/tag`);
+    }
+    const pack = await create_pack_from_tag(tag);
+    const readStream = new stream.PassThrough();
+    readStream.end(JSON.stringify(pack));
+    res.type("application/json");
+    res.attachment(`${tag.name}-pack.json`);
+    readStream.pipe(res);
+  })
+);
+const headerWithCollapser = (title, cardId, showList, count) =>
   a(
     {
       class: `card-header-left-collapse ${!showList ? "collapsed" : ""} ps-3`,
@@ -107,7 +138,8 @@ const headerWithCollapser = (title, cardId, showList) =>
       "aria-controls": cardId,
       role: "button",
     },
-    title
+    title,
+    ` (${count})`
   );
 
 const isShowList = (showList, listType) => showList === listType;
@@ -139,14 +171,15 @@ router.get(
       above: [
         {
           type: "breadcrumbs",
-          crumbs: [{ text: req.__(`Tag: %s`, tag.name) }],
+          crumbs: [{ text: req.__(`Tags`), href: "/tag" }, { text: tag.name }],
         },
         {
           type: "card",
           title: headerWithCollapser(
             req.__("Tables"),
             tablesDomId,
-            isShowList(show_list, "tables")
+            isShowList(show_list, "tables"),
+            tables.length
           ),
           contents: [
             await tablesList(tables, req, {
@@ -168,7 +201,8 @@ router.get(
           title: headerWithCollapser(
             req.__("Views"),
             viewsDomId,
-            isShowList(show_list, "views")
+            isShowList(show_list, "views"),
+            views.length
           ),
           contents: [
             await viewsList(views, req, {
@@ -190,10 +224,11 @@ router.get(
           title: headerWithCollapser(
             req.__("Pages"),
             pagesDomId,
-            isShowList(show_list, "pages")
+            isShowList(show_list, "pages"),
+            pages.length
           ),
           contents: [
-            getPageList(pages, roles, req, {
+            await getPageList(pages, roles, req, {
               tagId: tag.id,
               domId: pagesDomId,
               showList: isShowList(show_list, "pages"),
@@ -213,10 +248,11 @@ router.get(
           title: headerWithCollapser(
             req.__("Triggers"),
             triggersDomId,
-            isShowList(show_list, "triggers")
+            isShowList(show_list, "triggers"),
+            triggers.length
           ),
           contents: [
-            getTriggerList(triggers, req, {
+            await getTriggerList(triggers, req, {
               tagId: tag.id,
               domId: triggersDomId,
               showList: isShowList(show_list, "triggers"),
@@ -230,6 +266,19 @@ router.get(
             ),
           ],
         },
+        {
+          type: "card",
+          contents: [
+            a(
+              {
+                class: "btn btn-outline-primary",
+                href: `/tag/download-pack/${tag.id}`,
+              },
+              i({ class: "fas fa-download me-2" }),
+              "Download pack"
+            ),
+          ],
+        },
       ],
     });
   })

package/routes/view.js

@@ -71,10 +71,14 @@ router.get(
     const isModal = req.headers?.saltcornmodalrequest;
 
     const contents0 = await view.run_possibly_on_page(query, req, res);
-    const title =
+    let title =
       isModal && view.attributes?.popup_title
         ? view.attributes?.popup_title
-        : scan_for_page_title(contents0, view.name);
+        : view.attributes?.page_title ||
+          scan_for_page_title(contents0, view.name); //legacy
+    if ((title || "").includes("{{")) {
+      title = await view.interpolate_title_string(title, query);
+    }
     if (isModal && view.attributes?.popup_width)
       res.set(
         "SaltcornModalWidth",
@@ -82,10 +86,24 @@ router.get(
           view.attributes?.popup_width_units || "px"
         }`
       );
+    if (isModal && view.attributes?.popup_minwidth)
+      res.set(
+        "SaltcornModalMinWidth",
+        `${view.attributes?.popup_minwidth}${
+          view.attributes?.popup_minwidth_units || "px"
+        }`
+      );
     if (isModal && view.attributes?.popup_save_indicator)
       res.set("SaltcornModalSaveIndicator", `true`);
     if (isModal && view.attributes?.popup_link_out)
       res.set("SaltcornModalLinkOut", `true`);
+    if (view.attributes?.page_description) {
+      let description = view.attributes?.page_description;
+      if ((description || "").includes("{{")) {
+        description = await view.interpolate_title_string(description, query);
+      }
+      title = { title, description };
+    }
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();
     if (!isTest())

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/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 () => {