@saltcorn/server 0.8.7 → 0.8.8-beta.1

package/routes/tables.js

@@ -11,6 +11,7 @@ const Table = require("@saltcorn/data/models/table");
 const File = require("@saltcorn/data/models/file");
 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 {
   mkTable,
@@ -54,7 +55,7 @@ const {
 } = require("@saltcorn/data/models/discovery");
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
-const { tablesList } = require("./common_lists");
+const { tablesList, viewsList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
@@ -654,7 +655,14 @@ const attribBadges = (f) => {
   let s = "";
   if (f.attributes) {
     Object.entries(f.attributes).forEach(([k, v]) => {
-      if (["summary_field", "on_delete_cascade", "on_delete"].includes(k))
+      if (
+        [
+          "summary_field",
+          "on_delete_cascade",
+          "on_delete",
+          "unique_error_msg",
+        ].includes(k)
+      )
         return;
       if (v || v === 0) s += badge("secondary", k);
     });
@@ -785,37 +793,10 @@ router.get(
       );
       var viewCardContents;
       if (views.length > 0) {
-        viewCardContents = mkTable(
-          [
-            {
-              label: req.__("Name"),
-              key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-            },
-            { label: req.__("Pattern"), key: "viewtemplate" },
-            {
-              label: req.__("Configure"),
-              key: (r) =>
-                link(
-                  `/viewedit/config/${encodeURIComponent(
-                    r.name
-                  )}?on_done_redirect=${encodeURIComponent(
-                    `table/${table.name}`
-                  )}`,
-                  req.__("Configure")
-                ),
-            },
-            {
-              label: req.__("Delete"),
-              key: (r) =>
-                post_delete_btn(
-                  `/viewedit/delete/${encodeURIComponent(r.id)}`,
-                  req
-                ),
-            },
-          ],
-          views,
-          { hover: true }
-        );
+        viewCardContents = await viewsList(views, req, {
+          on_done_redirect: encodeURIComponent(`table/${table.name}`),
+          notable: true,
+        });
       } else {
         viewCardContents = div(
           h4(req.__("No views defined")),
@@ -838,6 +819,33 @@ router.get(
           ),
       };
     }
+    const models = await Model.find({ table_id: table.id });
+    const modelCard = div(
+      mkTable(
+        [
+          {
+            label: req.__("Name"),
+            key: (r) => link(`/models/show/${r.id}`, r.name),
+          },
+          { label: req.__("Pattern"), key: "modelpattern" },
+          {
+            label: req.__("Delete"),
+            key: (r) =>
+              post_delete_btn(
+                `/models/delete/${encodeURIComponent(r.id)}`,
+                req
+              ),
+          },
+        ],
+        models
+      ),
+      a(
+        { href: `/models/new/${table.id}`, class: "btn btn-primary" },
+        i({ class: "fas fa-plus-square me-1" }),
+        req.__("Create model")
+      )
+    );
+
     // Table Data card
     const dataCard = div(
       { class: "d-flex text-center" },
@@ -997,6 +1005,15 @@ router.get(
           titleAjaxIndicator: true,
           contents: renderForm(tblForm, req.csrfToken()),
         },
+        ...(Model.has_templates
+          ? [
+              {
+                type: "card",
+                title: req.__("Models"),
+                contents: modelCard,
+              },
+            ]
+          : []),
       ],
     });
   })
