@saltcorn/server 0.9.5-beta.2 → 0.9.5-beta.21

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.5-beta.2",
+  "version": "0.9.5-beta.21",
   "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.2",
-    "@saltcorn/builder": "0.9.5-beta.2",
-    "@saltcorn/data": "0.9.5-beta.2",
-    "@saltcorn/admin-models": "0.9.5-beta.2",
-    "@saltcorn/filemanager": "0.9.5-beta.2",
-    "@saltcorn/markup": "0.9.5-beta.2",
-    "@saltcorn/sbadmin2": "0.9.5-beta.2",
+    "@saltcorn/base-plugin": "0.9.5-beta.21",
+    "@saltcorn/builder": "0.9.5-beta.21",
+    "@saltcorn/data": "0.9.5-beta.21",
+    "@saltcorn/admin-models": "0.9.5-beta.21",
+    "@saltcorn/filemanager": "0.9.5-beta.21",
+    "@saltcorn/markup": "0.9.5-beta.21",
+    "@saltcorn/plugins-loader": "0.9.5-beta.21",
+    "@saltcorn/sbadmin2": "0.9.5-beta.21",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -26,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",
@@ -37,7 +39,6 @@
     "i18n": "^0.15.1",
     "imapflow": "1.0.123",
     "jsonwebtoken": "^9.0.0",
-    "live-plugin-manager": "^0.17.1",
     "markdown-it": "^13.0.2",
     "moment": "^2.29.4",
     "multer": "1.4.5-lts.1",
