@saltcorn/server 1.0.0-beta.17 → 1.0.0-beta.19

package/package.json

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

package/public/saltcorn-common.js

@@ -764,6 +764,42 @@ function doMobileTransforms() {
     }
   });
 
+  $("[mobile-youtube-video]").each(function () {
+    const jThis = $(this);
+    const src = jThis.attr("src");
+    if (src) {
+      const rndid = `m-video-${Math.floor(Math.random() * 16777215).toString(
+        16
+      )}`;
+      const url = new URL(src);
+      const path = url.pathname;
+      const imageId = path.split("/").pop();
+      const thumbnailContainer = document.createElement("div");
+      thumbnailContainer.className = "mobile-thumbnail-container";
+      thumbnailContainer.id = rndid;
+      const img = document.createElement("img");
+      img.src = `https://img.youtube.com/vi/${imageId}/0.jpg`;
+      img.style = "width: 100%; max-width: 600px;";
+      img.id = rndid;
+      img.setAttribute(
+        "onclick",
+        `openInAppBrowser('${src.replace(
+          "com/embed",
+          "com/watch"
+        )}', '${rndid}')`
+      );
+      thumbnailContainer.appendChild(img);
+      const spinner = document.createElement("div");
+      spinner.className = "mobile-thumbnail-spinner-overlay";
+      const spinnerInner = document.createElement("div");
+      spinnerInner.className = "d-none spinner-border text-light";
+      spinnerInner.setAttribute("role", "status");
+      spinner.appendChild(spinnerInner);
+      thumbnailContainer.appendChild(spinner);
+      jThis.replaceWith(thumbnailContainer);
+    }
+  });
+
   $("button").each(function () {
     for (const [k, v] of Object.entries({ onclick: replacers.onclick })) {
       for ({ web, mobile } of v) replaceAttr(this, k, v.web, v.mobile);
@@ -1870,6 +1906,8 @@ function close_saltcorn_modal() {
   }
 }
 
+let _sc_currently_reloading;
+
 function reload_embedded_view(viewname, new_query_string) {
   const isNode = getIsNode();
   const updater = ($e, res) => {
@@ -1897,15 +1935,19 @@ function reload_embedded_view(viewname, new_query_string) {
       url = url.split("?")[0] + "?" + new_query_string;
     }
     if (isNode) {
+      if (url === _sc_currently_reloading) return;
+      _sc_currently_reloading = url;
       $.ajax(url, {
         headers: {
           pjaxpageload: "true",
           localizedstate: "true", //no admin bar
         },
         success: function (res, textStatus, request) {
+          _sc_currently_reloading = null;
           updater($e, res);
         },
         error: function (res) {
+          _sc_currently_reloading = null;
           if (!checkNetworkError(res))
             notifyAlert({ type: "danger", text: res.responseText });
         },

package/public/saltcorn.css

@@ -590,3 +590,20 @@ button.monospace-copy-btn {
 .custom-file-label {
   margin-left: 10px;
 }
+
+.mobile-thumbnail-container {
+  position: relative;
+  display: inline-block;
+}
+
+.mobile-thumbnail-spinner-overlay {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 10;
+}
+
+.mobile-thumbnail-container img {
+  display: block;
+}

package/public/saltcorn.js

@@ -629,6 +629,7 @@ function checkNetworkError(e) {
     setTimeout(() => {
       scNetworkErrorSignaled = false;
     }, 1000);
+    console.error("Network error", e);
     notifyAlert({
       type: "danger",
       text: "Network connection error",

package/routes/admin.js

@@ -378,7 +378,9 @@ router.get(
             : { type: "blank", contents: "" },
           {
             type: "card",
-            title: req.__("Snapshots"),
+            title:
+              req.__("Snapshots") +
+              `<a href="javascript:ajax_modal('/admin/help/Snapshots?')"><i class="fas fa-question-circle ms-1"></i></a>`,
             titleAjaxIndicator: true,
             contents: div(
               p(
@@ -1266,6 +1268,50 @@ const pullCordovaBuilder = (req, res) => {
   });
 };
 
+const tryInstallSdNotify = (req, res) => {
+  const child = spawn("npm", ["install", "-g", "sd-notify"], {
+    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);
+    });
+  });
+};
+
+const pruneDocker = (req, res) => {
+  const child = spawn("docker", ["image", "prune", "-f"], {
+    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);
+    });
+  });
+};
+
 /*
  * fetch available saltcorn versions and show a dialog to select one
  */
@@ -1449,10 +1495,26 @@ const doInstall = async (req, res, version, deepClean, runPull) => {
       res.write(data);
     });
     child.on("exit", async function (code, signal) {
-      if (code === 0 && runPull) {
-        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");
+      if (code === 0) {
+        if (deepClean) {
+          res.write(req.__("Installing sd-notify") + "\n");
+          const sdNotifyCode = await tryInstallSdNotify(req, res);
+          res.write(
+            req.__("sd-notify install done with code %s", sdNotifyCode) + "\n"
+          );
+        }
+        if (runPull) {
+          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");
+          if (pullCode === 0) {
+            res.write(req.__("Pruning docker...") + "\n");
+            const pruneCode = await pruneDocker(req, res);
+            res.write(req.__("Prune done with code %s", pruneCode) + "\n");
+          }
+        }
       }
       res.end(
         version === "latest"

package/routes/fields.js

@@ -136,6 +136,9 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         sublabel: req.__("Calculated from other fields with a formula"),
         type: "Bool",
         disabled: !!id,
+        help: {
+          topic: "Calculated fields",
+        },
       }),
       new Field({
         label: req.__("Required"),
@@ -169,6 +172,9 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         type: "Bool",
         disabled: !!id,
         showIf: { calculated: true },
+        help: {
+          topic: "Calculated fields",
+        },
       }),
       new Field({
         label: req.__("Protected"),
@@ -176,6 +182,9 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         sublabel: req.__("Set role to access"),
         type: "Bool",
         showIf: { calculated: false },
+        help: {
+          topic: "Protected fields",
+        },
       }),
       {
         label: req.__("Minimum role to write"),

package/routes/plugins.js

@@ -1235,14 +1235,16 @@ router.get(
     let latest =
       update_permitted &&
       (await get_latest_npm_version(plugin_db.location, 1000));
-    if (
-      latest &&
-      !isVersionSupported(latest, await load_plugins.getEngineInfos(plugin_db)) // with cache
-    ) {
-      // with force fetch
+    let engineInfos = await load_plugins.getEngineInfos(plugin_db); // with cache
+    let forceFetch = true;
+    if (latest && !engineInfos[latest]) {
+      engineInfos = await load_plugins.getEngineInfos(plugin_db, forceFetch);
+      forceFetch = false;
+    }
+    if (latest && !isVersionSupported(latest, engineInfos)) {
       latest = supportedVersion(
         latest,
-        await load_plugins.getEngineInfos(plugin_db, true)
+        await load_plugins.getEngineInfos(plugin_db, forceFetch)
       );
     }
     const can_update = update_permitted && latest && mod.version !== latest;

package/routes/tables.js

@@ -192,6 +192,9 @@ const tableForm = async (table, req) => {
                   "if(!this.checked && !confirm('Are you sure? This will delete all history')) {this.checked = true; return false}",
               },
               type: "Bool",
+              help: {
+                topic: "Table history",
+              },
             },
             ...(table.name === "users"
               ? []
@@ -798,7 +801,7 @@ router.get(
             key: (r) => attribBadges(r),
           },
           { label: req.__("Variable name"), key: (t) => code(t.name) },
-          ...(table.external || db.isSQLite
+          ...(table.external
             ? []
             : [
                 {