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

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.0-beta.0",
+  "version": "0.9.0-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.9.0-beta.0",
-    "@saltcorn/builder": "0.9.0-beta.0",
-    "@saltcorn/data": "0.9.0-beta.0",
-    "@saltcorn/admin-models": "0.9.0-beta.0",
-    "@saltcorn/filemanager": "0.9.0-beta.0",
-    "@saltcorn/markup": "0.9.0-beta.0",
-    "@saltcorn/sbadmin2": "0.9.0-beta.0",
+    "@saltcorn/base-plugin": "0.9.0-beta.2",
+    "@saltcorn/builder": "0.9.0-beta.2",
+    "@saltcorn/data": "0.9.0-beta.2",
+    "@saltcorn/admin-models": "0.9.0-beta.2",
+    "@saltcorn/filemanager": "0.9.0-beta.2",
+    "@saltcorn/markup": "0.9.0-beta.2",
+    "@saltcorn/sbadmin2": "0.9.0-beta.2",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -45,6 +45,7 @@
     "node-fetch": "2.6.9",
     "node-watch": "^0.7.2",
     "notp": "2.0.3",
+    "npm-registry-fetch": "16.0.0",
     "passport": "^0.6.0",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
@@ -55,7 +56,7 @@
     "qrcode": "1.5.1",
     "resize-with-sharp-or-jimp": "0.1.6",
     "socket.io": "4.6.0",
-    "systeminformation": "^5.11.12",
+    "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",
     "uuid": "^8.2.0",

package/public/saltcorn-builder.css

@@ -446,3 +446,7 @@ Copyright (c) 2017 Taha Paksu
   padding: 5px 9px;
   z-index: 1;
 }
+
+div.builder-config-field {
+  margin-top: 0.5rem;
+}

package/public/saltcorn-common.js

@@ -78,6 +78,15 @@ function apply_showif() {
       console.error(e);
     }
   });
