@saltcorn/server 1.1.0-beta.12 → 1.1.0-beta.14

package/load_plugins.js

@@ -97,7 +97,10 @@ const loadPlugin = async (plugin, force, forceFetch) => {
     }
   }
   // load plugin
-  const loader = new PluginInstaller(plugin);
+  const loader = new PluginInstaller(plugin, {
+    scVersion: packagejson.version,
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
+  });
   const res = await loader.install(force);
   const configuration =
     typeof plugin.configuration === "string"
@@ -162,7 +165,10 @@ const reloadAuthFromRoot = () => {
  * @returns {Promise<{plugin_module: *}|{plugin_module: any}>}
  */
 const requirePlugin = async (plugin, force) => {
-  const loader = new PluginInstaller(plugin);
+  const loader = new PluginInstaller(plugin, {
+    scVersion: packagejson.version,
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
+  });
   return await loader.install(force);
 };
 
@@ -231,7 +237,7 @@ const loadAndSaveNewPlugin = async (
   const loadMsgs = [];
   const loader = new PluginInstaller(plugin, {
     scVersion: packagejson.version,
-    envVars: { PUPPETEER_SKIP_DOWNLOAD: "1" },
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
   });
   const { version, plugin_module, location, loadedWithReload, msgs } =
     await loader.install(force);

package/locales/en.json

@@ -1497,5 +1497,18 @@
 	"Capacitor builder": "Capacitor builder",
 	"Pulling the capacitor-builder docker image...": "Pulling the capacitor-builder docker image...",
 	"Pull done with code %s": "Pull done with code %s",
-	"Default locale": "Default locale"
+	"Default locale": "Default locale",
+	"Next step": "Next step",
+	"Step name": "Step name",
+	"Step saved": "Step saved",
+	"Initial step": "Initial step",
+	"Confirm leaving unsaved": "Confirm leaving unsaved",
+	"Ask the user to confirm if they close a tab with unsaved changes": "Ask the user to confirm if they close a tab with unsaved changes",
+	"Workflow runs": "Workflow runs",
+	"Workflow run": "Workflow run",
+	"Share to enabled": "Share to enabled",
+	"Enable the share to feature": "Enable the share to feature",
+	"Allocate new row": "Allocate new row",
+	"If the view is run without existing row, allocate a new row on load. Defaults must be set on all required fields.": "If the view is run without existing row, allocate a new row on load. Defaults must be set on all required fields.",
+	"Step traces": "Step traces"
 }

package/locales/pl.json

@@ -57,7 +57,7 @@
   "If you did not request this, please ignore this email.": "Jeżeli nie żądałeś tego, nie klikaj w poniższy link.",
   "Your password will not change until you access the link above and set a new one.": "Twoje hasło nie ulegnie zmianie dopóki nie klikniesz w powyższy link i nie ustawisz nowego hasła.",
   "Change my password": "Zmień moje hasło",
-  "Must be admin": "Musi być adminem",
+  "Must be admin": "Musisz być adminem",
   "Site identity": "Tożsamość strony",
   "Authentication": "Uwierzytelnianie",
   "Development": "Development",
@@ -1491,5 +1491,22 @@
 	"Login and signup views should be accessible by public users": "Widoki logowania i rejestracji powinny być dostępne dla użytkowników publicznych",
 	"Shared: %s": "Udostępnione: %s",
 	"Sharing not enabled": "Udostępnianie nie jest włączone",
-	"You must be logged in to share": "Musisz być zalogowany, aby udostępniać"
+	"You must be logged in to share": "Musisz być zalogowany, aby udostępniać",
+	"Fluid layout": "Układ elastyczny",
+	"Request fluid layout from theme for a wider display for this page": "Poproś o elastyczny układ z motywu, aby zapewnić szerszy widok dla tej strony",
+	"Location of view to create new row": "Lokalizacja widoku do utworzenia nowego wiersza",
+	"Capacitor builder": "Capacitor builder",
+	"Pulling the capacitor-builder docker image...": "Pobieranie obrazu Docker capacitor-builder...",
+	"Pull done with code %s": "Pobieranie zakończone z kodem %s",
+	"Default locale": "Domyślny język/region",
+	"Next step": "Następny krok",
+	"Step name": "Nazwa kroku",
+	"Step saved": "Krok zapisany",
+	"Initial step": "Początkowy krok",
+	"Confirm leaving unsaved": "Potwierdzenie opuszczenia bez zapisania",
+	"Ask the user to confirm if they close a tab with unsaved changes": "Poproś użytkownika o potwierdzenie, czy chce zamknąć kartę z niezapisanymi zmianami",
+	"Workflow runs": "Przepływ pracy jest uruchomiony",
+	"Workflow run": "Uruchomienie przepływu pracy",
+	"Share to enabled": "Udostępnij włączone",
+	"Enable the share to feature": "Włącz udostępnianie funkcji"
 }

