@saltcorn/server 0.9.1-beta.17 → 0.9.1-beta.19

package/auth/routes.js

@@ -1623,12 +1623,24 @@ router.post(
       if (user_settings_form) {
         const view = await View.findOne({ name: user_settings_form });
         if (view) {
+          const fakeRes = {
+            status() {},
+            sendWrap() {},
+            json() {},
+            redirect() {},
+          };
           await view.runPost({ id: user.id }, req.body, {
             req,
-            res,
+            res: fakeRes,
             redirect: "/auth/settings",
           });
-          req.flash("success", req.__("User settings changed"));
+          const u = await User.findForSession({ id: user.id });
+          req.login(u.session_object, function (err) {
+            if (err) req.flash("danger", err);
+            else req.flash("success", req.__("User settings changed"));
+
+            res.redirect("/auth/settings");
+          });
         }
       } else {
         res.redirect("/auth/settings");

package/locales/en.json

@@ -1284,5 +1284,6 @@
 	"Set theme for each user role »": "Set theme for each user role »",
 	"Available themes": "Available themes",
 	"Install more themes »": "Install more themes »",
-	"Configure action": "Configure action"
+	"Configure action": "Configure action",
+	"No changes detected, snapshot skipped": "No changes detected, snapshot skipped"
 }

package/package.json

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

package/public/saltcorn-common.js

@@ -1083,32 +1083,39 @@ function restore_old_button(btnId) {
   btn.removeData("old-text");
 }
 
-function common_done(res, viewname, isWeb = true) {
-  const handle = (element, fn) => {
-    if (Array.isArray(element)) for (const current of element) fn(current);
-    else fn(element);
+async function common_done(res, viewname, isWeb = true) {
+  const handle = async (element, fn) => {
+    if (Array.isArray(element))
+      for (const current of element) await fn(current);
+    else await fn(element);
   };
-  const eval_it = (s) => {
+  const eval_it = async (s) => {
     if (res.row && res.field_names) {
       const f = new Function(`viewname, row, {${res.field_names}}`, s);
-      const evalres = f(viewname, res.row, res.row);
-      if (evalres) common_done(evalres, viewname, isWeb);
+      const evalres = await f(viewname, res.row, res.row);
+      if (evalres) await common_done(evalres, viewname, isWeb);
     } else {
       const f = new Function(`viewname`, s);
-      const evalres = f(viewname);
-      if (evalres) common_done(evalres, viewname, isWeb);
+      const evalres = await f(viewname);
+      if (evalres) await common_done(evalres, viewname, isWeb);
     }
   };
-  if (res.notify) handle(res.notify, notifyAlert);
+  if (res.notify) await handle(res.notify, notifyAlert);
   if (res.error)
-    handle(res.error, (text) => notifyAlert({ type: "danger", text: text }));
-  if (res.eval_js) handle(res.eval_js, eval_it);
+    await handle(res.error, (text) =>
+      notifyAlert({ type: "danger", text: text })
+    );
+  if (res.notify_success)
+    await handle(res.notify_success, (text) =>
+      notifyAlert({ type: "success", text: text })
+    );
+  if (res.eval_js) await handle(res.eval_js, eval_it);
 
   if (res.reload_page) {
     (isWeb ? location : parent).reload(); //TODO notify to cookie if reload or goto
   }
   if (res.download) {
-    handle(res.download, (download) => {
+    await handle(res.download, (download) => {
       const dataurl = `data:${
         download.mimetype || "application/octet-stream"
       };base64,${download.blob}`;

package/public/saltcorn.js

@@ -280,6 +280,7 @@ function globalErrorCatcher(message, source, lineno, colno, error) {
 }
 
 function close_saltcorn_modal() {
+  $("#scmodal").off("hidden.bs.modal");
   var myModalEl = document.getElementById("scmodal");
   if (!myModalEl) return;
   var modal = bootstrap.Modal.getInstance(myModalEl);
@@ -396,6 +397,11 @@ function submitWithAjax(e) {
       notifyAlert({ type: "danger", text: res.responseJSON.error });
   });
 }
+function saveAndContinueAsync(e) {
+  return new Promise((resolve, reject) => {
+    saveAndContinue(e, (x) => resolve(x));
+  });
+}
 
 function saveAndContinue(e, k) {
   var form = $(e).closest("form");
@@ -422,6 +428,9 @@ function saveAndContinue(e, k) {
       if (res.notify) {
         notifyAlert(res.notify);
       }
+      if (res.notify_success) {
+        notifyAlert({ type: "success", text: res.notify });
+      }
       if (res.reload_page) {
         location.reload(); //TODO notify to cookie if reload or goto
       }

package/routes/pageedit.js

@@ -220,6 +220,7 @@ const pageBuilderData = async (req, context) => {
     library,
     min_role: context.min_role,
     actionConfigForms,
+    allowMultiStepAction: true,
     page_name: context.name,
     page_id: context.id,
     mode: "page",

package/routes/view.js

@@ -10,7 +10,7 @@ const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
 const Trigger = require("@saltcorn/data/models/trigger");
 
-const { text, style } = require("@saltcorn/markup/tags");
+const { text, style, div } = require("@saltcorn/markup/tags");
 const {
   isAdmin,
   error_catcher,
@@ -70,11 +70,11 @@ router.get(
     }
     const isModal = req.headers?.saltcornmodalrequest;
 
-    const contents = await view.run_possibly_on_page(query, req, res);
+    const contents0 = await view.run_possibly_on_page(query, req, res);
     const title =
       isModal && view.attributes?.popup_title
         ? view.attributes?.popup_title
-        : scan_for_page_title(contents, view.name);
+        : scan_for_page_title(contents0, view.name);
     if (isModal && view.attributes?.popup_width)
       res.set(
         "SaltcornModalWidth",
@@ -95,9 +95,21 @@ router.get(
         name: viewname,
         render_time: ms,
       });
-    if (typeof contents === "object" && contents.goto)
-      res.redirect(contents.goto);
-    else
+    if (typeof contents0 === "object" && contents0.goto)
+      res.redirect(contents0.goto);
+    else {
+      const qs = "";
+      const contents =
+        typeof contents0 === "string" && !req.xhr
+          ? div(
+              {
+                class: "d-inline",
+                "data-sc-embed-viewname": view.name,
+                "data-sc-view-source": req.originalUrl,
+              },
+              contents0
+            )
+          : contents0;
       res.sendWrap(
         title,
         add_edit_bar({
@@ -112,6 +124,7 @@ router.get(
           table: view.table_id || view.exttable_name,
         })
       );
+    }
   })
 );