@saltcorn/server 1.0.0-beta.16 → 1.0.0-beta.18

package/app.js

@@ -306,13 +306,7 @@ const getApp = async (opts = {}) => {
             ? new Date(u.last_mobile_login).valueOf()
             : u.last_mobile_login) <= jwt_payload.iat
         ) {
-          return done(null, {
-            email: u.email,
-            id: u.id,
-            role_id: u.role_id,
-            language: u.language,
-            tenant: db.getTenantSchema(),
-          });
+          return done(null, u.session_object);
         } else {
           return done(null, { role_id: 100 });
         }

package/help/Aggregation where formula.tmd

@@ -0,0 +1,11 @@
+The where formula allows you to restrict the rows included in the aggregations. 
+
+The formula should take the form of a JavaScript boolean expression such as
+`a === b` or `x>y && w==1` when is based on the row values in the rows in the target table for 
+inclusion in the aggregation. For instance, if you are displaying aggregations about 
+a row from a Projects table, and a Task table has a key to projects field and a Boolean
+field called `completed`, you may want to show the number of not-completed tasks for the Project.
+In this case use the where expression `completed == false`.
+
+You cannot here use view state or values from the row about which you are displaying aggregations. However, 
+if a user is logged in, the `user` variable can be used to access user fields, such as `user.id`.

package/locales/en.json

@@ -1473,5 +1473,6 @@
 	"Select tag": "Select tag",
 	"Invalid build directory path": "Invalid build directory path",
 	"Invalid build directory name": "Invalid build directory name",
-	"clean node_modules": "clean node_modules"
-}
+	"clean node_modules": "clean node_modules",
+	"After delete": "After delete"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.18",
   "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": "1.0.0-beta.16",
-    "@saltcorn/builder": "1.0.0-beta.16",
-    "@saltcorn/data": "1.0.0-beta.16",
-    "@saltcorn/admin-models": "1.0.0-beta.16",
-    "@saltcorn/filemanager": "1.0.0-beta.16",
-    "@saltcorn/markup": "1.0.0-beta.16",
-    "@saltcorn/plugins-loader": "1.0.0-beta.16",
-    "@saltcorn/sbadmin2": "1.0.0-beta.16",
+    "@saltcorn/base-plugin": "1.0.0-beta.18",
+    "@saltcorn/builder": "1.0.0-beta.18",
+    "@saltcorn/data": "1.0.0-beta.18",
+    "@saltcorn/admin-models": "1.0.0-beta.18",
+    "@saltcorn/filemanager": "1.0.0-beta.18",
+    "@saltcorn/markup": "1.0.0-beta.18",
+    "@saltcorn/plugins-loader": "1.0.0-beta.18",
+    "@saltcorn/sbadmin2": "1.0.0-beta.18",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -55,7 +55,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.1",
-    "resize-with-sharp-or-jimp": "0.1.7",
+    "resize-with-sharp-or-jimp": "0.1.8",
     "semver": "^7.6.0",
     "socket.io": "4.6.0",
     "systeminformation": "^5.21.7",

package/public/saltcorn-common.js

@@ -1870,6 +1870,8 @@ function close_saltcorn_modal() {
   }
 }
 
+let _sc_currently_reloading;
+
 function reload_embedded_view(viewname, new_query_string) {
   const isNode = getIsNode();
   const updater = ($e, res) => {
@@ -1897,15 +1899,19 @@ function reload_embedded_view(viewname, new_query_string) {
       url = url.split("?")[0] + "?" + new_query_string;
     }
     if (isNode) {
+      if (url === _sc_currently_reloading) return;
+      _sc_currently_reloading = url;
       $.ajax(url, {
         headers: {
           pjaxpageload: "true",
           localizedstate: "true", //no admin bar
         },
         success: function (res, textStatus, request) {
+          _sc_currently_reloading = null;
           updater($e, res);
         },
         error: function (res) {
+          _sc_currently_reloading = null;
           if (!checkNetworkError(res))
             notifyAlert({ type: "danger", text: res.responseText });
         },

package/public/saltcorn.js

@@ -629,6 +629,7 @@ function checkNetworkError(e) {
     setTimeout(() => {
       scNetworkErrorSignaled = false;
     }, 1000);
+    console.error("Network error", e);
     notifyAlert({
       type: "danger",
       text: "Network connection error",

package/routes/actions.js

@@ -546,7 +546,10 @@ router.get(
     let trigger;
     let id = parseInt(idorname);
     if (id) trigger = await Trigger.findOne({ id });
-    else trigger = await Trigger.findOne({ name: idorname });
+    else {
+      trigger = await Trigger.findOne({ name: idorname });
+      id = trigger.id;
+    }
 
     if (!trigger) {
       req.flash("warning", req.__("Action not found"));

package/routes/admin.js

@@ -3224,8 +3224,8 @@ router.post(
   error_catcher(async (req, res) => {
     const state = getState();
     const child = spawn(
-      "docker",
-      ["image", "pull", "saltcorn/cordova-builder:latest"],
+      `${process.env.DOCKER_BIN ? `${process.env.DOCKER_BIN}/` : ""}docker`,
+      ["pull", "saltcorn/cordova-builder:latest"],
       {
         stdio: ["ignore", "pipe", "pipe"],
         cwd: ".",

package/routes/tables.js

@@ -798,7 +798,7 @@ router.get(
             key: (r) => attribBadges(r),
           },
           { label: req.__("Variable name"), key: (t) => code(t.name) },
-          ...(table.external || db.isSQLite
+          ...(table.external
             ? []
             : [
                 {