@saltcorn/server 0.9.3-beta.8 → 0.9.3

package/help/index.js

@@ -44,6 +44,7 @@ const get_help_markup = async (topic, query, req) => {
     const markup = md.render(mdTopic);
     return { markup };
   } catch (e) {
+    console.error(e);
     return { markup: pre(e.toString()) };
   }
 };

package/locales/en.json

@@ -352,7 +352,6 @@
 	"Next": "Next",
 	"Save": "Save",
 	"Calculated fields cannot have File type": "Calculated fields cannot have File type",
-	"Calculated fields cannot have Key type": "Calculated fields cannot have Key type",
 	"On Field": "On Field",
 	"Field in %s table": "Field in %s table",
 	"Action on row": "Action on row",
@@ -1338,5 +1337,12 @@
 	"Your page groups": "Your page groups",
 	"A group has pages with an eligible formula. When you request a group, then the first page where the formula matches gets served. This way, you can choose a page depending on the screen of the device.": "A group has pages with an eligible formula. When you request a group, then the first page where the formula matches gets served. This way, you can choose a page depending on the screen of the device.",
 	"Create page group": "Create page group",
-	"Page groups": "Page groups"
+	"Page groups": "Page groups",
+	"Calculated non-stored fields cannot have Key type": "Calculated non-stored fields cannot have Key type",
+	"Row click URL": "Row click URL",
+	"Formula. Navigate to this URL when row is clicked": "Formula. Navigate to this URL when row is clicked",
+	"Time of day": "Time of day",
+	"UTC timezone": "UTC timezone",
+	"Show if formula": "Show if formula",
+	"Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>.": "Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>."
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.3-beta.8",
+  "version": "0.9.3",
   "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.3-beta.8",