+  $("[data-dyn-href]").each(function (ix, element) {
+    const e = $(element);
+    const rec = get_form_record(e);
+    const href = new Function(
+      `{${Object.keys(rec).join(",")}}`,
+      "return " + e.attr("data-dyn-href")
+    )(rec);
+    e.attr("href", href);
+  });
   $("[data-calc-options]").each(function (ix, element) {
     var e = $(element);
     var data = JSON.parse(decodeURIComponent(e.attr("data-calc-options")));
@@ -335,18 +344,21 @@ function splitTargetMatch(elemValue, target, keySpec) {
   return elemValueShort === target;
 }
 
-function get_form_record(e, select_labels) {
+function get_form_record(e_in, select_labels) {
   const rec = {};
-  e.closest(".form-namespace")
-    .find("input[name],select[name]")
-    .each(function () {
-      const name = $(this).attr("data-fieldname") || $(this).attr("name");
-      if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
-        rec[name] = $(this).find("option:selected").text();
-      else if ($(this).prop("type") === "checkbox")
-        rec[name] = $(this).prop("checked");
-      else rec[name] = $(this).val();
-    });
+
+  const e = e_in.viewname
+    ? $(`form[data-viewname=${e_in.viewname}]`)
+    : e_in.closest(".form-namespace");
+
+  e.find("input[name],select[name],textarea[name]").each(function () {
+    const name = $(this).attr("data-fieldname") || $(this).attr("name");
+    if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
+      rec[name] = $(this).find("option:selected").text();
+    else if ($(this).prop("type") === "checkbox")
+      rec[name] = $(this).prop("checked");
+    else rec[name] = $(this).val();
+  });
   return rec;
 }
 function showIfFormulaInputs(e, fml) {
@@ -945,15 +957,26 @@ function emptyAlerts() {
   $("#toasts-area").html("");
 }
 
-function press_store_button(clicked) {
+function press_store_button(clicked, keepOld) {
   let btn = clicked;
   if ($(clicked).is("form")) btn = $(clicked).find("button[type=submit]");
-
+  if (keepOld) {
+    const oldText = $(btn).html();
+    $(btn).data("old-text", oldText);
+  }
   const width = $(btn).width();
   $(btn).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
 }
 
-function common_done(res, isWeb = true) {
+function restore_old_button(btnId) {
+  const btn = $(`#${btnId}`);
+  const oldText = $(btn).data("old-text");
+  btn.html(oldText);
+  btn.css({ width: "" });
+  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);
@@ -982,6 +1005,18 @@ function common_done(res, isWeb = true) {
         });
     });
   }
+  if (res.set_fields && viewname) {
+    Object.keys(res.set_fields).forEach((k) => {
+      const form = $(`form[data-viewname=${viewname}]`);
+      const input = form.find(
+        `input[name=${k}], textarea[name=${k}], select[name=${k}]`
+      );
+      if (input.attr("type") === "checkbox")
+        input.prop("checked", res.set_fields[k]);
+      else input.val(res.set_fields[k]);
+      input.trigger("set_form_field");
+    });
+  }
   if (res.goto && !isWeb)
     // TODO ch
     notifyAlert({

package/public/saltcorn.css

@@ -472,3 +472,17 @@ div.unread-notify {
   cursor: pointer;
   text-decoration: underline;
 }
+
+table.help-md thead {
+  border-bottom: 1px solid black;
+}
+
+table.help-md {
+  margin-bottom: 1em;
+}
+
+table.help-md td:nth-child(2),
+table.help-md th:nth-child(2) {
+  padding-left: 10px;
+  padding-right: 10px;
+}

package/public/saltcorn.js

@@ -198,8 +198,8 @@ function clear_state(omit_fields_str, e) {
   pjax_to(newUrl, e);
 }
 
-function ajax_done(res) {
-  common_done(res);
+function ajax_done(res, viewname) {
+  common_done(res, viewname);
 }
 
 function view_post(viewname, route, data, onDone, sendState) {
@@ -220,7 +220,7 @@ function view_post(viewname, route, data, onDone, sendState) {
   })
     .done(function (res) {
       if (onDone) onDone(res);
-      ajax_done(res);
+      ajax_done(res, viewname);
     })
     .fail(function (res) {
       notifyAlert({ type: "danger", text: res.responseText });
@@ -340,7 +340,20 @@ function ajax_modal(url, opts = {}) {
         $("body").css("overflow", "");
       });
     },
+    ...(opts.onError
+      ? {
+          error: opts.onError,
+        }
+      : {}),
+  });
+}
+
+function selectVersionError(res, btnId) {
+  notifyAlert({
+    type: "danger",
+    text: res.responseJSON?.error || "unknown error",
   });
+  restore_old_button(btnId);
 }
 
 function saveAndContinue(e, k) {
@@ -491,7 +504,7 @@ function ajaxSubmitForm(e) {
       var no_reload = $("#scmodal").hasClass("no-submit-reload");
       $("#scmodal").modal("hide");
       if (!no_reload) location.reload();
-      else common_done(res);
+      else common_done(res, form.attr("data-viewname"));
     },
     error: function (request) {
       var title = request.getResponseHeader("Page-Title");

package/routes/admin.js

@@ -1514,6 +1514,8 @@ router.get(
     const plugins = (await Plugin.find()).filter(
       (plugin) => ["base", "sbadmin2"].indexOf(plugin.name) < 0
     );
+    const builderSettings =
+      getState().getConfig("mobile_builder_settings") || {};
     send_admin_page({
       res,
       req,
@@ -1574,7 +1576,14 @@ router.get(
                             onClick: "showEntrySelect('view')",
                           },
                           div(
-                            { class: "nav-link active", id: "viewNavLinkID" },
+                            {
+                              class: `nav-link ${
+                                !builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                                  ? "active"
+                                  : ""
+                              }`,
+                              id: "viewNavLinkID",
+                            },
                             req.__("View")
                           )
                         ),
@@ -1584,7 +1593,14 @@ router.get(
                             onClick: "showEntrySelect('page')",
                           },
                           div(
-                            { class: "nav-link", id: "pageNavLinkID" },
+                            {
+                              class: `nav-link ${
+                                builderSettings.entryPointType === "page"
+                                  ? "active"
+                                  : ""
+                              }`,
+                              id: "pageNavLinkID",
+                            },
                             req.__("Page")
                           )
                         )
@@ -1592,25 +1608,54 @@ router.get(
                       // select entry-view
                       select(
                         {
-                          class: "form-select",
-                          name: "entryPoint",
+                          class: `form-select ${
+                            builderSettings.entryPointType === "page"
+                              ? "d-none"
+                              : ""
+                          }`,
+                          ...(!builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                            ? { name: "entryPoint" }
+                            : {}),
                           id: "viewInputID",
                         },
                         views
                           .map((view) =>
-                            option({ value: view.name }, view.name)
+                            option(
+                              {
+                                value: view.name,
+                                selected:
+                                  builderSettings.entryPointType === "view" &&
+                                  builderSettings.entryPoint === view.name,
+                              },
+                              view.name
+                            )
                           )
                           .join(",")
                       ),
                       // select entry-page
                       select(
                         {
-                          class: "form-select d-none",
+                          class: `form-select ${
+                            !builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                              ? "d-none"
+                              : ""
+                          }`,
+                          ...(builderSettings.entryPointType === "page"
+                            ? { name: "entryPoint" }
+                            : {}),
                           id: "pageInputID",
                         },
                         pages
                           .map((page) =>
-                            option({ value: page.name }, page.name)
+                            option(
+                              {
+                                value: page.name,
+                                selected:
+                                  builderSettings.entryPointType === "page" &&
+                                  builderSettings.entryPoint === page.name,
+                              },
+                              page.name
+                            )
                           )
                           .join("")
                       )
@@ -1631,6 +1676,7 @@ router.get(
                               name: "androidPlatform",
                               id: "androidCheckboxId",
                               onClick: "toggle_android_platform()",
+                              checked: builderSettings.androidPlatform === "on",
                             })
                           )
                         ),
@@ -1645,6 +1691,7 @@ router.get(
                               class: "form-check-input",
                               name: "iOSPlatform",
                               id: "iOSCheckboxId",
+                              checked: builderSettings.iOSPlatform === "on",
                             })
                           )
                         )