@@ -1389,11 +1406,19 @@ const constraintForm = (req, table_id, fields, type) => {
         blurb: req.__(
           "Tick the boxes for the fields that should be jointly unique"
         ),
-        fields: fields.map((f) => ({
-          name: f.name,
-          label: f.label,
-          type: "Bool",
-        })),
+        fields: [
+          ...fields.map((f) => ({
+            name: f.name,
+            label: f.label,
+            type: "Bool",
+          })),
+          {
+            name: "errormsg",
+            label: "Error message",
+            sublabel: "Shown the user if joint uniqueness is violated",
+            type: "String",
+          },
+        ],
       });
     case "Index":
       return new Form({
@@ -1485,11 +1510,12 @@ router.post(
     if (form.hasErrors) req.flash("error", req.__("An error occurred"));
     else {
       let configuration = {};
-      if (type === "Unique")
+      if (type === "Unique") {
         configuration.fields = fields
           .map((f) => f.name)
           .filter((f) => form.values[f]);
-      else configuration = form.values;
+        configuration.errormsg = form.values.errormsg;
+      } else configuration = form.values;
       await TableConstraint.create({
         table_id: table.id,
         type,
@@ -1873,7 +1899,7 @@ const get_provider_workflow = (table, req) => {
 
     return {
       redirect: `/table/${table.id}`,
-      flash: ["success", `Table ${this.name || ""} saved`],
+      flash: ["success", `Table ${table.name || ""} saved`],
     };
   };
   return workflow;

package/routes/view.js

@@ -8,6 +8,7 @@ const Router = require("express-promise-router");
 
 const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
+const Trigger = require("@saltcorn/data/models/trigger");
 
 const { text, style } = require("@saltcorn/markup/tags");
 const {
@@ -51,7 +52,7 @@ router.get(
       res.redirect("/");
       return;
     }
-    const tic = state.logLevel >= 5 ? new Date() : null;
+    const tic = new Date();
 
     view.rewrite_query_from_slug(query, req.params);
     if (
@@ -85,11 +86,14 @@ router.get(
       res.set("SaltcornModalSaveIndicator", `true`);
     if (isModal && view.attributes?.popup_link_out)
       res.set("SaltcornModalLinkOut", `true`);
-    if (tic) {
-      const tock = new Date();
-      const ms = tock.getTime() - tic.getTime();
-      state.log(5, `View ${viewname} rendered in ${ms} ms`);
-    }
+    const tock = new Date();
+    const ms = tock.getTime() - tic.getTime();
+    Trigger.emitEvent("PageLoad", null, req.user, {
+      text: req.__("View '%s' was loaded", viewname),
+      type: "view",
+      name: viewname,
+      render_time: ms,
+    });
     if (typeof contents === "object" && contents.goto)
       res.redirect(contents.goto);
     else

package/routes/viewedit.js

@@ -13,7 +13,12 @@ const { p, a, div, script, text, domReady, code, pre, tbody, tr, th, td } =
   tags;
 
 const { getState } = require("@saltcorn/data/db/state");
-const { isAdmin, error_catcher, addOnDoneRedirect } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  addOnDoneRedirect,
+  is_relative_url,
+} = require("./utils.js");
 const { setTableRefs, viewsList } = require("./common_lists");
 const Form = require("@saltcorn/data/models/form");
 const Field = require("@saltcorn/data/models/field");
@@ -675,7 +680,11 @@ router.post(
         view.name
       )
     );
-    res.redirect(`/viewedit`);
+    let redirectTarget =
+      req.query.on_done_redirect && is_relative_url(req.query.on_done_redirect)
+        ? `/${req.query.on_done_redirect}`
+        : "/viewedit";
+    res.redirect(redirectTarget);
   })
 );
 
@@ -696,7 +705,11 @@ router.post(
       "success",
       req.__("View %s duplicated as %s", view.name, newview.name)
     );
-    res.redirect(`/viewedit`);
+    let redirectTarget =
+      req.query.on_done_redirect && is_relative_url(req.query.on_done_redirect)
+        ? `/${req.query.on_done_redirect}`
+        : "/viewedit";
+    res.redirect(redirectTarget);
   })
 );
 
@@ -713,7 +726,11 @@ router.post(
     const { id } = req.params;
     await View.delete({ id });
     req.flash("success", req.__("View deleted"));
-    res.redirect(`/viewedit`);
+    let redirectTarget =
+      req.query.on_done_redirect && is_relative_url(req.query.on_done_redirect)
+        ? `/${req.query.on_done_redirect}`
+        : "/viewedit";
+    res.redirect(redirectTarget);
   })
 );
 
@@ -805,7 +822,12 @@ router.post(
         : req.__(`Minimum role updated`);
     if (!req.xhr) {
       req.flash("success", message);
-      res.redirect("/viewedit");
+      let redirectTarget =
+        req.query.on_done_redirect &&
+        is_relative_url(req.query.on_done_redirect)
+          ? `/${req.query.on_done_redirect}`
+          : "/viewedit";
+      res.redirect(redirectTarget);
     } else res.json({ okay: true, responseText: message });
   })
 );

package/tests/view.test.js

@@ -8,11 +8,14 @@ const {
   toInclude,
   toNotInclude,
   resetToFixtures,
+  respondJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const { getState } = require("@saltcorn/data/db/state");
 const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
+const Trigger = require("@saltcorn/data/models/trigger");
+const Page = require("@saltcorn/data/models/page");
 
 const { plugin_with_routes } = require("@saltcorn/data/tests/mocks");
 
@@ -178,6 +181,220 @@ describe("render view with slug", () => {
   });
 });
 