-    "@saltcorn/builder": "0.9.3-beta.8",
-    "@saltcorn/data": "0.9.3-beta.8",
-    "@saltcorn/admin-models": "0.9.3-beta.8",
-    "@saltcorn/filemanager": "0.9.3-beta.8",
-    "@saltcorn/markup": "0.9.3-beta.8",
-    "@saltcorn/sbadmin2": "0.9.3-beta.8",
+    "@saltcorn/base-plugin": "0.9.3",
+    "@saltcorn/builder": "0.9.3",
+    "@saltcorn/data": "0.9.3",
+    "@saltcorn/admin-models": "0.9.3",
+    "@saltcorn/filemanager": "0.9.3",
+    "@saltcorn/markup": "0.9.3",
+    "@saltcorn/sbadmin2": "0.9.3",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -105,13 +105,17 @@ function apply_showif() {
     }
   });
   $("[data-dyn-href]").each(function (ix, element) {
-    const e = $(element);
-    const rec = get_form_record(e);
-    const href = new Function(
-      `{${Object.keys(rec).filter(valid_js_var_name).join(",")}}`,
-      "return " + e.attr("data-dyn-href")
-    )(rec);
-    e.attr("href", href);
+    try {
+      const e = $(element);
+      const rec = get_form_record(e);
+      const href = new Function(
+        `{${Object.keys(rec).filter(valid_js_var_name).join(",")}}`,
+        "return " + e.attr("data-dyn-href")
+      )(rec);
+      e.attr("href", href);
+    } catch (e) {
+      if (window._sc_loglevel > 4) console.error(e);
+    }
   });
   $("[data-calc-options]").each(function (ix, element) {
     var e = $(element);
@@ -423,6 +427,7 @@ function get_form_record(e_in, select_labels) {
 
   e.find("input[name],select[name],textarea[name]").each(function () {
     const $this = $(this);
+    if ($this.prop("disabled")) return;
     const name = $this.attr("data-fieldname") || $this.attr("name");
     if (select_labels && $this.prop("tagName").toLowerCase() === "select")
       rec[name] = $this.find("option:selected").text();

package/public/saltcorn.css

@@ -494,3 +494,7 @@ table.help-md th:nth-child(2) {
 .progress-bar-radial {
   color: unset;
 }
+
+tr[onclick] {
+  cursor: pointer;
+}

package/routes/actions.js

@@ -192,6 +192,13 @@ const triggerForm = async (req, trigger) => {
           "The table for which the trigger condition is checked."
         ),
       },
+      {
+        name: "channel",
+        label: req.__("Time of day"),
+        input_type: "time_of_day",
+        showIf: { when_trigger: "Daily" },
+        sublabel: req.__("UTC timezone"),
+      },
       {
         name: "channel",
         label: req.__("Channel"),

package/routes/fields.js

@@ -74,8 +74,8 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
     validator: (vs) => {
       if (vs.calculated && vs.type === "File")
         return req.__("Calculated fields cannot have File type");
-      if (vs.calculated && vs.type.startsWith("Key to"))
-        return req.__("Calculated fields cannot have Key type");
+      if (vs.calculated && !vs.stored && vs.type.startsWith("Key to"))
+        return req.__("Calculated non-stored fields cannot have Key type");
     },
     fields: [
       new Field({
@@ -310,7 +310,12 @@ const fieldFlow = (req) =>
           const nrows = await table.countRows({});
           const existing_fields = table.getFields();
           const existingNames = existing_fields.map((f) => f.name);
-          const fkey_opts = ["File", ...tables.map((t) => `Key to ${t.name}`)];
+          const fkey_opts = [
+            "File",
+            ...tables
+              .filter((t) => !t.provider_name && !t.external)
+              .map((t) => `Key to ${t.name}`),
+          ];
           const form = await fieldForm(
             req,
             fkey_opts,
@@ -1196,6 +1201,10 @@ router.post(
     formFields.forEach((ff) => {
       ff.class = ff.class ? `${ff.class} item-menu` : "item-menu";
     });
+    if (req.query?.accept == "json") {
+      res.json(formFields);
+      return;
+    }
 
     const form = new Form({
       formStyle: "vert",

package/routes/viewedit.js

@@ -18,6 +18,7 @@ const {
   error_catcher,
   addOnDoneRedirect,
   is_relative_url,
+  setTenant,
 } = require("./utils.js");
 const { setTableRefs, viewsList } = require("./common_lists");
 const Form = require("@saltcorn/data/models/form");
@@ -631,6 +632,7 @@ router.get(
 router.post(
   "/config/:name",
   isAdmin,
+  setTenant,
   error_catcher(async (req, res) => {
     const { name } = req.params;
 
@@ -769,6 +771,7 @@ router.post(
 router.post(
   "/saveconfig/:viewname",
   isAdmin,
+  setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
 

package/tests/view.test.js

@@ -677,6 +677,197 @@ describe("many to many relations", () => {
   });
 });
 
+describe("relation path to query and state", () => {
+  it("ChildList one layer", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    // my_department
+    await request(app)
+      .get(`/view/show_department_with_employee_list?id=1`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/list_employees?department=1"))
+      // embedded list
+      .expect(toInclude("my_department"))
+      .expect(toNotInclude("department_without_employees"))
+      .expect(toInclude("manager"))
+      .expect(toInclude("my_employee"))
+      .expect(toInclude("/view/create_employee?department=1"));
+
+    // department_without_employees
+    await request(app)
+      .get(`/view/show_department_with_employee_list?id=2`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/list_employees?department=2"))
+      // embedded list
+      .expect(toNotInclude("my_department"))
+      .expect(toNotInclude("department_without_employees"))
+      .expect(toNotInclude("manager"))
+      .expect(toNotInclude("my_employee"))
+      .expect(toNotInclude("/view/create_employee?department=1"));
+  });
+
+  it("ChildList two layers", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/view/show_cover_with_artist_on_album?id=1`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(
+        toInclude(
+          "/view/artist_plays_on_album_list?artist_plays_on_album.album.albums.cover=1"
+        )
+      )
+      // embedded list
+      .expect(toInclude("artist A"))
+      .expect(toInclude("artist B"))
+      .expect(toInclude("album A"));
+
+    await request(app)
+      .get(`/view/show_cover_with_artist_on_album?id=2`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(
+        toInclude(
+          "/view/artist_plays_on_album_list?artist_plays_on_album.album.albums.cover=2"
+        )
+      )
+      // embedded list
+      .expect(toInclude("artist A"))
+      .expect(toNotInclude("artist B"))
+      .expect(toInclude("album B"));
+
+    await request(app)
+      .get(`/view/show_cover_with_artist_on_album?id=3`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(
+        toInclude(
+          "/view/artist_plays_on_album_list?artist_plays_on_album.album.albums.cover=3"
+        )
+      )
+      // embedded list
+      .expect(toNotInclude("artist A"))
+      .expect(toNotInclude("artist B"))
+      .expect(toNotInclude("album A"))
+      .expect(toNotInclude("album B"));
+  });
+
+  it("OneToOneSHow", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/view/show_cover_with_album?id=1`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/show_album?cover=1"))
+      // embedded show
+      .expect(toInclude("album A"));
+
+    await request(app)
+      .get(`/view/show_cover_with_album?id=2`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/show_album?cover=2"))
+      // embedded show
+      .expect(toInclude("blue cover"))
+      .expect(toInclude("album B"));
+
+    await request(app)
+      .get(`/view/show_cover_with_album?id=3`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/show_album?cover=3"))
+      // embedded show
+      .expect(toInclude("red cover"))
+      .expect(toInclude("No row selected"));
+  });
+
+  it("Own", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/view/show_artist_with_edit_artist?id=1`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/edit_artist?id=1"))
+      // embedded edit
+      .expect(toInclude(`value="artist A"`));
+
+    await request(app)
+      .get(`/view/show_artist_with_edit_artist?id=2`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/edit_artist?id=2"))
+      // embedded edit
+      .expect(toInclude(`value="artist B"`));
+  });
+
+  it("Parent", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/view/show_album_with_cover?id=1`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/show_cover?id=1"))
+      // embedded show
+      .expect(toInclude("green cover"));
+
+    await request(app)
+      .get(`/view/show_album_with_cover?id=2`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toInclude("/view/show_cover?id=2"))
+      // embedded show
+      .expect(toInclude("blue cover"));
+
+    await request(app)
+      .get(`/view/show_album_with_cover?id=3`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(toNotInclude("/view/show_cover?id=3"))
+      // embedded show
+      .expect(toInclude("No row selected"));
+  });
+
+  it("RelationPath", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get(`/view/track_on_album_with_artists_on_album?id=1`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(
+        toInclude(
+          "/view/artist_plays_on_album_list?.tracks_on_album.album.artist_plays_on_album$album=1"
+        )
+      )
+      // embedded show
+      .expect(toInclude("artist A"))
+      .expect(toInclude("artist B"))
+      .expect(toInclude("album A"))
+      .expect(toNotInclude("album B"));
+
+    await request(app)
+      .get(`/view/track_on_album_with_artists_on_album?id=2`)
+      .set("Cookie", loginCookie)
+      // view link
+      .expect(
+        toInclude(
+          "/view/artist_plays_on_album_list?.tracks_on_album.album.artist_plays_on_album$album=2"
+        )
+      )
+      // embedded show
+      .expect(toInclude("artist A"))
+      .expect(toNotInclude("artist B"))
+      .expect(toNotInclude("album A"))
+      .expect(toInclude("album B"));
+  });
+});
+
 describe("legacy relations with relation path", () => {
   it("Independent feed", async () => {
     const app = await getApp({ disableCsrf: true });