@@ -1658,7 +1705,8 @@ router.get(
                         class: "form-check-input",
                         name: "useDocker",
                         id: "dockerCheckboxId",
-                        hidden: true,
+                        hidden: builderSettings.androidPlatform !== "on",
+                        checked: builderSettings.useDocker === "on",
                       })
                     )
                   ),
@@ -1680,6 +1728,7 @@ router.get(
                         name: "appName",
                         id: "appNameInputId",
                         placeholder: "SaltcornMobileApp",
+                        value: builderSettings.appName || "",
                       })
                     )
                   ),
@@ -1701,6 +1750,7 @@ router.get(
                         name: "appVersion",
                         id: "appVersionInputId",
                         placeholder: "1.0.0",
+                        value: builderSettings.appVersion || "",
                       })
                     )
                   ),
@@ -1721,6 +1771,7 @@ router.get(
                         class: "form-control",
                         name: "serverURL",
                         id: "serverURLInputId",
+                        value: builderSettings.serverURL || "",
                         placeholder: getState().getConfig("base_url") || "",
                       })
                     )
@@ -1746,7 +1797,14 @@ router.get(
                         [
                           option({ value: "" }, ""),
                           ...images.map((image) =>
-                            option({ value: image.location }, image.filename)
+                            option(
+                              {
+                                value: image.location,
+                                selected:
+                                  builderSettings.appIcon === image.location,
+                              },
+                              image.filename
+                            )
                           ),
                         ].join("")
                       )
@@ -1772,7 +1830,14 @@ router.get(
                         [
                           option({ value: "" }, ""),
                           ...pages.map((page) =>
-                            option({ value: page.name }, page.name)
+                            option(
+                              {
+                                value: page.name,
+                                selected:
+                                  builderSettings.splashPage === page.name,
+                              },
+                              page.name
+                            )
                           ),
                         ].join("")
                       )
