@saltcorn/server 1.6.0-alpha.0 → 1.6.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.6.0-alpha.0",
+  "version": "1.6.0-alpha.10",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -9,14 +9,15 @@
     "@aws-sdk/client-s3": "^3.735.0",
     "@aws-sdk/s3-request-presigner": "^3.940.0",
     "@dr.pogodin/csurf": "1.15.0",
-    "@saltcorn/admin-models": "1.6.0-alpha.0",
-    "@saltcorn/base-plugin": "1.6.0-alpha.0",
-    "@saltcorn/builder": "1.6.0-alpha.0",
-    "@saltcorn/data": "1.6.0-alpha.0",
-    "@saltcorn/filemanager": "1.6.0-alpha.0",
-    "@saltcorn/markup": "1.6.0-alpha.0",
-    "@saltcorn/plugins-loader": "1.6.0-alpha.0",
-    "@saltcorn/sbadmin2": "1.6.0-alpha.0",
+    "@saltcorn/admin-models": "1.6.0-alpha.10",
+    "@saltcorn/base-plugin": "1.6.0-alpha.10",
+    "@saltcorn/builder": "1.6.0-alpha.10",
+    "@saltcorn/workflow-editor": "1.6.0-alpha.10",
+    "@saltcorn/data": "1.6.0-alpha.10",
+    "@saltcorn/filemanager": "1.6.0-alpha.10",
+    "@saltcorn/markup": "1.6.0-alpha.10",
+    "@saltcorn/plugins-loader": "1.6.0-alpha.10",
+    "@saltcorn/sbadmin2": "1.6.0-alpha.10",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",
@@ -66,7 +67,13 @@
     "tmp-promise": "^3.0.3",
     "ua-parser-js": "^2.0.0",
     "underscore": "1.13.7",
