@saltcorn/server 0.9.5-beta.6 → 0.9.5-beta.7

package/help/Cordova Builder.tmd

@@ -0,0 +1,13 @@
+The Cordova builder is a docker image with all dependencies to build Android apps.
+It can be pulled from dockerhub while installing Saltcorn, or you can use the pull button.
+
+Please make sure your server has a valid and accessible docker daemon running. 
+
+For this, either set up a standard docker installation 
+or use the [docker rootless mode](https://docs.docker.com/engine/security/rootless/) (recommended).
+
+In a standard docker environment, you need root user privileges. 
+For this, you can add the user running Saltcorn to the docker group, 
+or if you already have the privileges, you are ready to go.
+
+A docker daemon in rootless mode doesn't need any further configuration.

package/locales/en.json

@@ -1384,5 +1384,10 @@
 	"Optionally associate a table with this trigger": "Optionally associate a table with this trigger",
 	"Delete table": "Delete table",
 	"Signup role": "Signup role",
-	"The initial role of signed up users": "The initial role of signed up users"
+	"The initial role of signed up users": "The initial role of signed up users",
+	"Cordova builder": "Cordova builder",
+	"not available": "not available",
+	"pull": "pull",
+	"refresh": "refresh",
+	"installed": "installed"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.5-beta.6",
+  "version": "0.9.5-beta.7",
   "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.5-beta.6",
-    "@saltcorn/builder": "0.9.5-beta.6",
-    "@saltcorn/data": "0.9.5-beta.6",
-    "@saltcorn/admin-models": "0.9.5-beta.6",
-    "@saltcorn/filemanager": "0.9.5-beta.6",
-    "@saltcorn/markup": "0.9.5-beta.6",
-    "@saltcorn/plugins-loader": "0.9.5-beta.6",
-    "@saltcorn/sbadmin2": "0.9.5-beta.6",
+    "@saltcorn/base-plugin": "0.9.5-beta.7",
+    "@saltcorn/builder": "0.9.5-beta.7",
+    "@saltcorn/data": "0.9.5-beta.7",
+    "@saltcorn/admin-models": "0.9.5-beta.7",
+    "@saltcorn/filemanager": "0.9.5-beta.7",
+    "@saltcorn/markup": "0.9.5-beta.7",
+    "@saltcorn/plugins-loader": "0.9.5-beta.7",
+    "@saltcorn/sbadmin2": "0.9.5-beta.7",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -27,6 +27,7 @@
     "cors": "2.8.5",
     "csurf": "^1.11.0",
     "csv-stringify": "^5.5.0",
+    "dockerode": "~4.0.2",
     "express": "^4.17.1",
     "express-fileupload": "^1.1.8",
     "express-promise-router": "^3.0.3",

package/public/log_viewer_utils.js

@@ -131,7 +131,23 @@ var logViewerHelpers = (() => {
 
   return {
     init_log_socket: () => {
-      const socket = io({ transports: ["websocket"] });
+      let socket = null;
+      setTimeout(() => {
+        if (socket === null || socket.disconnected) {
+          notifyAlert({
+            type: "danger",
+            text: "Unable to connect to the server",
+          });
+        }
+      }, 5000);
+      try {
+        socket = io({ transports: ["websocket"] });
+      } catch (e) {
+        notifyAlert({
+          type: "danger",
+          text: "Unable to connect to the server " + e.message,
+        });
+      }
       startTrackingMsg();
       socket.on("connect", () => handleConnect(socket));
       socket.on("disconnect", handleDisconnect);

package/public/saltcorn-common.js

@@ -76,7 +76,7 @@ function valid_js_var_name(s) {
   return !!s.match(/^[a-zA-Z_$][a-zA-Z_$0-9]*$/);
 }
 function apply_showif() {
-  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
+  const isNode = getIsNode();
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
     try {
@@ -571,7 +571,7 @@ function reload_on_init() {
 }
 function initialize_page() {
   if (window._sc_locale && window.dayjs) dayjs.locale(window._sc_locale);
-  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
+  const isNode = getIsNode();
   //console.log("init page");
   $(".blur-on-enter-keypress").bind("keyup", function (e) {
     if (e.keyCode === 13) e.target.blur();
@@ -877,7 +877,7 @@ function initialize_page() {
 $(initialize_page);
 
 function cancel_inline_edit(e, opts1) {
-  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
+  const isNode = getIsNode();
   var opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
   var form = $(e.target).closest("form");
   form.replaceWith(opts.resetHtml);
@@ -885,7 +885,7 @@ function cancel_inline_edit(e, opts1) {
 }
 
 function inline_submit_success(e, form, opts) {
-  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
+  const isNode = getIsNode();
   const formDataArray = form.serializeArray();
   if (opts) {
     let fdEntry = formDataArray.find((f) => f.name == opts.key);
@@ -1025,6 +1025,15 @@ function tristateClick(e, required) {
   }
 }
 
+function getIsNode() {
+  try {
+    return typeof parent?.saltcorn?.data?.state === "undefined";
+  } catch (e) {
+    //probably in an iframe
+    return true;
+  }
+}
+
 function buildToast(txt, type, spin) {
   const realtype = type === "error" ? "danger" : type;
   const icon =
@@ -1035,7 +1044,7 @@ function buildToast(txt, type, spin) {
       : realtype === "warning"
       ? "fa-exclamation-triangle"
       : "";
-  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
+  const isNode = getIsNode();
   const rndid = `tab${Math.floor(Math.random() * 16777215).toString(16)}`;
   return {
     id: rndid,

package/public/saltcorn.js

@@ -821,6 +821,17 @@ function build_mobile_app(button) {
   params.includedPlugins = Array.from(pluginsSelect.options)
     .filter((option) => !option.hidden)
     .map((option) => option.value);
+
+  if (
+    params.useDocker &&
+    !cordovaBuilderAvailable &&
+    !confirm(
+      "Docker is selected but the Cordova builder seems not to be installed. " +
+        "Do you really want to continue?"
+    )
+  ) {
+    return;
+  }
   ajax_post("/admin/build-mobile-app", {
     data: params,
     success: (data) => {
@@ -834,6 +845,41 @@ function build_mobile_app(button) {
   });
 }
 
+function pull_cordova_builder() {
+  ajax_post("/admin/mobile-app/pull-cordova-builder", {
+    success: () => {
+      notifyAlert(
+        "Pulling the the cordova-builder. " +
+          "To see the progress, open the logs viewer with the System logging verbosity set to 'All'."
+      );
+    },
+  });
+}
+
+function check_cordova_builder() {
+  $.ajax("/admin/mobile-app/check-cordova-builder", {
+    type: "GET",
+    success: function (res) {
+      cordovaBuilderAvailable = !!res.installed;
+      if (cordovaBuilderAvailable) {
+        $("#dockerBuilderStatusId").html(
+          `<span>
+            installed<i class="ps-2 fas fa-check text-success"></i>
+          </span>
+          `
+        );
+      } else {
+        $("#dockerBuilderStatusId").html(
+          `<span>
+            not available<i class="ps-2 fas fa-times text-danger"></i>
+          </span>
+          `
+        );
+      }
+    },
+  });
+}
+
 function move_to_synched() {
   const opts = $("#unsynched-tbls-select-id");
   $("#synched-tbls-select-id").removeAttr("selected");
@@ -897,7 +943,7 @@ function toggle_tbl_sync() {
 function toggle_android_platform() {
   if ($("#androidCheckboxId")[0].checked === true) {
     $("#dockerCheckboxId").attr("hidden", false);
-    $("#dockerCheckboxId").attr("checked", true);
+    $("#dockerCheckboxId").attr("checked", cordovaBuilderAvailable);
     $("#dockerLabelId").removeClass("d-none");
   } else {
     $("#dockerCheckboxId").attr("hidden", true);

package/routes/admin.js

@@ -107,6 +107,7 @@ const { getSafeSaltcornCmd } = require("@saltcorn/data/utils");
 const stream = require("stream");
 const Crash = require("@saltcorn/data/models/crash");
 const { get_help_markup } = require("../help/index.js");
+const Docker = require("dockerode");
 
 const router = new Router();
 module.exports = router;
@@ -1104,6 +1105,28 @@ router.post(
   })
 );
 
+const pullCordovaBuilder = (req, res) => {
+  const child = spawn("docker", ["pull", "saltcorn/cordova-builder"], {
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+  return new Promise((resolve, reject) => {
+    child.stdout.on("data", (data) => {
+      res.write(data);
+    });
+    child.stderr?.on("data", (data) => {
+      res.write(data);
+    });
+    child.on("exit", function (code, signal) {
+      resolve(code);
+    });
+    child.on("error", (msg) => {
+      const message = msg.message ? msg.message : msg.code;
+      res.write(req.__("Error: ") + message + "\n");
+      resolve(msg.code);
+    });
+  });
+};
+
 /**
  * Do Upgrade
  * @name post/upgrade
@@ -1132,7 +1155,14 @@ router.post(
       child.stderr?.on("data", (data) => {
         res.write(data);
       });
-      child.on("exit", function (code, signal) {
+      child.on("exit", async function (code, signal) {
+        if (code === 0) {
+          res.write(
+            req.__("Pulling the cordova-builder docker image...") + "\n"
+          );
+          const pullCode = await pullCordovaBuilder(req, res);
+          res.write(req.__("Pull done with code %s", pullCode) + "\n");
+        }
         res.end(
           req.__(
             `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
@@ -1481,8 +1511,9 @@ router.get(
     });
   })
 );
-const buildDialogScript = () => {
+const buildDialogScript = (cordovaBuilderAvailable) => {
   return `<script>
+  var cordovaBuilderAvailable = ${cordovaBuilderAvailable};
   function showEntrySelect(type) {
     for( const currentType of ["view", "page", "pagegroup"]) {
       const tab = $('#' + currentType + 'NavLinkID');
@@ -1519,6 +1550,17 @@ const buildDialogScript = () => {
   }
   </script>`;
 };
+
+const imageAvailable = async () => {
+  try {
+    const image = new Docker().getImage("saltcorn/cordova-builder");
+    await image.inspect();
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
 /**
  * Build mobile app
  */
@@ -1538,13 +1580,14 @@ router.get(
     );
     const builderSettings =
       getState().getConfig("mobile_builder_settings") || {};
+    const dockerAvailable = await imageAvailable();
     send_admin_page({
       res,
       req,
       active_sub: "Mobile app",
       headers: [
         {
-          headerTag: buildDialogScript(),
+          headerTag: buildDialogScript(dockerAvailable),
         },
       ],
       contents: {
@@ -2165,6 +2208,56 @@ router.get(
                         )
                       )
                     )
+                  ),
+                  div(
+                    { class: "row pb-3 pt-3" },
+                    div(
+                      label(
+                        { class: "form-label fw-bold" },
+                        req.__("Cordova builder") +
+                          a(
+                            {
+                              href: "javascript:ajax_modal('/admin/help/Cordova Builder?')",
+                            },
+                            i({ class: "fas fa-question-circle ps-1" })
+                          )
+                      )
+                    ),
+                    div(
+                      { class: "col-sm-4" },
+                      div(
+                        {
+                          id: "dockerBuilderStatusId",
+                          class: "",
+                        },
+                        dockerAvailable
+                          ? span(
+                              req.__("installed"),
+                              i({ class: "ps-2 fas fa-check text-success" })
+                            )
+                          : span(
+                              req.__("not available"),
+                              i({ class: "ps-2 fas fa-times text-danger" })
+                            )
+                      )
+                    ),
+                    div(
+                      { class: "col-sm-4" },
+                      button(
+                        {
+                          id: "pullCordovaBtnId",
+                          type: "button",
+                          onClick: `pull_cordova_builder(this);`,
+                          class: "btn btn-warning",
+                        },
+                        req.__("pull")
+                      ),
+                      span(
+                        { role: "button", onClick: "check_cordova_builder()" },
+                        span({ class: "ps-3" }, req.__("refresh")),
+                        i({ class: "ps-2 fas fa-undo" })
+                      )
+                    )
                   )
                 ),
                 button(
@@ -2419,6 +2512,48 @@ router.post(
   })
 );
 
+router.post(
+  "/mobile-app/pull-cordova-builder",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const state = getState();
+    const child = spawn(
+      "docker",
+      ["image", "pull", "saltcorn/cordova-builder:latest"],
+      {
+        stdio: ["ignore", "pipe", "pipe"],
+        cwd: ".",
+      }
+    );
+    child.stdout.on("data", (data) => {
+      state.log(5, data.toString());
+    });
+    child.stderr.on("data", (data) => {
+      state.log(1, data.toString());
+    });
+    child.on("exit", (exitCode, signal) => {
+      state.log(
+        2,
+        `"pull cordova-builder exit with code: ${exitCode} and signal: ${signal}`
+      );
+    });
+    child.on("error", (msg) => {
+      state.log(1, `pull cordova-builder error: ${msg}`);
+    });
+
+    res.json({});
+  })
+);
+
+router.get(
+  "/mobile-app/check-cordova-builder",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const installed = await imageAvailable();
+    res.json({ installed });
+  })
+);
+
 /**
  * Do Clear All
  * @function

package/routes/tables.js

@@ -167,6 +167,10 @@ const tableForm = async (table, req) => {
               label: req.__("Version history"),
               sublabel: req.__("Track table data changes over time"),
               name: "versioned",
+              attributes: {
+                onChange:
+                  "if(!this.checked && !confirm('Are you sure? This will delete all history')) {this.checked = true; return false}",
+              },
               type: "Bool",
             },
             ...(table.name === "users"