@@ -1788,8 +1853,7 @@ router.get(
                         id: "autoPublLoginId",
                         class: "form-check-input me-2",
                         name: "autoPublicLogin",
-                        value: "autoPublicLogin",
-                        checked: false,
+                        checked: builderSettings.autoPublicLogin === "on",
                       }),
                       label(
                         {
@@ -1810,9 +1874,8 @@ router.get(
                         id: "offlineModeBoxId",
                         class: "form-check-input me-2",
                         name: "allowOfflineMode",
-                        value: "allowOfflineMode",
                         onClick: "toggle_tbl_sync()",
-                        checked: true,
+                        checked: builderSettings.allowOfflineMode === "on",
                       }),
                       label(
                         {
@@ -1828,6 +1891,7 @@ router.get(
                     {
                       id: "tblSyncSelectorId",
                       class: "row pb-3",
+                      hidden: builderSettings.allowOfflineMode !== "on",
                     },
                     div(
                       label(
@@ -1864,6 +1928,12 @@ router.get(
                                 id: `${table.name}_unsynched_opt`,
                                 value: table.name,
                                 label: table.name,
+                                hidden:
+                                  builderSettings.synchedTables?.indexOf(
+                                    table.name
+                                  ) >= 0
+                                    ? true
+                                    : false,
                               })
                             )
                           )
@@ -1908,7 +1978,12 @@ router.get(
                                 id: `${table.name}_synched_opt`,
                                 value: table.name,
                                 label: table.name,
-                                hidden: "true",
+                                hidden:
+                                  builderSettings.synchedTables?.indexOf(
+                                    table.name
+                                  ) >= 0
+                                    ? false
+                                    : true,
                               })
                             )
                           )
@@ -1954,7 +2029,12 @@ router.get(
                                 id: `${plugin.name}_excluded_opt`,
                                 value: plugin.name,
                                 label: plugin.name,
-                                hidden: "true",
+                                hidden:
+                                  builderSettings.excludedPlugins?.indexOf(
+                                    plugin.name
+                                  ) >= 0
+                                    ? false
+                                    : true,
                               })
                             )
                           )
@@ -1999,7 +2079,12 @@ router.get(
                                 id: `${plugin.name}_included_opt`,
                                 value: plugin.name,
                                 label: plugin.name,
-                                // hidden: "true",
+                                hidden:
+                                  builderSettings.excludedPlugins?.indexOf(
+                                    plugin.name
+                                  ) >= 0
+                                    ? true
+                                    : false,
                               })
                             )
                           )
@@ -2116,6 +2201,8 @@ router.post(
       synchedTables,
       includedPlugins,
     } = req.body;
+    if (!includedPlugins) includedPlugins = [];
+    if (!synchedTables) synchedTables = [];
     if (!androidPlatform && !iOSPlatform) {
       return res.json({
         error: req.__("Please select at least one platform (android or iOS)."),
@@ -2167,9 +2254,9 @@ router.post(
     if (splashPage) spawnParams.push("--splashPage", splashPage);
     if (allowOfflineMode) spawnParams.push("--allowOfflineMode");
     if (autoPublicLogin) spawnParams.push("--autoPublicLogin");
-    if (synchedTables?.length > 0)
+    if (synchedTables.length > 0)
       spawnParams.push("--synchedTables", ...synchedTables.map((tbl) => tbl));
-    if (includedPlugins?.length > 0)
+    if (includedPlugins.length > 0)
       spawnParams.push(
         "--includedPlugins",
         ...includedPlugins.map((pluginName) => pluginName)
@@ -2180,6 +2267,30 @@ 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);
+    await getState().setConfig("mobile_builder_settings", {
+      entryPoint,
+      entryPointType,
+      androidPlatform,
+      iOSPlatform,
+      useDocker,
+      appName,
+      appVersion,
+      appIcon,
+      serverURL,
+      splashPage,
+      autoPublicLogin,
+      allowOfflineMode,
+      synchedTables: synchedTables,
+      includedPlugins: includedPlugins,
+      excludedPlugins,
+    });
     // end http call, return the out directory name
     // the gui polls for results
     res.json({ build_dir_name: outDirName });

package/routes/menu.js

@@ -44,7 +44,7 @@ const menuForm = async (req) => {
   const views = await View.find({}, { orderBy: "name", nocase: true });
   const pages = await Page.find({}, { orderBy: "name", nocase: true });
   const roles = await User.get_roles();
-  const tables = await Table.find({});
+  const tables = await Table.find_with_external({});
   const dynTableOptions = tables.map((t) => t.name);
   const dynOrderFieldOptions = {},
     dynSectionFieldOptions = {};