-    "uuid": "^11.0.5"
+    "uuid": "^11.0.5",
+    "fs-extra": "^11.3.0",
+    "env-paths": "^2.2.1",
+    "@saltcorn/db-common": "1.6.0-alpha.10",
+    "web-push": "^3.6.7",
+    "@saltcorn/types": "1.6.0-alpha.10",
+    "dayjs": "^1.11.13"
   },
   "optionalDependencies": {
     "connect-sqlite3": "^0.9.15",

package/public/saltcorn-builder.css

@@ -26,6 +26,19 @@ div.card.builder {
   border: 1px solid #111111;
 }
 
+div.card.builder.card-drag-over,
+div.card.builder[data-drag-over="true"] {
+  border: 2px solid #28a745 !important;
+  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25) !important;
+  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+}
+
+div.card.builder.card-drag-over .card-body,
+div.card.builder[data-drag-over="true"] .card-body {
+  background-color: rgba(40, 167, 69, 0.1) !important;
+  transition: background-color 0.15s ease-in-out;
+}
+
 table.toolbox td {
   border: 1px solid black;
   width: 70px;
@@ -525,3 +538,222 @@ div.componets-and-library-accordion {
 .toolbox-card:nth-child(2) {
   margin-bottom: 0px;
 }
+
+/* Builder left column & Layers panel dark theme */
+.builder-dark-panel .toolbox-card,
+.builder-dark-panel .componets-and-library-accordion .card {
+  background-color: #212529 !important;
+  border-color: #495057 !important;
+  color: #f8f9fa !important;
+}
+
+.builder-dark-panel .toolbox-card .card-header,
+.builder-dark-panel .componets-and-library-accordion .card-header,
+.builder-dark-panel .accordion .card-header {
+  background-color: #343a40 !important;
+  border-color: #495057 !important;
+  color: #f8f9fa !important;
+}
+
+.card .right-section {
+  display:flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.title-right {
+  min-width: 100px;
+}
+
+.builder-dark-panel .toolbox-card .card-body,
+.builder-dark-panel .componets-and-library-accordion .card-body {
+  background-color: #212529 !important;
+  color: #f8f9fa !important;
+}
+
+.craft-layer-manager__header-actions button[aria-label*="visible"],
+.craft-layer-manager__header-actions button[aria-label*="hidden"] {
+  display: none !important;
+}
+
+.craft-layer-node > div > div > a {
+  display: none !important;
+}
+
+.builder-layer-node {
+  font-size: 13px;
+  padding-right: 10px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-bottom: 1px solid #eee;
+  cursor: pointer;
+}
+
+.builder-dark-panel .builder-layers,
+.builder-layers-dark {
+  background-color: #212529 !important;
+  color: #f8f9fa !important;
+}
+
+.builder-dark-panel .builder-layers *,
+.builder-layers-dark * {
+  color: inherit;
+}
+
+.builder-dark-panel .builder-layers a,
+.builder-layers-dark a {
+  color: #6ea8fe !important;
+}
+
+.builder-dark-panel .builder-layers .collapse-item,
+.builder-dark-panel .accordion-button,
+.builder-dark-panel .accordion-button:not(.collapsed) {
+  background-color: #212529 !important;
+  color: #f8f9fa !important;
+  border-color: #495057 !important;
+}
+
+.builder-dark-panel .accordion-button::after {
+  filter: invert(1);
+}
+
+.builder-dark-panel .accordion-body {
+  background-color: #212529 !important;
+  color: #f8f9fa !important;
+  border-color: #495057 !important;
+}
+
+.builder-dark-panel .builder-expand-toggle-left,
+.builder-dark-panel .builder-expand-toggle-right {
+  color: #adb5bd !important;
+}
+
+/* react-select dark mode: control scoped by .builder-select-dark on Select wrapper,
+   menu scoped by body.builder-dark (menu is portaled to body). All !important to override Emotion. */
+.builder-select-dark .builder-select__control,
+.builder-select-dark .builder-select__control:hover {
+  background-color: #212529 !important;
+  border-color: #495057 !important;
+  color: #1e416423 !important;
+}
+
+.builder-select-dark .builder-select__value-container {
+  background-color: transparent !important;
+}
+
+.builder-select-dark .builder-select__single-value,
+.builder-select-dark .builder-select__input-container {
+  color: #f8f9fa !important;
+}
+
+.builder-select-dark .builder-select__input-container input {
+  color: #f8f9fa !important;
+}
+
+.builder-select-dark .builder-select__placeholder {
+  color: #adb5bd !important;
+}
+
+.builder-select-dark .builder-select__dropdown-indicator,
+.builder-select-dark .builder-select__clear-indicator {
+  color: #adb5bd !important;
+}
+
+.builder-select-dark .builder-select__indicator-separator {
+  background-color: #495057 !important;
+}
+
+/* Dropdown menu (portaled to body) – needs body.builder-dark */
+body.builder-dark .builder-select__menu,
+[data-bs-theme="dark"] .builder-select__menu {
+  background-color: #212529 !important;
+  border: 1px solid #495057 !important;
+}
+
+body.builder-dark .builder-select__menu-list,
+[data-bs-theme="dark"] .builder-select__menu-list {
+  background-color: #212529 !important;
+}
+
+body.builder-dark .builder-select__option,
+[data-bs-theme="dark"] .builder-select__option {
+  background-color: transparent !important;
+  color: #f8f9fa !important;
+}
+
+body.builder-dark .builder-select__option--is-focused,
+[data-bs-theme="dark"] .builder-select__option--is-focused {
+  background-color: #343a40 !important;
+}
+
+body.builder-dark .builder-select__option--is-selected,
+[data-bs-theme="dark"] .builder-select__option--is-selected {
+  background-color: #c78e14 !important;
+  color: #fff !important;
+}
+
+body.builder-dark .builder-select__option--is-selected.builder-select__option--is-focused,
+[data-bs-theme="dark"] .builder-select__option--is-selected.builder-select__option--is-focused {
+  background-color: #0b5ed7 !important;
+}
+
+body.builder-dark .builder-select__group-heading,
+[data-bs-theme="dark"] .builder-select__group-heading {
+  color: #adb5bd !important;
+}
+
+body.builder-dark .builder-select__menu-notice,
+[data-bs-theme="dark"] .builder-select__menu-notice {
+  color: #adb5bd !important;
+}
+
+/* Layers Panel Styling - Light Theme Defaults */
+.builder-layer-node {
+  background-color: transparent; /* Default for light theme */
+  color: #333; /* Default text color for light theme */
+  border-bottom: 1px solid #ddd; /* Lighter border for light theme */
+}
+
+.builder-layer-node.hovered {
+  background-color: #e0e0e0; /* Hover background for light theme */
+}
+
+.builder-layers .builder-layer-node .fa-chevron-down {
+  color: #333; /* Icon color for light theme */
+}
+
+/* Layers Panel Styling - Dark Theme Overrides */
+.builder-dark-panel .builder-layer-node,
+[data-bs-theme="dark"] .builder-layer-node {
+  background-color: transparent;
+  color: #f8f9fa; /* Text color for dark theme */
+  border-bottom: 1px solid #495057; /* Darker border for dark theme */
+}
+
+.builder-dark-panel .builder-layer-node.hovered,
+[data-bs-theme="dark"] .builder-layer-node.hovered {
+  background-color: #343a40; /* Hover background for dark theme */
+}
+
+.builder-dark-panel .builder-layers .builder-layer-node .fa-chevron-down,
+[data-bs-theme="dark"] .builder-layers .builder-layer-node .fa-chevron-down {
+  color: #f8f9fa; /* Icon color for dark theme */
+}
+
+/* Ensure selected nodes maintain visibility */
+.builder-layer-node.selected-node {
+  outline: 1px dashed #2680eb; /* Example: blue dashed outline */
+  outline-offset: -2px;
+}
+
+.code-modal {
+  min-height: 80vh;
+}
+
+.code-modal-form {
+  min-height: 70vh;
+}

package/public/saltcorn-common.js

@@ -439,23 +439,41 @@ function apply_showif() {
     } else {
       cache[qs] = "fetching";
       apply_showif_fetching_urls.add(`/api/${dynwhere.table}?${qs}`);
-      $.ajax(`/api/${dynwhere.table}?${qs}`)
-        .then((resp) => {
-          const cacheNow = global_fetch_options_cache[dynwhere.table] || {};
-          if (resp.success) {
-            if (window._sc_loglevel > 4)
-              console.log("dynwhere fetch", qs, resp.success);
-            activate(resp.success, qs);
-            cacheNow[qs] = resp.success;
-            apply_showif();
-          } else {
-            cacheNow[qs] = undefined;
-          }
-        })
-        .fail(checkNetworkError)
-        .always(() => {
-          apply_showif_fetching_urls.delete(`/api/${dynwhere.table}?${qs}`);
-        });
+      const respHandler = (resp) => {
+        const cacheNow = global_fetch_options_cache[dynwhere.table] || {};
+        if (resp.success) {
+          if (window._sc_loglevel > 4)
+            console.log("dynwhere fetch", qs, resp.success);
+          activate(resp.success, qs);
+          cacheNow[qs] = resp.success;
+          apply_showif();
+        } else {
+          cacheNow[qs] = undefined;
+        }
+      };
+      if (isNode) {
+        $.ajax(`/api/${dynwhere.table}?${qs}`)
+          .then((resp) => {
+            respHandler(resp);
+          })
+          .fail(checkNetworkError)
+          .always(() => {
+            apply_showif_fetching_urls.delete(`/api/${dynwhere.table}?${qs}`);
+          });
+      } else {
+        parent.saltcorn.mobileApp.api
+          .apiCall({
+            path: `/api/${dynwhere.table}?${qs}`,
+            method: "GET",
+          })
+          .then((resp) => {
+            try {
+              respHandler(resp.data);
+            } finally {
+              apply_showif_fetching_urls.delete(`/api/${dynwhere.table}?${qs}`);
+            }
+          });
+      }
     }
   });
   $("[data-filter-table]").each(function (ix, element) {
@@ -717,61 +735,45 @@ function get_form_record(e_in, select_labels) {
     typeof e_in !== "string" && $(e_in).attr("data-show-if-joinfields");
   if (joinFieldsStr) {
     const joinFields = JSON.parse(decodeURIComponent(joinFieldsStr));
+    for (const { ref, target, refTable, refTablePK } of joinFields) {
+      const pk = refTablePK || "id";
+      const keyval = rec[ref]?.[pk] || rec[ref]; // TODO pk name
 
-    const joinVals = $(e_in).prop("data-join-values");
-    const kvals = $(e_in).prop("data-join-key-values") || {};
-    let differentKeys = false;
-    for (const { ref } of joinFields) {
-      if (rec[ref] != kvals[ref]) differentKeys = true;
-    }
-    if (!joinVals || differentKeys) {
-      $(e_in).prop("data-join-values", {});
-      const keyVals = {};
-      for (const { ref, target, refTable } of joinFields) {
-        if (!rec[ref]) continue;
-        keyVals[ref] = rec[ref];
-        const url = `/api/${refTable}?id=${rec[ref]}`;
-        if (global_join_vals_cache[url] === "fetching") continue;
-        if (global_join_vals_cache[url]) {
-          const jvs = $(e_in).prop("data-join-values") || {};
-
-          jvs[ref] = global_join_vals_cache[url];
-          $(e_in).prop("data-join-values", jvs);
-          apply_showif();
-          continue;
-        }
-        global_join_vals_cache[url] = "fetching";
-        $.ajax(url, {
-          success: (val) => {
-            const jvs = $(e_in).prop("data-join-values") || {};
-            global_join_vals_cache[url] = val.success[0];
-            setTimeout(() => {
-              global_join_vals_cache = {};
-            }, 2000);
-            jvs[ref] = val.success[0];
-            $(e_in).prop("data-join-values", jvs);
-            apply_showif();
-          },
-          error: checkNetworkError,
-        });
+      if (!keyval) continue;
+
+      const url = `/api/${refTable}?${pk}=${keyval}`;
+      if (global_join_vals_cache[url] === "fetching") continue;
+      if (global_join_vals_cache[url]) {
+        rec[ref] = global_join_vals_cache[url];
+        continue;
       }
-      $(e_in).prop("data-join-key-values", keyVals);
-    } else if (joinFieldsStr) {
-      Object.assign(rec, joinVals);
+      global_join_vals_cache[url] = "fetching";
+      $.ajax(url, {
+        success: (val) => {
+          global_join_vals_cache[url] = val.success[0];
+          setTimeout(() => {
+            global_join_vals_cache = {};
+          }, 5000);
+          apply_showif();
+        },
+        error: checkNetworkError,
+      });
     }
   }
   return rec;
 }
 function showIfFormulaInputs(e, fml) {
   const rec = get_form_record(e);
-  if (window._sc_loglevel > 4)
-    console.log(`show if fml ${fml} form_record`, rec);
+
   try {
-    return new Function(
+    const result = new Function(
       "row",
       `{${Object.keys(rec).join(",")}}`,
       "return " + fml
     )(rec, rec);
+    if (window._sc_loglevel > 4)
+      console.log(`show if fml ${fml} form_record`, result, rec);
+    return result;
   } catch (e) {
     throw new Error(
       `Error in evaluating showIf formula ${fml} with values ${JSON.stringify(
@@ -1764,6 +1766,7 @@ function card_max_full_screen($card_outer) {
       if (scrollMax > 50) {
         $scrollTarget.css({
           "max-height": scrollMax + "px",
+          "min-height": scrollMax + "px",
           "overflow-y": "auto",
         });
       }
@@ -2299,7 +2302,8 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
       ? viewnameOrElem
       : $(viewnameOrElem)
           .closest("[data-sc-embed-viewname]")
-          .attr("data-sc-embed-viewname");
+          .attr("data-sc-embed-viewname") ||
+        $(viewnameOrElem).closest("form[data-viewname]").attr("data-viewname");
   if (window._sc_loglevel > 4)
     console.log("ajax result directives", viewname, res);
 

package/public/saltcorn-mobile.css

@@ -0,0 +1,5 @@
+#wrapper {
+  padding-top: env(safe-area-inset-top);
+  padding-bottom: env(safe-area-inset-bottom);  
+}
+

package/public/saltcorn.css

@@ -467,6 +467,12 @@ table.table-inner-grid td {
   content: "\f105";
 }
 
+.card .right-section {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
 .d-inline-maybe {
   display: inline;
 }
@@ -990,8 +996,13 @@ input[type="file"].file-has-existing {
   outline: none !important;
 }
 
+.entity-type-group {
+  flex-wrap: wrap;
+  row-gap: 0.25rem;
+}
+
 .blocking-progress-modal .progress-message {
   overflow: auto;
   display: flex;
   flex-direction: column-reverse;
-}
+}

package/public/saltcorn.js

@@ -24,6 +24,54 @@ if (localStorage.getItem("reload_on_init")) {
   location.reload();
 }
 
+// Menu item keyboard shortcuts
+document.addEventListener("keydown", function (e) {
+  if (typeof _sc_menu_shortcuts === "undefined" || !_sc_menu_shortcuts.length)
+    return;
+  // Skip when typing in inputs/textareas/contenteditable
+  var tag = e.target.tagName;
+  if (
+    tag === "INPUT" ||
+    tag === "TEXTAREA" ||
+    tag === "SELECT" ||
+    e.target.isContentEditable
+  )
+    return;
+  for (var i = 0; i < _sc_menu_shortcuts.length; i++) {
+    const sc = _sc_menu_shortcuts[i];
+    const parts = sc.shortcut.split("+");
+    let needAlt = false,
+      needCtrl = false,
+      needShift = false,
+      needMeta = false;
+    let key = "";
+    for (var j = 0; j < parts.length; j++) {
+      var p = parts[j].trim().toLowerCase();
+      if (p === "alt") needAlt = true;
+      else if (p === "ctrl") needCtrl = true;
+      else if (p === "shift") needShift = true;
+      else if (p === "meta") needMeta = true;
+      else key = p;
+    }
+    if (
+      e.altKey === needAlt &&
+      e.ctrlKey === needCtrl &&
+      e.shiftKey === needShift &&
+      e.metaKey === needMeta &&
+      (e.key === " " ? "space" : e.key.toLowerCase()) === key
+    ) {
+      e.preventDefault();
+      const link = sc.link;
+      if (link.startsWith("javascript:")) {
+        new Function(link.substring(11))();
+      } else {
+        window.location.href = link;
+      }
+      return;
+    }
+  }
+});
+
 //https://stackoverflow.com/a/6021027
 function updateQueryStringParameter(uri1, key, value) {
   let hash = "";
@@ -1177,44 +1225,41 @@ function pull_capacitor_builder() {
   });
 }
 
-function check_xcodebuild() {
-  const handleVersion = (version) => {
-    const tokens = version.split(".");
-    const majVers = parseInt(tokens[0]);
-    const marker = $("#versionMarkerId");
-    if (majVers >= 11) {
-      marker.removeClass("text-danger");
-      marker.addClass("text-success");
-      marker.removeClass("fa-times");
-      marker.addClass("fa-check");
-    } else {
-      marker.removeClass("text-success");
-      marker.addClass("text-danger");
-      marker.removeClass("fa-check");
-      marker.addClass("fa-times");
-    }
-  };
-  $.ajax("/admin/mobile-app/check-xcodebuild", {
+function check_ios_build_deps() {
+  $.ajax("/admin/mobile-app/check-ios-build-tools", {
     type: "GET",
     success: function (res) {
-      if (res.installed) {
-        $("#xcodebuildStatusId").html(
-          `<span>
-            installed<i class="ps-2 fas fa-check text-success"></i>
-          </span>
-          `
-        );
-        $("#xcodebuildVersionBoxId").removeClass("d-none");
-        $("#xcodebuildVersionId").html(` ${res.version}`);
-        handleVersion(res.version || "0");
-      } else {
-        $("#xcodebuildStatusId").html(
-          `<span>
-            not available<i class="ps-2 fas fa-times text-danger"></i>
-          </span>
-          `
-        );
-        $("#xcodebuildVersionBoxId").addClass("d-none");
+      const { xcodebuild, cocoapods, isMac } = res;
+      if (isMac) {
+        // update xcodebuild status
+        if (xcodebuild.installed) {
+          $("#xcodebuildStatusId").html(
+            `${xcodebuild.version}<i class="p-2 fas ${
+              xcodebuild.fullfilled
+                ? "fa-check text-success"
+                : "fa-times text-danger"
+            }"></i>`
+          );
+        } else {
+          $("#xcodebuildStatusId").html(
+            `not available<i class="p-2 fas fa-times text-danger"></i>`
+          );
+        }
+
+        // update cocoapods status
+        if (cocoapods.installed) {
+          $("#cocoapodsStatusId").html(
+            `${cocoapods.version}<i class="p-2 fas ${
+              cocoapods.fullfilled
+                ? "fa-check text-success"
+                : "fa-times text-danger"
+            }"></i>`
+          );
+        } else {
+          $("#cocoapodsStatusId").html(
+            `not available<i class="p-2 fas fa-times text-danger"></i>`
+          );
+        }
       }
     },
   });
@@ -1623,14 +1668,14 @@ function ensure_css_loaded(src) {
         l = function (a, b) {
           d = setTimeout(function () {
             d = !1;
-            if (h || c) (e.apply(a, b), c && (j = +new Date()));
+            if (h || c) e.apply(a, b), c && (j = +new Date());
             i && g.apply(a, b);
           }, f);
         },
         k = function () {
           if (!d || a) {
             if (!d && !h && (!c || +new Date() - j > f))
-              (e.apply(this, arguments), c && (j = +new Date()));
+              e.apply(this, arguments), c && (j = +new Date());
             (a || !c) && clearTimeout(d);
             l(this, arguments);
           }