@saltcorn/server 1.1.1-beta.0 → 1.1.1-beta.2

package/help/Event types.tmd

@@ -55,6 +55,8 @@ user verification is enabled.
 
 **Startup**: run this whenever this saltcorn process initializes. 
 
+**AppChange**: the application build (views, pages, triggers etc.) changed
+
 ## Other events
 
 **Never**: this trigger is never run on its own. However triggers that are marked as never

package/locales/en.json

@@ -1520,7 +1520,13 @@
 	"OK": "OK",
 	"Step settings": "Step settings",
 	"Action settings": "Action settings",
+	"Keystore file is not applied for debug builds.": "Keystore file is not applied for debug builds.",
 	"Workflow": "Workflow",
 	"Previous runs": "Previous runs",
-	"The workflow the user will be interacting with.": "The workflow the user will be interacting with."
+	"The workflow the user will be interacting with.": "The workflow the user will be interacting with.",
+	"Delete old workflow runs with status after days": "Delete old workflow runs with status after days",
+	"Finished": "Finished",
+	"Error": "Error",
+	"Waiting": "Waiting",
+	"Running": "Running"
 }

package/locales/pl.json

@@ -1508,5 +1508,20 @@
 	"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"
+	"Enable the share to feature": "Włącz udostępnianie funkcji",
+  "Allocate new row": "Przydziel nowy wiersz",
+  "If the view is run without existing row, allocate a new row on load. Defaults must be set on all required fields.": "Jeśli widok jest uruchamiany bez istniejącego wiersza, przydziel nowy wiersz podczas ładowania. Domyślne wartości muszą być ustawione na wszystkich wymaganych polach.",
+  "Step traces": "Ślady kroków",
+  "Please enter a version in the format 'x.y.z' (e.g. 0.0.1 with numbers from 0 to 999) or leave it empty.": "Wprowadź wersję w formacie 'x.y.z' (np. 0.0.1 z liczbami od 0 do 999) lub pozostaw puste.",
+  "Delete unchanged": "Usuń bez zmian",
+  "Delete allocated row if there are no changes.": "Usuń przydzielony wiersz, jeśli nie wprowadzono żadnych zmian.",
+  "Triggers on table": "Wyzwalacze na tabeli",
+  "Please provide the keystore alias and password for the android build.": "Podaj alias i hasło do keystore dla kompilacji Android.",
+  "Submit": "Prześlij",
+  "OK": "OK",
+  "Step settings": "Ustawienia kroku",
+  "Action settings": "Ustawienia akcji",
+  "Workflow": "Przepływ pracy",
+  "Previous runs": "Poprzednie uruchomienia",
+  "The workflow the user will be interacting with.": "Przepływ pracy, z którym użytkownik będzie wchodził w interakcję."
 }

package/package.json

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

package/public/saltcorn.js

@@ -65,7 +65,7 @@ function updateQueryStringParameters(uri1, kvs) {
   return uri;
 }
 
