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

package/locales/en.json

@@ -1416,5 +1416,14 @@
 	"Description header": "Description header",
 	"Lazy load views": "Lazy load views",
 	"Log IP address": "Log IP address",
-	"Record the request IP address in log messages": "Record the request IP address in log messages"
+	"Record the request IP address in log messages": "Record the request IP address in log messages",
+	"App ID": "App ID",
+	"Build type": "Build type",
+	"debug": "debug",
+	"release": "release",
+	"Keystore File": "Keystore File",
+	"Keystore Alias": "Keystore Alias",
+	"Keystore Password": "Keystore Password",
+	"xcodebuild": "xcodebuild",
+	"Provisioning Profile": "Provisioning Profile"
 }

package/package.json

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

package/public/saltcorn.js

@@ -751,6 +751,42 @@ function removeSpinner(elementId, orginalHtml) {
   $(`#${elementId}`).html(orginalHtml);
 }
 
+function builderMenuChanged(e) {
+  const form = $(e);
+  const params = {};
+  form.serializeArray().forEach((item) => {
+    params[item.name] = item.value;
+  });
+  params.synchedTables = Array.from($("#synched-tbls-select-id")[0].options)
+    .filter((option) => !option.hidden)
+    .map((option) => option.value);
+  const pluginsSelect = $("#included-plugins-select-id")[0];
+  params.includedPlugins = Array.from(pluginsSelect.options || []).map(
+    (option) => option.value
+  );
+  const indicator = $(".sc-ajax-indicator");
+  indicator.attr("title", "Saving the configuration");
+  indicator.attr("style", "display: inline-block;");
+  const icon = $(".fa-save, .fa-exclamation-triangle");
+  icon.attr("class", "fas fa-save");
+  const setErrorIcon = () => {
+    icon.attr("class", "fas fa-exclamation-triangle");
+    icon.attr("style", "color: #ff0033!important;");
+    indicator.attr("title", "Unable to save the configuration");
+  };
+  $.ajax("/admin/mobile-app/save-config", {
+    type: "POST",
+    data: params,
+    success: function (res) {
+      if (res.success) indicator.attr("style", "display: none;");
+      else setErrorIcon();
+    },
+    error: function (res) {
+      setErrorIcon();
+    },
+  });
+}
+
 function poll_mobile_build_finished(outDirName, pollCount, orginalBtnHtml) {
   $.ajax("/admin/build-mobile-app/finished", {
     type: "GET",
@@ -898,26 +934,32 @@ function move_to_synched() {
   const opts = $("#unsynched-tbls-select-id");
   $("#synched-tbls-select-id").removeAttr("selected");
   for (const selected of opts.val()) {
-    const jUnsOpt = $(`[id='${selected}_unsynched_opt']`);
-    jUnsOpt.attr("hidden", "true");
-    jUnsOpt.removeAttr("selected");
-    const jSynOpt = $(`[id='${selected}_synched_opt']`);
-    jSynOpt.removeAttr("hidden");
-    jSynOpt.removeAttr("selected");
+    $(`[id='${selected}_unsynched_opt']`).remove();
+    $("#synched-tbls-select-id").append(
+      $("<option>", {
+        value: selected,
+        label: selected,
+        id: `${selected}_synched_opt`,
+      })
+    );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function move_to_unsynched() {
   const opts = $("#synched-tbls-select-id");
   $("#unsynched-tbls-select-id").removeAttr("selected");
   for (const selected of opts.val()) {
-    const jSynOpt = $(`[id='${selected}_synched_opt']`);
-    jSynOpt.attr("hidden", "true");
-    jSynOpt.removeAttr("selected");
-    const jUnsOpt = $(`[id='${selected}_unsynched_opt']`);
-    jUnsOpt.removeAttr("hidden");
-    jUnsOpt.removeAttr("selected");
+    $(`[id='${selected}_synched_opt']`).remove();
+    $("#unsynched-tbls-select-id").append(
+      $("<option>", {
+        value: selected,
+        label: selected,
+        id: `${selected}_unsynched_opt`,
+      })
+    );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function move_plugin_to_included() {
@@ -933,6 +975,7 @@ function move_plugin_to_included() {
       })
     );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function move_plugin_to_excluded() {
@@ -948,6 +991,7 @@ function move_plugin_to_excluded() {
       })
     );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function toggle_tbl_sync() {

package/routes/actions.js

@@ -668,6 +668,7 @@ router.get(
       // get configuration fields
       const cfgFields = await getActionConfigFields(action, table, {
         mode: "trigger",
+        when_trigger: trigger.when_trigger,
       });
       // create form
       const form = new Form({
@@ -720,6 +721,7 @@ router.post(
     } else {
       const cfgFields = await getActionConfigFields(action, table, {
         mode: "trigger",
+        when_trigger: trigger.when_trigger,
       });
       form = new Form({
         action: `/actions/configure/${id}`,

package/routes/admin.js

@@ -1710,11 +1710,14 @@ router.get(
         above: [
           {
             type: "card",
+            titleAjaxIndicator: true,
             title: req.__("Build mobile app"),
             contents: form(
               {
                 action: "/admin/build-mobile-app",
                 method: "post",
+                onchange: "builderMenuChanged(this)",
+                id: "buildMobileAppForm",
               },
 
               fieldset(
@@ -2178,19 +2181,21 @@ router.get(
                               class: "form-control form-select",
                               multiple: true,
                             },
-                            withSyncInfo.map((table) =>
-                              option({
-                                id: `${table.name}_unsynched_opt`,
-                                value: table.name,
-                                label: table.name,
-                                hidden:
-                                  builderSettings.synchedTables?.indexOf(
+                            withSyncInfo
+                              .filter(
+                                (table) =>
+                                  !builderSettings.synchedTables ||
+                                  builderSettings.synchedTables.indexOf(
                                     table.name
-                                  ) >= 0
-                                    ? true
-                                    : false,
-                              })
-                            )
+                                  ) < 0
+                              )
+                              .map((table) =>
+                                option({
+                                  id: `${table.name}_unsynched_opt`,
+                                  value: table.name,
+                                  label: table.name,
+                                })
+                              )
                           )
                         ),
                         div(
@@ -2228,19 +2233,20 @@ router.get(
                               class: "form-control form-select",
                               multiple: true,
                             },
-                            withSyncInfo.map((table) =>
-                              option({
-                                id: `${table.name}_synched_opt`,
-                                value: table.name,
-                                label: table.name,
-                                hidden:
+                            withSyncInfo
+                              .filter(
+                                (table) =>
                                   builderSettings.synchedTables?.indexOf(
                                     table.name
                                   ) >= 0
-                                    ? false
-                                    : true,
-                              })
-                            )
+                              )
+                              .map((table) =>
+                                option({
+                                  id: `${table.name}_synched_opt`,
+                                  value: table.name,
+                                  label: table.name,
+                                })
+                              )
                           )
                         )
                       )
@@ -2875,13 +2881,6 @@ router.post(
     ) {
       spawnParams.push("--tenantAppName", db.getTenantSchema());
     }
-    const excludedPlugins = (await Plugin.find())
-      .filter(
-        (plugin) =>
-          ["base", "sbadmin2"].indexOf(plugin.name) < 0 &&
-          includedPlugins.indexOf(plugin.name) < 0
-      )
-      .map((plugin) => plugin.name);
 
     if (buildType) spawnParams.push("--buildType", buildType);
     if (keystoreFile) spawnParams.push("--androidKeystore", keystoreFile);
@@ -2889,28 +2888,6 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
-    await getState().setConfig("mobile_builder_settings", {
-      entryPoint,
-      entryPointType,
-      androidPlatform,
-      iOSPlatform,
-      useDocker,
-      appName,
-      appId,
-      appVersion,
-      appIcon,
-      serverURL,
-      splashPage,
-      autoPublicLogin,
-      allowOfflineMode,
-      synchedTables: synchedTables,
-      includedPlugins: includedPlugins,
-      excludedPlugins,
-      provisioningProfile,
-      keystoreFile,
-      keystoreAlias,
-      buildType,
-    });
     // end http call, return the out directory name
     // the gui polls for results
     res.json({ build_dir_name: outDirName });
@@ -3014,6 +2991,29 @@ router.get(
   })
 );
 
+router.post(
+  "/mobile-app/save-config",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    try {
+      const newCfg = { ...req.body };
+      const excludedPlugins = (await Plugin.find())
+        .filter(
+          (plugin) =>
+            ["base", "sbadmin2"].indexOf(plugin.name) < 0 &&
+            newCfg.includedPlugins.indexOf(plugin.name) < 0
+        )
+        .map((plugin) => plugin.name);
+      newCfg.excludedPlugins = excludedPlugins;
+      await getState().setConfig("mobile_builder_settings", newCfg);
+      res.json({ success: true });
+    } catch (e) {
+      getState().log(1, `Unable to save mobile builder config: ${e.message}`);
+      res.json({ error: e.message });
+    }
+  })
+);
+
 /**
  * Do Clear All
  * @function

package/routes/fields.js

@@ -1156,6 +1156,7 @@ router.post(
       if (!fv) res.send(text(result));
       else res.send(fv.run(result, req, { row, ...configuration }));
     } catch (e) {
+      console.error("show-calculated error", e);
       return res.status(400).send(`Error: ${e.message}`);
     }
   })