@@ -70,8 +71,8 @@
   },
   "repository": "github:saltcorn/saltcorn",
   "devDependencies": {
-    "jest": "26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
+    "jest": "^28.1.3",
+    "jest-environment-jsdom": "28.1.3",
     "supertest": "^6.3.3"
   },
   "scripts": {
@@ -84,11 +85,13 @@
     "testEnvironment": "node",
     "testPathIgnorePatterns": [
       "/node_modules/",
-      "/plugin_packages/"
+      "/plugin_packages/",
+      "/plugins_folder/"
     ],
     "coveragePathIgnorePatterns": [
       "/node_modules/",
-      "/plugin_packages/"
+      "/plugin_packages/",
+      "/plugins_folder/"
     ],
     "moduleNameMapper": {
       "@saltcorn/sqlite/(.*)": "<rootDir>/../sqlite/dist/$1",

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 {
@@ -159,10 +159,18 @@ function apply_showif() {
       decodeURIComponent(e.attr("data-fetch-options"))
     );
     if (window._sc_loglevel > 4) console.log("dynwhere", dynwhere);
-    const kvToQs = ([k, v]) => {
+    const kvToQs = ([k, v], is_or) => {
       return k === "or" && Array.isArray(v)
-        ? v.map((v1) => Object.entries(v1).map(kvToQs).join("&")).join("&")
-        : `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}`;
+        ? v
+            .map((v1) =>
+              Object.entries(v1)
+                .map((kv) => kvToQs(kv, true))
+                .join("&")
+            )
+            .join("&")
+        : `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}${
+            is_or ? "&_or_field=" + k : ""
+          }`;
     };
     const qss = Object.entries(dynwhere.whereParsed).map(kvToQs);
     if (dynwhere.dereference) {
@@ -571,7 +579,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();
@@ -743,23 +751,58 @@ function initialize_page() {
       </form>`
       );
   });
-  $("[mobile-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-img-path");
-      const base64Encoded = await parent.loadEncodedFile(fileId);
-      this.src = base64Encoded;
-    }
-  });
-  $("[mobile-bg-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-bg-img-path");
-      if (fileId) {
+  if (!isNode) {
+    $("[mobile-img-path]").each(async function () {
+      if (parent.loadEncodedFile) {
+        const fileId = $(this).attr("mobile-img-path");
         const base64Encoded = await parent.loadEncodedFile(fileId);
-        this.style.backgroundImage = `url("${base64Encoded}")`;
+        this.src = base64Encoded;
       }
-    }
-  });
+    });
+
+    $("[mobile-bg-img-path]").each(async function () {
+      if (parent.loadEncodedFile) {
+        const fileId = $(this).attr("mobile-bg-img-path");
+        if (fileId) {
+          const base64Encoded = await parent.loadEncodedFile(fileId);
+          this.style.backgroundImage = `url("${base64Encoded}")`;
+        }
+      }
+    });
+
+    $("a").each(function () {
+      let path = $(this).attr("href") || "";
+      if (path.startsWith("http")) {
+        const url = new URL(path);
+        path = `${url.pathname}${url.search}`;
+      }
+      if (path.startsWith("/view/")) {
+        const jThis = $(this);
+        const skip = jThis.attr("skip-mobile-adjust");
+        if (!skip) {
+          jThis.attr("href", `javascript:execLink('${path}')`);
+          if (jThis.find("i,img").length === 0 && !jThis.css("color")) {
+            jThis.css(
+              "color",
+              "rgba(var(--bs-link-color-rgb),var(--bs-link-opacity,1))"
+            );
+          }
+        }
+      }
+    });
 
+    $("img").each(async function () {
+      if (parent.loadEncodedFile) {
+        const jThis = $(this);
+        const src = jThis.attr("src");
+        if (src?.startsWith("/files/serve/")) {
+          const fileId = src.replace("/files/serve/", "");
+          const base64Encoded = await parent.loadEncodedFile(fileId);
+          this.src = base64Encoded;
+        }
+      }
+    });
+  }
   function setExplainer(that) {
     var id = $(that).attr("id") + "_explainer";
 
@@ -872,12 +915,31 @@ function initialize_page() {
       .find(".show[rendered='server-side'][type='success']")
       .removeClass("show");
   }, 5000);
+  $(".lazy-accoordion").on("show.bs.collapse", function (e) {
+    const $e = $(e.target).find("[data-sc-view-source]");
+    if ($.trim($e.html()) == "") {
+      const url = $e.attr("data-sc-view-source");
+      $.ajax(url, {
+        headers: {
+          pjaxpageload: "true",
+          localizedstate: "true", //no admin bar
+        },
+        success: function (res, textStatus, request) {
+          $e.html(res);
+          initialize_page();
+        },
+        error: function (res) {
+          notifyAlert({ type: "danger", text: res.responseText });
+        },
+      });
+    }
+  });
 }
 
 $(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 +947,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 +1087,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 +1106,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,
@@ -1167,8 +1238,10 @@ async function common_done(res, viewname, isWeb = true) {
     await handle(res.notify_success, (text) =>
       notifyAlert({ type: "success", text: text })
     );
-  if (res.set_fields && viewname) {
-    const form = $(`form[data-viewname="${viewname}"]`);
+  if (res.set_fields && (viewname || res.set_fields._viewname)) {
+    const form = $(
+      `form[data-viewname="${res.set_fields._viewname || viewname}"]`
+    );
     if (form.length === 0 && set_state_fields) {
       // assume this is a filter
       set_state_fields(
@@ -1178,6 +1251,7 @@ async function common_done(res, viewname, isWeb = true) {
       );
     } else {
       Object.keys(res.set_fields).forEach((k) => {
+        if (k === "_viewname") return;
         const input = form.find(
           `input[name=${k}], textarea[name=${k}], select[name=${k}]`
         );
@@ -1186,6 +1260,7 @@ async function common_done(res, viewname, isWeb = true) {
           form.append(
             `<input type="hidden" name="id" value="${res.set_fields[k]}">`
           );
+          reloadEmbeddedEditOwnViews(form, res.set_fields[k]);
           return;
         }
         if (input.attr("type") === "checkbox")
@@ -1250,6 +1325,28 @@ async function common_done(res, viewname, isWeb = true) {
   }
 }
 
+function reloadEmbeddedEditOwnViews(form, id) {
+  form.find("div[sc-load-on-assign-id]").each(function () {
+    const $e = $(this);
+    const viewname = $e.attr("sc-load-on-assign-id");
+    const newUrl = `/view/${viewname}?id=${id}`;
+    $.ajax(newUrl, {
+      headers: {
+        pjaxpageload: "true",
+        localizedstate: "true", //no admin bar
+      },
+      success: function (res, textStatus, request) {
+        const newE = `<div class="d-inline" data-sc-embed-viewname="${viewname}" data-sc-view-source="${newUrl}">${res}</div>`;
+        $e.replaceWith(newE);
+        initialize_page();
+      },
+      error: function (res) {
+        notifyAlert({ type: "danger", text: res.responseText });
+      },
+    });
+  });
+}
+
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
@@ -1542,3 +1639,55 @@ function set_readonly_select(e) {
   const option = options.find((o) => o.value == e.target.value);
   if (option) $disp.val(option.label);
 }
+
+function close_saltcorn_modal() {
+  $("#scmodal").off("hidden.bs.modal");
+  var myModalEl = document.getElementById("scmodal");
+  if (!myModalEl) return;
+  var modal = bootstrap.Modal.getInstance(myModalEl);
+  if (modal) {
+    if (modal.hide) modal.hide();
+    if (modal.dispose) modal.dispose();
+  }
+}
+
+function reload_embedded_view(viewname, new_query_string) {
+  const isNode = getIsNode();
+  const updater = ($e, res) => {
+    $e.html(res);
+    initialize_page();
+  };
+  if (window._sc_loglevel > 4)
+    console.log(
+      "reload_embedded_view",
+      viewname,
+      "found",
+      $(`[data-sc-embed-viewname="${viewname}"]`).length
+    );
+  $(`[data-sc-embed-viewname="${viewname}"]`).each(function () {
+    const $e = $(this);
+    let url = $e.attr("data-sc-local-state") || $e.attr("data-sc-view-source");
+    if (!url) return;
+    if (new_query_string) {
+      url = url.split("?")[0] + "?" + new_query_string;
+    }
+    if (isNode) {
+      $.ajax(url, {
+        headers: {
+          pjaxpageload: "true",
+          localizedstate: "true", //no admin bar
+        },
+        success: function (res, textStatus, request) {
+          updater($e, res);
+        },
+        error: function (res) {
+          notifyAlert({ type: "danger", text: res.responseText });
+        },
+      });
+    } else {
+      runUrl(url).then((html) => {
+        updater($e, html);
+      });
+    }
+  });
+}

package/public/saltcorn.css

@@ -502,3 +502,7 @@ tr[onclick] {
 .editStarRating i.fa-star {
   color: unset;
 }
+
+.modal-header {
+  justify-content: space-between;
+}

package/public/saltcorn.js

@@ -154,37 +154,6 @@ $(function () {
   });
 });
 
-function reload_embedded_view(viewname, new_query_string) {
-  if (window._sc_loglevel > 4)
-    console.log(
-      "reload_embedded_view",
-      viewname,
-      "found",
-      $(`[data-sc-embed-viewname="${viewname}"]`).length
-    );
-  $(`[data-sc-embed-viewname="${viewname}"]`).each(function () {
-    const $e = $(this);
-    let url = $e.attr("data-sc-local-state") || $e.attr("data-sc-view-source");
-    if (!url) return;
-    if (new_query_string) {
-      url = url.split("?")[0] + "?" + new_query_string;
-    }
-    $.ajax(url, {
-      headers: {
-        pjaxpageload: "true",
-        localizedstate: "true", //no admin bar
-      },
-      success: function (res, textStatus, request) {
-        $e.html(res);
-        initialize_page();
-      },
-      error: function (res) {
-        notifyAlert({ type: "danger", text: res.responseText });
-      },
-    });
-  });
-}
-
 function pjax_to(href, e) {
   let $modal = $("#scmodal");
   const inModal = $modal.length && $modal.hasClass("show");
@@ -323,17 +292,6 @@ function globalErrorCatcher(message, source, lineno, colno, error) {
   });
 }
 
-function close_saltcorn_modal() {
-  $("#scmodal").off("hidden.bs.modal");
-  var myModalEl = document.getElementById("scmodal");
-  if (!myModalEl) return;
-  var modal = bootstrap.Modal.getInstance(myModalEl);
-  if (modal) {
-    if (modal.hide) modal.hide();
-    if (modal.dispose) modal.dispose();
-  }
-}
-
 function ensure_modal_exists_and_closed() {
   if ($("#scmodal").length === 0) {
     $("body").append(`<div id="scmodal" class="modal">
@@ -450,7 +408,14 @@ function saveAndContinueAsync(e) {
   });
 }
 
-function saveAndContinue(e, k) {
+function saveAndContinue(e, k, event) {
+  if (
+    event &&
+    event.target &&
+    event.target.classList &&
+    event.target.classList.contains("no-form-change")
+  )
+    return;
   var form = $(e).closest("form");
   const valres = form[0].reportValidity();
   if (!valres) return;
@@ -471,6 +436,7 @@ function saveAndContinue(e, k) {
         form.append(
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
+        reloadEmbeddedEditOwnViews(form, res.id);
       }
       common_done(res, form.attr("data-viewname"));
     },
@@ -515,6 +481,7 @@ function applyViewConfig(e, url, k, event) {
     cfg[item.name] = item.value;
   });
   ajax_indicator(true, e);
+  window.savingViewConfig = true;
   $.ajax(url, {
     type: "POST",
     dataType: "json",
@@ -524,9 +491,11 @@ function applyViewConfig(e, url, k, event) {
     },
     data: JSON.stringify(cfg),
     error: function (request) {
+      window.savingViewConfig = false;
       ajax_indicate_error(e, request);
     },
     success: function (res) {
+      window.savingViewConfig = false;
       ajax_indicator(false);
       k && k(res);
       !k && updateViewPreview();
@@ -549,10 +518,12 @@ function updateViewPreview() {
       },
 
       error: function (resp) {
-        $("#viewcfg-preview-error").html(resp.responseText || resp.statusText);
+        $("#viewcfg-preview-error")
+          .show()
+          .html(resp.responseText || resp.statusText);
       },
       success: function (res) {
-        $("#viewcfg-preview-error").html("");
+        $("#viewcfg-preview-error").hide().html("");
         $preview.css({ opacity: 1.0 });
 
         //disable functions preview migght try to call
@@ -821,6 +792,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 +816,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 +914,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);
@@ -916,6 +933,10 @@ function join_field_clicked(e, fieldPath) {
   apply_showif();
 }
 
+function execLink(path) {
+  window.location.href = `${location.origin}${path}`;
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";

package/restart_watcher.js

@@ -16,6 +16,7 @@ const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 const relevantPackages = [
   "db-common",
   "common-code",
+  "plugins-loader",
   "postgres",
   "saltcorn-data",
   "saltcorn-builder",
@@ -37,6 +38,7 @@ const excludePatterns = [
   /\.docs/,
   /migrations/,
   /.*test.js/,
+  /.*test.ts/,
 ];
 
 /**

package/routes/actions.js

@@ -307,6 +307,14 @@ const triggerForm = async (req, trigger) => {
         showIf: { when_trigger: ["API call"] },
         options: roleOptions,
       },
+      {
+        name: "_raw_output",
+        label: "Raw Output",
+        parent_field: "configuration",
+        sublabel: req.__("Do not wrap response in a success object"),
+        type: "Bool",
+        showIf: { when_trigger: ["API call"] },
+      },
     ],
   });
   // if (trigger) {
@@ -450,6 +458,11 @@ router.post(
         },
       });
     } else {
+      if (form.values.configuration)
+        form.values.configuration = {
+          ...trigger.configuration,
+          ...form.values.configuration,
+        };
       await Trigger.update(trigger.id, form.values); //{configuration: form.values});
       req.flash("success", req.__("Action information saved"));
       res.redirect(`/actions/`);
@@ -662,6 +675,7 @@ router.get(
         onChange: "saveAndContinue(this)",
         submitLabel: req.__("Done"),
         fields: cfgFields,
+        ...(action.configFormOptions || {}),
       });
       // populate form values
       form.values = trigger.configuration;
@@ -729,7 +743,9 @@ router.post(
           },
         });
     } else {
-      await Trigger.update(trigger.id, { configuration: form.values });
+      await Trigger.update(trigger.id, {
+        configuration: { ...trigger.configuration, ...form.values },
+      });
       if (req.xhr) {
         res.json({ success: "ok" });
         return;