-function removeQueryStringParameter(uri1, key) {
+function removeQueryStringParameter(uri1, key, value) {
   let hash = "";
   let uri = uri1;
   if (uri && uri.includes("#")) {
@@ -73,8 +73,12 @@ function removeQueryStringParameter(uri1, key) {
     hash = "#" + uris[1];
     uri = uris[0];
   }
-
-  var re = new RegExp("([?&])" + key + "=.*?(&|$)", "gi");
+  let re;
+  if (value) {
+    re = new RegExp("([?&])" + key + "=" + value + "?(&|$)", "gi");
+  } else {
+    re = new RegExp("([?&])" + key + "=.*?(&|$)", "gi");
+  }
   if (uri.match(re)) {
     uri = uri.replace(re, "$1" + "$2");
   }
@@ -84,6 +88,28 @@ function removeQueryStringParameter(uri1, key) {
   return uri + hash;
 }
 
+function addQueryStringParameter(uri1, key, value) {
+  let hash = "";
+  let uri = uri1;
+  if (uri && uri.includes("#")) {
+    let uris = uri1.split("#");
+    hash = "#" + uris[1];
+    uri = uris[0];
+  }
+  var re = new RegExp("([?&])" + key + "=" + value + "?(&|$)", "gi");
+  if (uri.match(re)) return uri1;
+
+  var separator = uri.indexOf("?") !== -1 ? "&" : "?";
+  if (Array.isArray(value))
+    return (
+      uri +
+      separator +
+      value.map((val) => key + "=" + encodeURIComponent(val)).join("&") +
+      hash
+    );
+  else return uri + separator + key + "=" + encodeURIComponent(value) + hash;
+}
+
 function select_id(id, e) {
   pjax_to(updateQueryStringParameter(get_current_state_url(e), "id", id), e);
 }
@@ -96,10 +122,10 @@ function check_state_field(that, e) {
   const checked = that.checked;
   const name = that.name;
   const value = encodeURIComponent(that.value);
-  var separator = get_current_state_url(e).indexOf("?") !== -1 ? "&" : "?";
   let dest;
-  if (checked) dest = get_current_state_url(e) + `${separator}${name}=${value}`;
-  else dest = get_current_state_url(e).replace(`${name}=${value}`, "");
+  if (checked)
+    dest = addQueryStringParameter(get_current_state_url(e), name, value);
+  else dest = removeQueryStringParameter(get_current_state_url(e), name, value);
   pjax_to(dest.replace("&&", "&").replace("?&", "?"), e);
 }
 
@@ -591,7 +617,7 @@ function updateViewPreview() {
 function ajaxSubmitForm(e, force_no_reload, event) {
   var form = $(e).closest("form");
   var url = form.attr("action");
-  if(event) event.preventDefault();
+  if (event) event.preventDefault();
   $.ajax(url, {
     type: "POST",
     headers: {
@@ -606,10 +632,10 @@ function ajaxSubmitForm(e, force_no_reload, event) {
         "data-on-close-reload-view"
       );
       $("#scmodal").modal("hide");
-      if (!force_no_reload && on_close_reload_view) {
+      if (on_close_reload_view) {
         const viewE = $(`[data-sc-embed-viewname="${on_close_reload_view}"]`);
         if (viewE.length) reload_embedded_view(on_close_reload_view);
-        else location.reload();
+        else if (!force_no_reload) location.reload();
       } else if (!force_no_reload && !no_reload) location.reload();
       else common_done(res, form.attr("data-viewname"));
     },
@@ -859,10 +885,16 @@ function builderMenuChanged(e) {
   });
 }
 
-function poll_mobile_build_finished(outDirName, pollCount, orginalBtnHtml) {
+function poll_mobile_build_finished(
+  outDirName,
+  buildDir,
+  mode,
+  pollCount,
+  orginalBtnHtml
+) {
   $.ajax("/admin/build-mobile-app/finished", {
     type: "GET",
-    data: { build_dir: outDirName },
+    data: { out_dir_name: outDirName, mode: mode },
     success: function (res) {
       if (!res.finished) {
         if (pollCount >= 100) {
@@ -873,14 +905,45 @@ function poll_mobile_build_finished(outDirName, pollCount, orginalBtnHtml) {
           });
         } else {
           setTimeout(() => {
-            poll_mobile_build_finished(outDirName, ++pollCount, orginalBtnHtml);
+            poll_mobile_build_finished(
+              outDirName,
+              buildDir,
+              mode,
+              ++pollCount,
+              orginalBtnHtml
+            );
           }, 5000);
         }
       } else {
         href_to(
-          `build-mobile-app/result?build_dir_name=${encodeURIComponent(
+          `/admin/build-mobile-app/result?out_dir_name=${encodeURIComponent(
             outDirName
-          )}`
+          )}&build_dir=${encodeURIComponent(buildDir)}&mode=${mode}`
+        );
+      }
+    },
+  });
+}
+
+function finish_mobile_app(button, outDirName, buildDir) {
+  $.ajax("/admin/build-mobile-app/finish", {
+    type: "POST",
+    headers: {
+      "CSRF-Token": _sc_globalCsrf,
+    },
+    data: { out_dir_name: outDirName, build_dir: buildDir },
+    success: function (data) {
+      if (data.success) {
+        notifyAlert("Finishing the app, please wait.", true);
+        for (const msg of data.msgs || []) notifyAlert(msg);
+        const orginalBtnHtml = $("#finishMobileAppBtnId").html();
+        press_store_button(button);
+        poll_mobile_build_finished(
+          outDirName,
+          buildDir,
+          "finish",
+          0,
+          orginalBtnHtml
         );
       }
     },
@@ -938,11 +1001,18 @@ function build_mobile_app(button) {
   ajax_post("/admin/build-mobile-app", {
     data: params,
     success: (data) => {
-      if (data.build_dir_name) {
-        handleMessages();
+      if (data.out_dir_name && data.build_dir) {
+        notifyAlert("Building the app, please wait.", true);
+        for (const msg of data.msgs || []) notifyAlert(msg);
         const orginalBtnHtml = $("#buildMobileAppBtnId").html();
         press_store_button(button);
-        poll_mobile_build_finished(data.build_dir_name, 0, orginalBtnHtml);
+        poll_mobile_build_finished(
+          data.out_dir_name,
+          data.build_dir,
+          data.mode,
+          0,
+          orginalBtnHtml
+        );
       }
     },
   });