package/markup/admin.js

@@ -310,6 +310,7 @@ const send_events_page = (args) => {
       { text: "Custom", href: "/eventlog/custom" },
       { text: "Settings", href: "/eventlog/settings" },
       { text: "Event log", href: "/eventlog" },
+      { text: "Workflow runs", href: "/actions/runs" },
       ...(isRoot ? [{ text: "Crash log", href: "/crashlog" }] : []),
     ],
     ...args,

package/package.json

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

package/public/saltcorn-common.js

@@ -40,6 +40,19 @@ $(window).resize(() => {
   setScreenInfoCookie();
 });
 
+function get_current_state_url(e) {
+  const localizer = e ? $(e).closest("[data-sc-local-state]") : [];
+  let $modal = $("#scmodal");
+  if (localizer.length) {
+    const localState = localizer.attr("data-sc-local-state") || "";
+    return localState;
+  } else if ($modal.length === 0 || !$modal.hasClass("show"))
+    return getIsNode()
+      ? window.location.href
+      : parent.saltcorn.mobileApp.navigation.currentUrl();
+  else return $modal.prop("data-modal-state");
+}
+
 //avoids hiding in overflow:hidden
 function init_bs5_dropdowns() {
   $("body").on(
@@ -704,7 +717,7 @@ function doMobileTransforms() {
     href: [
       {
         web: "javascript:history.back()",
-        mobile: "javascript:parent.goBack()",
+        mobile: "javascript:parent.saltcorn.mobileApp.navigation.goBack()",
       },
       {
         web: "javascript:ajax_modal",
@@ -714,7 +727,7 @@ function doMobileTransforms() {
     onclick: [
       {
         web: "history.back()",
-        mobile: "parent.goBack()",
+        mobile: "parent.saltcorn.mobileApp.navigation.goBack()",
       },
       {
         web: "ajax_modal",
@@ -823,48 +836,46 @@ function doMobileTransforms() {
   });
 
   $("[mobile-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-img-path");
-      const base64Encoded = await parent.loadEncodedFile(fileId);
-      this.src = base64Encoded;
-    }
+    const fileId = $(this).attr("mobile-img-path");
+    const base64Encoded =
+      await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+    this.src = base64Encoded;
   });
 
   $("[mobile-bg-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-bg-img-path");
-      if (fileId) {
-        const base64Encoded = await parent.loadEncodedFile(fileId);
-        this.style.backgroundImage = `url("${base64Encoded}")`;
-      }
+    const fileId = $(this).attr("mobile-bg-img-path");
+    if (fileId) {
+      const base64Encoded =
+        await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+      this.style.backgroundImage = `url("${base64Encoded}")`;
     }
   });
 
   $("img:not([mobile-img-path]):not([mobile-bg-img-path])").each(
     async function () {
-      if (parent.loadEncodedFile) {
-        const jThis = $(this);
-        const src = jThis.attr("src");
-        if (src?.includes("/files/serve/")) {
-          const tokens = src.split("/files/serve/");
-          if (tokens.length > 1) {
-            const fileId = tokens[1];
-            const base64Encoded = await parent.loadEncodedFile(fileId);
-            this.src = base64Encoded;
-          }
-        } else if (src?.includes("/files/resize/")) {
-          const tokens = src.split("/files/resize/");
-          if (tokens.length > 1) {
-            const idAndDims = tokens[1].split("/");
-            const width = idAndDims[0];
-            const height = idAndDims.length > 2 ? idAndDims[1] : undefined;
-            const fileId = idAndDims[idAndDims.length - 1];
-            const style = { width: `${width || 50}px` };
-            if (height > 0) style.height = `${height}px`;
-            const base64Encoded = await parent.loadEncodedFile(fileId);
-            this.src = base64Encoded;
-            jThis.css(style);
-          }
+      const jThis = $(this);
+      const src = jThis.attr("src");
+      if (src?.includes("/files/serve/")) {
+        const tokens = src.split("/files/serve/");
+        if (tokens.length > 1) {
+          const fileId = tokens[1];
+          const base64Encoded =
+            await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+          this.src = base64Encoded;
+        }
+      } else if (src?.includes("/files/resize/")) {
+        const tokens = src.split("/files/resize/");
+        if (tokens.length > 1) {
+          const idAndDims = tokens[1].split("/");
+          const width = idAndDims[0];
+          const height = idAndDims.length > 2 ? idAndDims[1] : undefined;
+          const fileId = idAndDims[idAndDims.length - 1];
+          const style = { width: `${width || 50}px` };
+          if (height > 0) style.height = `${height}px`;
+          const base64Encoded =
+            await parent.saltcorn.mobileApp.common.loadEncodedFile(fileId);
+          this.src = base64Encoded;
+          jThis.css(style);
         }
       }
     }
@@ -1569,14 +1580,15 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
     });
   }
   if (res.eval_js) await handle(res.eval_js, eval_it);
+  /// TODO got and resume_workflow - use localStorage
   if (res.goto) {
     if (!isWeb) {
       const next = new URL(res.goto, "http://localhost");
       const pathname = next.pathname;
       if (pathname.startsWith("/view/") || pathname.startsWith("/page/")) {
         const route = `get${pathname}${next.search ? "?" + next.search : ""}`;
-        await parent.handleRoute(route);
-      } else parent.cordova.InAppBrowser.open(res.goto, "_system");
+        await parent.saltcorn.mobileApp.navigation.handleRoute(route);
+      } else parent.cordova.InAppBrowser.open(res.goto, "_system"); // TODO
     } else if (res.target === "_blank") window.open(res.goto, "_blank").focus();
     else {
       const prev = new URL(window.location.href);
@@ -1591,6 +1603,9 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
         location.reload();
     }
   }
+  if (res.resume_workflow) {
+    ajax_post_json(`/actions/resume-workflow/${res.resume_workflow}`, {});
+  }
   if (res.reload_page) {
     (isWeb ? location : parent).reload(); //TODO notify to cookie if reload or goto
   }

package/public/saltcorn.js

@@ -84,17 +84,6 @@ function removeQueryStringParameter(uri1, key) {
   return uri + hash;
 }
 
-function get_current_state_url(e) {
-  const localizer = e ? $(e).closest("[data-sc-local-state]") : [];
-  let $modal = $("#scmodal");
-  if (localizer.length) {
-    const localState = localizer.attr("data-sc-local-state") || "";
-    return localState;
-  } else if ($modal.length === 0 || !$modal.hasClass("show"))
-    return window.location.href;
-  else return $modal.prop("data-modal-state");
-}
-
 function select_id(id, e) {
   pjax_to(updateQueryStringParameter(get_current_state_url(e), "id", id), e);
 }
@@ -423,6 +412,27 @@ function saveAndContinueAsync(e) {
   });
 }
 
