@saltcorn/server 0.9.1-beta.7 → 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/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.7",
+  "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.7",
-    "@saltcorn/builder": "0.9.1-beta.7",
-    "@saltcorn/data": "0.9.1-beta.7",
-    "@saltcorn/admin-models": "0.9.1-beta.7",
-    "@saltcorn/filemanager": "0.9.1-beta.7",
-    "@saltcorn/markup": "0.9.1-beta.7",
-    "@saltcorn/sbadmin2": "0.9.1-beta.7",
+    "@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/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"));
+  });
+});