@saltcorn/server 1.1.0-beta.20 → 1.1.0-beta.22

package/locales/en.json

@@ -1511,6 +1511,7 @@
 	"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",
+	"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.": "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.",
 	"Delete unchanged": "Delete unchanged",
 	"Delete allocated row if there are no changes.": "Delete allocated row if there are no changes.",
 	"Triggers on table": "Triggers on table"

package/package.json

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

package/public/saltcorn-common.js

@@ -745,15 +745,27 @@ function doMobileTransforms() {
   const normalisePluginsPrefix = (path) => {
     if (path.startsWith("/plugins/") || path.startsWith("plugins/"))
       return path.replace(/\/?plugins\//, "sc_plugins/");
-    return path;
+    return null;
   };
   $("link").each(function () {
     const path = $(this).attr("href");
-    if (path) $(this).attr("href", normalisePluginsPrefix(path));
+    if (path) {
+      const newPath = normalisePluginsPrefix(path);
+      if (newPath) {
+        $(this).attr("href", newPath);
+        console.log("transformed link", path, newPath);
+      }
+    }
   });
   $("script").each(function () {
     const path = $(this).attr("src");
-    if (path) $(this).attr("src", normalisePluginsPrefix(path));
+    if (path) {
+      const newPath = normalisePluginsPrefix(path);
+      if (newPath) {
+        $(this).attr("src", newPath);
+        console.log("transformed script", path, newPath);
+      }
+    }
   });
 
   $("a").each(function () {
@@ -1058,7 +1070,11 @@ function initialize_page() {
       </form>`
       );
   });
-  if (!isNode) doMobileTransforms();
+  if (!isNode) {
+    doMobileTransforms();
+    const anchor = parent.saltcorn.mobileApp.navigation.getAnchor();
+    if (anchor) $(`[href="#${anchor}"][data-bs-toggle="tab"]`).tab("show");
+  }
   function setExplainer(that) {
     var id = $(that).attr("id") + "_explainer";
 
@@ -1201,7 +1217,6 @@ function initialize_page() {
 $(initialize_page);
 
 function cancel_inline_edit(e, opts1) {
-  const isNode = getIsNode();
   var opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
   var form = $(e.target).closest("form");
   form.replaceWith(opts.resetHtml);

package/public/saltcorn.css

@@ -613,4 +613,8 @@ i[class^="unicode-"], i[class*=" unicode-"] {
   background-color: #212529;
   border-color: #32383e;
   color: #fff;
+}
+
+.mobile-toast-margin {
+  margin-bottom: 1.0rem
 }

package/routes/actions.js

@@ -1669,7 +1669,7 @@ router.post(
   })
 );
 
-const getWorkflowStepUserForm = async (run, trigger, step, user) => {
+const getWorkflowStepUserForm = async (run, trigger, step, req) => {
   const qTypeToField = (q) => {
     switch (q.qtype) {
       case "Yes/No":
@@ -1700,7 +1700,7 @@ const getWorkflowStepUserForm = async (run, trigger, step, user) => {
   const form = new Form({
     action: `/actions/fill-workflow-form/${run.id}`,
     blurb: run.wait_info.output || step.configuration?.form_header || "",
-    formStyle: run.wait_info.output ? "vert" : undefined,
+    formStyle: run.wait_info.output || req.xhr ? "vert" : undefined,
     fields: (step.configuration.user_form_questions || []).map((q) => ({
       label: q.label,
       name: q.var_name,
@@ -1732,7 +1732,7 @@ router.get(
       name: run.current_step,
     });
 
-    const form = await getWorkflowStepUserForm(run, trigger, step, req.user);
+    const form = await getWorkflowStepUserForm(run, trigger, step, req);
     if (req.xhr) form.xhrSubmit = true;
     const title = run.wait_info.output ? "Workflow output" : "Fill form";
     res.sendWrap(title, renderForm(form, req.csrfToken()));
@@ -1760,7 +1760,7 @@ router.post(
       name: run.current_step,
     });
 
-    const form = await getWorkflowStepUserForm(run, trigger, step, req.user);
+    const form = await getWorkflowStepUserForm(run, trigger, step, req);
     form.validate(req.body);
     if (form.hasErrors) {
       const title = "Fill form";
@@ -1831,11 +1831,12 @@ help file to explain steps, and context
 action explainer 
 workflow actions: ForLoop, EndForLoop, ReadFile, WriteFile, APIResponse
 
-interactive workflows for not logged in
-correctly suggest new step name
-show end node in diagram
+correctly suggest new step name - on step cfg load
 
 Error handlers
+interactive workflows for not logged in
+show end node in diagram
+actions can declare which variables they inject into scope
 
 show unconnected steps
 why is code not initialising

package/routes/admin.js

@@ -1992,6 +1992,21 @@ const buildDialogScript = (capacitorBuilderAvailable, isSbadmin2) =>
   function handleMessages() {
     notifyAlert("Building the app, please wait.", true)
   }
+  const versionPattern = /^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$/;
+  ${domReady(`
+  const versionInput = document.getElementById('appVersionInputId');
+  if (versionInput) {
+    versionInput.addEventListener('change', () => {
+      const version = versionInput.value;
+      if ((version !== '0.0.0' && versionPattern.test(version)) || version === "")
+        versionInput.classList.remove('is-invalid');
+      else
+        versionInput.classList.add('is-invalid');
+    });
+  }
+  else
+    console.error('versionInput not found');
+`)}
   </script>`;
 
 const imageAvailable = async () => {
@@ -2379,9 +2394,15 @@ router.get(
                         class: "form-control",
                         name: "appVersion",
                         id: "appVersionInputId",
-                        placeholder: "1.0.0",
+                        placeholder: "0.0.1",
                         value: builderSettings.appVersion || "",
-                      })
+                      }),
+                      div(
+                        { class: "invalid-feedback" },
+                        req.__(
+                          "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."
+                        )
+                      )
                     )
                   ),
                   // server url
@@ -3244,6 +3265,16 @@ router.post(
         error: req.__("Please enter a valid server URL."),
       });
     }
+    if (
+      (appVersion && !/^\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(appVersion)) ||
+      appVersion === "0.0.0"
+    ) {
+      return res.json({
+        error: req.__(
+          "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."
+        ),
+      });
+    }
     if (iOSPlatform && !provisioningProfile) {
       return res.json({
         error: req.__(