+describe("action row_variable", () => {
+  const createFilterView = async ({
+    configuration,
+    rowVariable,
+    rndid,
+    actionName,
+    viewName,
+    rowLimit,
+  }) => {
+    const table = Table.findOne({ name: "books" });
+    const filterCfg = {
+      layout: {
+        type: "action",
+        configuration: configuration,
+        action_name: actionName,
+        action_row_variable: rowVariable,
+        action_style: "btn-primary",
+        minRole: 10,
+        rndid: rndid,
+      },
+      columns: [
+        {
+          type: "Action",
+          action_name: actionName,
+          action_row_variable: rowVariable,
+          action_style: "btn-primary",
+          minRole: 100,
+          configuration: configuration,
+          rndid: rndid,
+        },
+      ],
+    };
+    if (rowLimit) {
+      filterCfg.layout.action_row_limit = rowLimit;
+      filterCfg.columns[0].action_row_limit = rowLimit;
+    }
+    await View.create({
+      table_id: table.id,
+      name: viewName,
+      viewtemplate: "Filter",
+      configuration: filterCfg,
+      min_role: 100,
+    });
+  };
+
+  it("run_code_none_row_var", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await createFilterView({
+      configuration: {
+        run_where: "Client page",
+        code: 'console.log("hello");',
+      },
+      rowVariable: "none",
+      rndid: "q6b06q",
+      actionName: "run_js_code",
+      viewName: "run_code_none_row_var",
+    });
+    await request(app)
+      .post("/view/run_code_none_row_var/run_action")
+      .set("Cookie", loginCookie)
+      .send({
+        rndid: "q6b06q",
+      })
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(
+        respondJsonWith(200, (resp) => {
+          return (
+            resp.success === "ok" && resp.eval_js === 'console.log("hello");'
+          );
+        })
+      );
+  });
+  it("insert_row_from_state", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await createFilterView({
+      configuration: {
+        table: "books",
+        row_expr: `{  
+          author: row.author,
+          pages: row.pages,
+        }`,
+      },
+      rowVariable: "state",
+      rndid: "u6b06u",
+      actionName: "insert_any_row",
+      viewName: "insert_row_from_state",
+    });
+    await request(app)
+      .post(
+        "/view/insert_row_from_state/run_action?author=author_from_state&pages=234"
+      )
+      .set("Cookie", loginCookie)
+      .send({
+        rndid: "u6b06u",
+      })
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(respondJsonWith(200, (resp) => resp.success === "ok"));
+    const books = Table.findOne({ name: "books" });
+    const actual = await books.getRows({ author: "author_from_state" });
+    expect(actual.length).toBe(1);
+  });
+  it("run_code_eatch_matching", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await createFilterView({
+      configuration: {
+        run_where: "Client page",
+        code: 'console.log("hello");',
+      },
+      rowVariable: "each_matching_row",
+      rndid: "b6b06b",
+      actionName: "run_js_code",
+      viewName: "run_code_eatch_matching",
+    });
+    const testHelper = async (query, resultCount) => {
+      await request(app)
+        .post(`/view/run_code_eatch_matching/run_action?${query}`)
+        .set("Cookie", loginCookie)
+        .send({ rndid: "b6b06b" })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json")
+        .expect(
+          respondJsonWith(200, (resp) => {
+            if (resp.success !== "ok") return false;
+            return (
+              (resultCount === 0 && !resp.eval_js) ||
+              (Array.isArray(resp.eval_js) &&
+                resp.eval_js.length === resultCount)
+            );
+          })
+        );
+    };
+    await testHelper("author=le", 2);
+    await testHelper("author=Herman", 1);
+    await testHelper("author=Christian", 0);
+  });
+
+  it("insert_row_each_matching", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await createFilterView({
+      configuration: {
+        table: "books",
+        row_expr: `{  
+          author: row.author + "_copy",
+          pages: row.pages,
+        }`,
+      },
+      rowVariable: "each_matching_row",
+      rndid: "a6b06a",
+      actionName: "insert_any_row",
+      viewName: "insert_row_each_matching",
+    });
+    const testHelper = async (query) => {
+      await request(app)
+        .post(`/view/insert_row_each_matching/run_action?${query}`)
+        .set("Cookie", loginCookie)
+        .send({ rndid: "a6b06a" })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json")
+        .expect(
+          respondJsonWith(200, (resp) => {
+            return resp.success === "ok";
+          })
+        );
+    };
+    const books = Table.findOne({ name: "books" });
+    let oldLength = (await books.getRows()).length;
+    await testHelper("author=le");
+    let newLength = (await books.getRows()).length;
+    expect(newLength).toBe(oldLength + 2);
+    oldLength = newLength;
+    await testHelper("author=_copy");
+    newLength = (await books.getRows()).length;
+    expect(newLength).toBe(oldLength + 2);
+    oldLength = newLength;
+    await testHelper("author=Christian");
+    newLength = (await books.getRows()).length;
+    expect(newLength).toBe(oldLength);
+  });
+
+  it("each_matching_row: action_row_limit", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await createFilterView({
+      configuration: {
+        run_where: "Client page",
+        code: 'console.log("hello");',
+      },
+      rowVariable: "each_matching_row",
+      rndid: "c6b06c",
+      actionName: "run_js_code",
+      viewName: "author_filter_row_limit",
+      rowLimit: 2,
+    });
+    await request(app)
+      .post("/view/author_filter_row_limit/run_action?author=le")
+      .set("Cookie", loginCookie)
+      .send({ rndid: "c6b06c" })
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(
+        respondJsonWith(200, (resp) => {
+          if (resp.success !== "ok") return false;
+          return Array.isArray(resp.eval_js) && resp.eval_js.length === 2;
+        })
+      );
+  });
+});
+
 describe("inbound relations", () => {
   it("view with inbound relation", async () => {
     const app = await getApp({ disableCsrf: true });