@saltcorn/server 0.9.3-beta.5 → 0.9.3-beta.7

package/package.json

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

package/public/saltcorn-common.js

@@ -976,20 +976,31 @@ function enable_codemirror(f) {
     success: f,
   });
 }
-function tristateClick(nm) {
-  var current = $(`button#trib${nm}`).html();
+function tristateClick(e) {
+  const btn = $(e);
+  const input = btn.prev();
+  var current = input.val();
   switch (current) {
     case "?":
-      $(`button#trib${nm}`).html("T");
-      $(`input#input${nm}`).val("on");
+      btn
+        .html(btn.attr("data-true-label") || "T")
+        .removeClass(["btn-danger", "btn-secondary"])
+        .addClass("btn-success");
+      input.val("on").trigger("change");
       break;
-    case "T":
-      $(`button#trib${nm}`).html("F");
-      $(`input#input${nm}`).val("off");
+    case "on":
+      btn
+        .html(btn.attr("data-false-label") || "F")
+        .removeClass(["btn-success", "btn-secondary"])
+        .addClass("btn-danger");
+      input.val("off").trigger("change");
       break;
     default:
-      $(`button#trib${nm}`).html("?");
-      $(`input#input${nm}`).val("?");
+      btn
+        .html(btn.attr("data-null-label") || "?")
+        .removeClass(["btn-success", "btn-danger"])
+        .addClass("btn-secondary");
+      input.val("?").trigger("change");
       break;
   }
 }
@@ -1158,7 +1169,7 @@ async function common_done(res, viewname, isWeb = true) {
     });
   }
   if (res.set_fields && viewname) {
-    const form = $(`form[data-viewname=${viewname}]`);
+    const form = $(`form[data-viewname="${viewname}"]`);
     if (form.length === 0 && set_state_fields) {
       // assume this is a filter
       set_state_fields(

package/routes/actions.js

@@ -628,7 +628,10 @@ router.get(
     let table, row;
     if (trigger.table_id) {
       table = Table.findOne({ id: trigger.table_id });
-      row = await table.getRow({}, { orderBy: "RANDOM()" });
+      row = await table.getRow(
+        {},
+        { orderBy: "RANDOM()", forUser: req.user, forPublic: !req.user }
+      );
     }
     let runres;
 

package/routes/delete.js

@@ -39,7 +39,10 @@ router.post(
       if (role <= table.min_role_write)
         await table.deleteRows({ id }, req.user || { role_id: 100 });
       else if (table.ownership_field_id && req.user) {
-        const row = await table.getRow({ id });
+        const row = await table.getRow(
+          { id },
+          { forUser: req.user, forPublic: !req.user }
+        );
         if (row && table.is_owner(req.user, row))
           await table.deleteRows({ id }, req.user || { role_id: 100 });
         else req.flash("error", req.__("Not authorized"));

package/routes/fields.js

@@ -933,9 +933,12 @@ router.post(
             const reftable2 = Table.findOne({
               name: targetField.reftable_name,
             });
-            const refRow2 = await reftable2.getRow({
-              [reftable2.pk_name]: refRow[kpath[1]],
-            });
+            const refRow2 = await reftable2.getRow(
+              {
+                [reftable2.pk_name]: refRow[kpath[1]],
+              },
+              { forUser: req.user, forPublic: !req.user }
+            );
             if (refRow2) {
               res.send(
                 text(`${refRow2[targetField.attributes.summary_field]}`)
@@ -974,7 +977,10 @@ router.post(
               return;
             }
             const q = { [reftable.pk_name]: oldRow[ref] };
-            oldRow = await reftable.getRow(q);
+            oldRow = await reftable.getRow(q, {
+              forUser: req.user,
+              forPublic: !req.user,
+            });
             oldTable = reftable;
           }
         }
@@ -1010,14 +1016,20 @@ router.post(
         )) {
           const jf = table.getField(ref);
           const jtable = Table.findOne(jf.reftable_name);
-          const jrow = await jtable.getRow({ [jtable.pk_name]: row[ref] });
+          const jrow = await jtable.getRow(
+            { [jtable.pk_name]: row[ref] },
+            { forUser: req.user, forPublic: !req.user }
+          );
           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],
-            });
+            const jrow2 = await jtable2.getRow(
+              {
+                [jtable2.pk_name]: jrow[through],
+              },
+              { forUser: req.user, forPublic: !req.user }
+            );
             row[ref][through] = jrow2;
           }
         }
@@ -1071,11 +1083,11 @@ router.post(
       }
       const reffields = await reftable.getFields();
       field = reffields.find((f) => f.name === targetNm);
-      row = await reftable.getRow({});
+      row = await reftable.getRow({}, { forUser: req.user });
       value = row && row[targetNm];
     } else {
       field = fields.find((f) => f.name === fieldName);
-      row = await table.getRow({});
+      row = await table.getRow({}, { forUser: req.user });
       value = row && row[fieldName];
     }
 

package/routes/packs.js

@@ -5,7 +5,7 @@
  */
 
 const Router = require("express-promise-router");
-const { isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 const { renderForm } = require("@saltcorn/markup");
 const Table = require("@saltcorn/data/models/table");
 const Form = require("@saltcorn/data/models/form");
@@ -388,6 +388,7 @@ router.get(
  */
 router.post(
   "/install",
+  setTenant, // TODO why is this needed?????
   isAdmin,
   error_catcher(async (req, res) => {
     var pack, error;

package/routes/tables.js

@@ -707,7 +707,7 @@ router.get(
       res.redirect(`/table`);
       return;
     }
-    const nrows = await table.countRows();
+    const nrows = await table.countRows({}, { forUser: req.user });
     const fields = table.getFields();
     const { child_relations } = await table.get_child_relations();
     const inbound_refs = [
@@ -1282,7 +1282,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { name } = req.params;
     const table = Table.findOne({ name });
-    const rows = await table.getRows({}, { orderBy: "id" });
+    const rows = await table.getRows({}, { orderBy: "id", forUser: req.user });
     res.setHeader("Content-Type", "text/csv");
     res.setHeader("Content-Disposition", `attachment; filename="${name}.csv"`);
     res.setHeader("Cache-Control", "no-cache");

package/routes/view.js

@@ -160,7 +160,7 @@ router.post(
                 ? { id: view.table_id }
                 : { name: view.exttable_name }
             );
-          row = await table.getRow({});
+          row = await table.getRow({}, { forUser: req.user });
         }
         if (row) query[sf.name] = row[sf.name];
       }