+function saveAndContinueIfValid(e, k, event) {
+  //wait for applyShowIf
+  setTimeout(() => {
+    if (
+      event &&
+      event.target &&
+      event.target.classList &&
+      event.target.classList.contains("no-form-change")
+    )
+      return;
+    var form = $(e).closest("form");
+
+    if (form[0].checkValidity?.() === false) {
+      form[0].reportValidity();
+      return;
+    }
+
+    saveAndContinue(e, k, event);
+  });
+}
+
 function saveAndContinue(e, k, event) {
   if (
     event &&
@@ -432,6 +442,7 @@ function saveAndContinue(e, k, event) {
   )
     return;
   var form = $(e).closest("form");
+
   let focusedEl = null;
   if (!event || !event.srcElement) {
     const el = form.find("select[sc-received-focus]")[0];
@@ -460,6 +471,7 @@ function saveAndContinue(e, k, event) {
     data: form_data,
     success: function (res) {
       ajax_indicator(false);
+      form.removeAttr("data-unsaved-changes");
       form.parent().find(".full-form-error").text("");
       if (res.id && form.find("input[name=id")) {
         form.append(
@@ -1189,6 +1201,14 @@ function installPWA() {
   }
 }
 
+function check_unsaved_form(event, script_tag) {
+  const form = $(script_tag).parent().find("form");
+  if (form.attr("data-unsaved-changes")) {
+    event.preventDefault();
+    event.returnValue = true;
+  }
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";