@saltcorn/server 0.9.1-beta.6 → 0.9.1-beta.8

package/auth/admin.js

@@ -1129,7 +1129,7 @@ router.post(
     await u.changePasswordTo(newpw);
     await u.destroy_sessions();
     req.flash(
-      "success",
+      "warning",
       req.__(`Changed password for user %s to %s`, u.email, newpw)
     );
 

package/auth/routes.js

@@ -877,17 +877,17 @@ router.post(
 
     const unsuitableEmailPassword = async (urecord) => {
       const { email, password, passwordRepeat } = urecord;
-      if (!email || !password) {
+      if (email == "" || !password) {
         req.flash("danger", req.__("E-mail and password required"));
         res.redirect("/auth/signup");
         return true;
       }
-      if (email.length > 127) {
+      if (email && email.length > 127) {
         req.flash("danger", req.__("E-mail too long"));
         res.redirect("/auth/signup");
         return true;
       }
-      if (!User.valid_email(email)) {
+      if (email && !User.valid_email(email)) {
         req.flash("danger", req.__("Not a valid e-mail address"));
         res.redirect("/auth/signup");
         return true;
@@ -905,9 +905,7 @@ router.post(
         res.redirect("/auth/signup");
         return true;
       }
-
-      const us = await User.find({ email });
-      if (us.length > 0) {
+      if (await User.matches_existing_user(urecord)) {
         req.flash("danger", req.__("Account already exists"));
         res.redirect("/auth/signup");
         return true;

package/help/Event types.tmd

@@ -16,6 +16,13 @@ outbound emails would have a trigger with When = Insert and Action = send_email
 **Update**: run this action when changes are made to an existing row. The old row can 
 be accessed with the `old_row` variable.
 
+**Validate**: run before inserts or updates. If the action returns `error` (for example, 
+`run_js_code` code: `return {error: "Invalid row"}`), the insert/update is aborted. If the 
+trigger returns `set_fields` (for example, `run_js_code` code: `return {set_fields: {full_name: "Unknown"}}`) 
+these values are inserted in row.
+
+Guaranteed to run before any Insert or Update triggers
+
 **Delete**: run this action when a row is deleted
 
 ## Periodic events

package/help/JavaScript action code.tmd

@@ -87,20 +87,7 @@ Example: `return { error: "Invalid command!" }`
 
 If this is triggered by an Edit view with the SubmitWithAjax, 
 halt navigation and stay on page. This can be used for complex validation logic, 
-When added as an Insert or Update trigger. If you delete the inserted row, You 
-may also need to clear the returned id in order to allow the user to continue editing.
-
-Example:
-
-```
-if(amount>cash_on_hand) {
-  await table.deleteRows({ id })
-  return { 
-    error: "Invalid order!",
-    id: null 
-  }
-}
-```
+when added as a Validate trigger. 
 
 #### `goto`
 

package/locales/en.json

@@ -1277,5 +1277,6 @@
 	"HTML file": "HTML file",
 	"HTML file to use as page content": "HTML file to use as page content",
 	"Offline mode: cannot load file": "Offline mode: cannot load file",
-	"None - use drag and drop builder": "None - use drag and drop builder"
+	"None - use drag and drop builder": "None - use drag and drop builder",
+	"Do not pick or compare time": "Do not pick or compare time"
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.1-beta.6",
+  "version": "0.9.1-beta.8",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.1-beta.6",
-    "@saltcorn/builder": "0.9.1-beta.6",
-    "@saltcorn/data": "0.9.1-beta.6",
-    "@saltcorn/admin-models": "0.9.1-beta.6",
-    "@saltcorn/filemanager": "0.9.1-beta.6",
-    "@saltcorn/markup": "0.9.1-beta.6",
-    "@saltcorn/sbadmin2": "0.9.1-beta.6",
+    "@saltcorn/base-plugin": "0.9.1-beta.8",
+    "@saltcorn/builder": "0.9.1-beta.8",
+    "@saltcorn/data": "0.9.1-beta.8",
+    "@saltcorn/admin-models": "0.9.1-beta.8",
+    "@saltcorn/filemanager": "0.9.1-beta.8",
+    "@saltcorn/markup": "0.9.1-beta.8",
+    "@saltcorn/sbadmin2": "0.9.1-beta.8",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -50,6 +50,11 @@ const nubBy = (prop, xs) => {
     return true;
   });
 };
+
+function valid_js_var_name(s) {
+  if (!s) return false;
+  return !!s.match(/^[a-zA-Z_$][a-zA-Z_$0-9]*$/);
+}
 function apply_showif() {
   const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
   $("[data-show-if]").each(function (ix, element) {
@@ -83,7 +88,7 @@ function apply_showif() {
     const e = $(element);
     const rec = get_form_record(e);
     const href = new Function(
-      `{${Object.keys(rec).join(",")}}`,
+      `{${Object.keys(rec).filter(valid_js_var_name).join(",")}}`,
       "return " + e.attr("data-dyn-href")
     )(rec);
     e.attr("href", href);
@@ -756,31 +761,37 @@ function initialize_page() {
           $(el).addClass("codemirror-enabled");
           cm.on(
             "change",
-            $.debounce(() => {
-              if ($(el).hasClass("validate-statements")) {
-                try {
-                  let AsyncFunction = Object.getPrototypeOf(
-                    async function () {}
-                  ).constructor;
-                  AsyncFunction(cm.getValue());
+            $.debounce(
+              (cm1) => {
+                cm1.save();
+                if ($(el).hasClass("validate-statements")) {
+                  try {
+                    let AsyncFunction = Object.getPrototypeOf(
+                      async function () {}
+                    ).constructor;
+                    AsyncFunction(cm.getValue());
+                    $(el).closest("form").trigger("change");
+                  } catch (e) {
+                    const form = $(el).closest("form");
+                    const errorArea = form.parent().find(".full-form-error");
+                    if (errorArea.length) errorArea.text(e.message);
+                    else
+                      form
+                        .parent()
+                        .append(
+                          `<p class="text-danger full-form-error">${e.message}</p>`
+                        );
+                    return;
+                  }
+                } else {
+                  cm1.save();
                   $(el).closest("form").trigger("change");
-                } catch (e) {
-                  const form = $(el).closest("form");
-                  const errorArea = form.parent().find(".full-form-error");
-                  if (errorArea.length) errorArea.text(e.message);
-                  else
-                    form
-                      .parent()
-                      .append(
-                        `<p class="text-danger full-form-error">${e.message}</p>`
-                      );
-                  return;
                 }
-              } else $(el).closest("form").trigger("change");
-            }),
-            500,
-            null,
-            true
+              },
+              500,
+              null,
+              true
+            )
           );
         });
       }, 100);

package/public/saltcorn.js

@@ -360,7 +360,7 @@ function submitWithAjax(e) {
   saveAndContinue(e, (res) => {
     if (res && res.responseJSON && res.responseJSON.url_when_done)
       window.location.href = res.responseJSON.url_when_done;
-    if (res && res.responseJSON && res.responseJSON.error)
+    if (res && res.responseJSON && res.responseJSON.error && res.status < 300)
       notifyAlert({ type: "danger", text: res.responseJSON.error });
   });
 }

package/routes/actions.js

@@ -145,7 +145,7 @@ const triggerForm = async (req, trigger) => {
     .filter(([k, v]) => v.hasChannel)
     .map(([k, v]) => k);
   const allActions = actions.map((t) => t.name);
-  const table_triggers = ["Insert", "Update", "Delete"];
+  const table_triggers = ["Insert", "Update", "Delete", "Validate"];
   const action_options = {};
   const actionsNotRequiringRow = actions
     .filter((a) => !a.requireRow)

package/routes/page.js

@@ -16,6 +16,7 @@ const {
   isAdmin,
   sendHtmlFile,
 } = require("../routes/utils.js");
+const { isTest } = require("@saltcorn/data/utils");
 const { add_edit_bar } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
@@ -52,12 +53,13 @@ router.get(
       const title = scan_for_page_title(contents, db_page.title);
       const tock = new Date();
       const ms = tock.getTime() - tic.getTime();
-      Trigger.emitEvent("PageLoad", null, req.user, {
-        text: req.__("Page '%s' was loaded", pagename),
-        type: "page",
-        name: pagename,
-        render_time: ms,
-      });
+      if (!isTest())
+        Trigger.emitEvent("PageLoad", null, req.user, {
+          text: req.__("Page '%s' was loaded", pagename),
+          type: "page",
+          name: pagename,
+          render_time: ms,
+        });
       if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
       else
         res.sendWrap(

package/routes/view.js

@@ -18,7 +18,7 @@ const {
   setTenant,
 } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
-const { InvalidConfiguration } = require("@saltcorn/data/utils");
+const { InvalidConfiguration, isTest } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 
 /**
@@ -88,12 +88,13 @@ router.get(
       res.set("SaltcornModalLinkOut", `true`);
     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 (!isTest())
+      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/tests/view.test.js

@@ -17,6 +17,9 @@ const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
 
 const { plugin_with_routes } = require("@saltcorn/data/tests/mocks");
+const {
+  prepareArtistsAlbumRelation,
+} = require("@saltcorn/data/tests/common_helpers");
 
 afterAll(db.close);
 beforeAll(async () => {
@@ -586,3 +589,58 @@ describe("inbound relations", () => {
       .expect(toNotInclude("Content of post CPost C"));
   });
 });
+
+describe("many to many relations", () => {
+  beforeAll(async () => {
+    await prepareArtistsAlbumRelation();
+  });
+
+  it("artist_plays_on_album", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/view/show_artist?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("album A"))
+      .expect(toInclude("album B"));
+
+    await request(app)
+      .get("/view/show_artist?id=2")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("album A"))
+      .expect(toNotInclude("album B"));
+  });
+
+  it("albums feed with query", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+
+    const queryObj_1 = {
+      relation: ".artists.artist_plays_on_album$artist.album",
+      srcId: 1,
+    };
+    await request(app)
+      .get(
+        `/view/albums_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj_1)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("album A"))
+      .expect(toInclude("album B"));
+
+    const queryObj_2 = {
+      relation: ".artists.artist_plays_on_album$artist.album",
+      srcId: 2,
+    };
+    await request(app)
+      .get(
+        `/view/albums_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj_2)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("album A"))
+      .expect(toNotInclude("album B"));
+  });
+});