@saltcorn/server 0.9.1-beta.3 → 0.9.1-beta.5

package/help/Extra state formula.tmd

@@ -33,6 +33,9 @@ must be enclosed in quotes (single, double or
 [backtick](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals))). 
 You can also as the value use a more complex JavaScript expression.
 
+For examples of how you can use these values for greater than/less than, 
+or-conditions or case insensitivity, see [here](https://saltcorn.github.io/saltcorn/classes/_saltcorn_data.models.Table-1.html#md:querying-table-rows).
+
 You can refer to the logged in user using the variable name user. 
 This is an object and you must use the dot to access user fields,
 e.g. user.id for the logged in users id. A very common scenario 
@@ -60,3 +63,9 @@ in this case the table {{srcTable.name}}:
 
 {{# } }}
 
+The state values from the query string can also be accessed, by preceeding the 
+variable name by a dollar sign (in pages and Show views). For instance if your URL ends in `?id=45&foo=1`, 
+you can access the value of `foo` (here 1) as `$foo`. In Filter views, there is no 
+underlying row and the purpose of the view is fundamentally to manipulate the state
+so the state in extra state formulae is accessed without dollar sign; in the 
+previous example `foo` instead of `$foo`.

package/package.json

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

package/public/saltcorn-common.js

@@ -285,9 +285,13 @@ function apply_showif() {
             .closest(".form-namespace")
             .find("input[name=_columndef]");
           try {
-            const def = JSON.parse($def.val());
-            def[k] = v;
-            $def.val(JSON.stringify(def));
+            const defval = $def.val();
+            const def =
+              typeof defval === "undefined" ? undefined : JSON.parse(defval);
+            if (def) {
+              def[k] = v;
+              $def.val(JSON.stringify(def));
+            }
           } catch (e) {
             console.error("Invalid json", e);
           }
@@ -393,21 +397,26 @@ function get_form_record(e_in, select_labels) {
     }
 
   e.find("input[name],select[name],textarea[name]").each(function () {
-    const name = $(this).attr("data-fieldname") || $(this).attr("name");
-    if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
-      rec[name] = $(this).find("option:selected").text();
-    else if ($(this).prop("type") === "checkbox")
-      rec[name] = $(this).prop("checked");
-    else rec[name] = $(this).val();
+    const $this = $(this);
+    const name = $this.attr("data-fieldname") || $this.attr("name");
+    if (select_labels && $this.prop("tagName").toLowerCase() === "select")
+      rec[name] = $this.find("option:selected").text();
+    else if ($this.prop("type") === "checkbox")
+      rec[name] = $this.prop("checked");
+    else if ($this.prop("type") === "radio" && !$this.prop("checked")) {
+      //do nothing
+    } else rec[name] = $this.val();
   });
   return rec;
 }
 function showIfFormulaInputs(e, fml) {
   const rec = get_form_record(e);
   try {
-    return new Function(`{${Object.keys(rec).join(",")}}`, "return " + fml)(
-      rec
-    );
+    return new Function(
+      "row",
+      `{${Object.keys(rec).join(",")}}`,
+      "return " + fml
+    )(rec, rec);
   } catch (e) {
     throw new Error(`Error in evaluating showIf formula ${fml}: ${e.message}`);
   }
@@ -1380,3 +1389,35 @@ function check_saltcorn_notifications() {
     }
   });
 }
+
+function disable_inactive_tab_inputs(id) {
+  setTimeout(() => {
+    const isAccordion = $(`#${id}`).hasClass("accordion");
+    const iterElem = isAccordion
+      ? `#${id} div.accordion-item .accordion-button`
+      : `#${id} li a`;
+    $(iterElem).each(function () {
+      const isActive = isAccordion
+        ? !$(this).hasClass("collapsed")
+        : $(this).hasClass("active");
+      const target = isAccordion
+        ? $(this).attr("data-bs-target")
+        : $(this).attr("href");
+      if (isActive) {
+        //activate previously disabled
+        $(target)
+          .find("[disabled-by-tab]")
+          .prop("disabled", false)
+          .removeAttr("disabled-by-tab");
+      } else {
+        //disable all input
+        $(target)
+          .find(
+            "input:not(:disabled), textarea:not(:disabled), button:not(:disabled), select:not(:disabled)"
+          )
+          .prop("disabled", true)
+          .attr("disabled-by-tab", "1");
+      }
+    });
+  }, 100);
+}

package/public/saltcorn.css

@@ -241,6 +241,7 @@ input.hideupdownbtns::-webkit-inner-spin-button {
 
 input.hideupdownbtns[type="number"] {
   -moz-appearance: textfield;
+  text-align: center;
 }
 
 section.range-slider {

package/routes/fields.js

@@ -996,6 +996,30 @@ router.post(
         result = row[field.name];
       } else if (field.stored) {
         const f = get_async_expression_function(formula, fields);
+        //are there join fields in formula?
+        const joinFields = {};
+        add_free_variables_to_joinfields(
+          freeVariables(formula),
+          joinFields,
+          table.fields
+        );
+        for (const { target, ref, through, rename_object } of Object.values(
+          joinFields
+        )) {
+          const jf = table.getField(ref);
+          const jtable = Table.findOne(jf.reftable_name);
+          const jrow = await jtable.getRow({ [jtable.pk_name]: row[ref] });
+          row[ref] = jrow;
+          if (through) {
+            const jf2 = jtable.getField(through);
+            const jtable2 = Table.findOne(jf2.reftable_name);
+            const jrow2 = await jtable2.getRow({
+              [jtable2.pk_name]: jrow[through],
+            });
+            row[ref][through] = jrow2;
+          }
+        }
+
         result = await f(row);
       } else {
         const f = get_expression_function(formula, fields);

package/tests/fields.test.js

@@ -364,7 +364,43 @@ describe("Field Endpoints", () => {
     await request(app)
       .post("/field/show-calculated/books/pagesp1/show")
       .set("Cookie", loginCookie)
-      .expect((r) => +r.body > 1);
+      .expect((r) => +r.body > 2);
+  });
+  it("should show calculated with single joinfield", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "patients" });
+    await Field.create({
+      table,
+      label: "pagesp1",
+      type: "Integer",
+      calculated: true,
+      stored: true,
+      expression: "favbook.pages+1",
+    });
+    const app = await getApp({ disableCsrf: true });
+
+    await request(app)
+      .post("/field/show-calculated/patients/pagesp1/show")
+      .set("Cookie", loginCookie)
+      .expect((r) => +r.body > 2);
+  });
+  it("should show calculated with double joinfield", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "readings" });
+    await Field.create({
+      table,
+      label: "pagesp1",
+      type: "Integer",
+      calculated: true,
+      stored: true,
+      expression: "patient_id.favbook.pages+1",
+    });
+    const app = await getApp({ disableCsrf: true });
+
+    await request(app)
+      .post("/field/show-calculated/readings/pagesp1/show")
+      .set("Cookie", loginCookie)
+      .expect((r) => +r.body > 2);
   });
 });
 

package/tests/table.test.js

@@ -17,8 +17,12 @@ const db = require("@saltcorn/data/db");
 const User = require("@saltcorn/data/models/user");
 const { plugin_with_routes } = require("@saltcorn/data/tests/mocks");
 const { getState } = require("@saltcorn/data/db/state");
+const { sleep } = require("@saltcorn/data/utils");
 
-afterAll(db.close);
+afterAll(async () => {
+  await sleep(200);
+  await db.close();
+});
 beforeAll(async () => {
   await resetToFixtures();
 });