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

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.1-beta.18",
+  "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.18",
-    "@saltcorn/builder": "0.9.1-beta.18",
-    "@saltcorn/data": "0.9.1-beta.18",
-    "@saltcorn/admin-models": "0.9.1-beta.18",
-    "@saltcorn/filemanager": "0.9.1-beta.18",
-    "@saltcorn/markup": "0.9.1-beta.18",
-    "@saltcorn/sbadmin2": "0.9.1-beta.18",
+    "@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,36 +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 }));
+    await handle(res.error, (text) =>
+      notifyAlert({ type: "danger", text: text })
+    );
   if (res.notify_success)
-    handle(res.notify_success, (text) =>
+    await handle(res.notify_success, (text) =>
       notifyAlert({ type: "success", text: text })
     );
-  if (res.eval_js) handle(res.eval_js, eval_it);
+  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");