@saltcorn/server 0.7.3 → 0.7.4-beta.2

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.3",
+  "version": "0.7.4-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.7.3",
-    "@saltcorn/builder": "0.7.3",
-    "@saltcorn/data": "0.7.3",
-    "@saltcorn/admin-models": "0.7.3",
-    "@saltcorn/markup": "0.7.3",
-    "@saltcorn/sbadmin2": "0.7.3",
+    "@saltcorn/base-plugin": "0.7.4-beta.2",
+    "@saltcorn/builder": "0.7.4-beta.2",
+    "@saltcorn/data": "0.7.4-beta.2",
+    "@saltcorn/admin-models": "0.7.4-beta.2",
+    "@saltcorn/markup": "0.7.4-beta.2",
+    "@saltcorn/sbadmin2": "0.7.4-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/jquery-menu-editor.min.js

@@ -153,7 +153,7 @@ function MenuEditor(e, t) {
             }
           });
         })((n = $(this).closest("li")));
-      l.onUpdate();
+      //l.onUpdate();
     }),
     s.on("click", ".btnUp", function (e) {
       e.preventDefault();

package/public/saltcorn-builder.css

@@ -364,3 +364,78 @@ Copyright (c) 2017 Taha Paksu
 .dropdown-menu.searchbar-dropdown.show {
   transform: translate(0px, 40px);
 }
+
+.tippy-box[data-animation="fade"][data-state="hidden"] {
+  opacity: 0;
+}
+[data-tippy-root] {
+  max-width: calc(100vw - 10px);
+}
+.tippy-box {
+  position: relative;
+  background-color: #333;
+  color: #fff;
+  border-radius: 4px;
+  font-size: 14px;
+  line-height: 1.4;
+  white-space: normal;
+  outline: 0;
+  transition-property: transform, visibility, opacity;
+}
+.tippy-box[data-placement^="top"] > .tippy-arrow {
+  bottom: 0;
+}
+.tippy-box[data-placement^="top"] > .tippy-arrow:before {
+  bottom: -7px;
+  left: 0;
+  border-width: 8px 8px 0;
+  border-top-color: initial;
+  transform-origin: center top;
+}
+.tippy-box[data-placement^="bottom"] > .tippy-arrow {
+  top: 0;
+}
+.tippy-box[data-placement^="bottom"] > .tippy-arrow:before {
+  top: -7px;
+  left: 0;
+  border-width: 0 8px 8px;
+  border-bottom-color: initial;
+  transform-origin: center bottom;
+}
+.tippy-box[data-placement^="left"] > .tippy-arrow {
+  right: 0;
+}
+.tippy-box[data-placement^="left"] > .tippy-arrow:before {
+  border-width: 8px 0 8px 8px;
+  border-left-color: initial;
+  right: -7px;
+  transform-origin: center left;
+}
+.tippy-box[data-placement^="right"] > .tippy-arrow {
+  left: 0;
+}
+.tippy-box[data-placement^="right"] > .tippy-arrow:before {
+  left: -7px;
+  border-width: 8px 8px 8px 0;
+  border-right-color: initial;
+  transform-origin: center right;
+}
+.tippy-box[data-inertia][data-state="visible"] {
+  transition-timing-function: cubic-bezier(0.54, 1.5, 0.38, 1.11);
+}
+.tippy-arrow {
+  width: 16px;
+  height: 16px;
+  color: #333;
+}
+.tippy-arrow:before {
+  content: "";
+  position: absolute;
+  border-color: transparent;
+  border-style: solid;
+}
+.tippy-content {
+  position: relative;
+  padding: 5px 9px;
+  z-index: 1;
+}

package/public/saltcorn-common.js

@@ -39,16 +39,26 @@ function apply_showif() {
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
     try {
-      var to_show = new Function(
-        "e",
-        "return " + decodeURIComponent(e.attr("data-show-if"))
-      );
+      let to_show = e.data("data-show-if-fun");
+      if (!to_show) {
+        to_show = new Function(
+          "e",
+          "return " + decodeURIComponent(e.attr("data-show-if"))
+        );
+        e.data("data-show-if-fun", to_show);
+      }
+      if (!e.data("data-closest-form-ns"))
+        e.data("data-closest-form-ns", e.closest(".form-namespace"));
       if (to_show(e))
         e.show()
           .find("input, textarea, button, select")
           .prop("disabled", e.attr("data-disabled") || false);
       else
-        e.hide().find("input, textarea, button, select").prop("disabled", true);
+        e.hide()
+          .find(
+            "input:enabled, textarea:enabled, button:enabled, select:enabled"
+          )
+          .prop("disabled", true);
     } catch (e) {
       console.error(e);
     }
@@ -111,7 +121,12 @@ function apply_showif() {
               `<option ${
                 `${current}` === `${r[dynwhere.refname]}` ? "selected" : ""
               } value="${r[dynwhere.refname]}">${
-                r[dynwhere.summary_field]
+                dynwhere.label_formula
+                  ? new Function(
+                      `{${Object.keys(r).join(",")}}`,
+                      "return " + dynwhere.label_formula
+                    )(r)
+                  : r[dynwhere.summary_field]
               }</option>`
             )
           );
@@ -510,7 +525,7 @@ const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
     if ($e.length) $e.val(v);
     else
       form.append(
-        `<input type="hidden" name="${k}_${ix}" value="${v}"></input>`
+        `<input type="hidden" data-repeater-ix="${ix}" name="${k}_${ix}" value="${v}"></input>`
       );
   };
   vs.forEach((v, ix) => {
@@ -521,8 +536,8 @@ const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
     });
   });
   //delete
-  //for (let ix = vs.length; ix < vs.length + 20; ix++) {
-  // $(`input[name="${k}_${ix}"]`).remove();
+  //for (let ix = vs.length; ix < vs.length + 5; ix++) {
+  //  $(`input[data-repeater-ix="${ix}"]`).remove();
   //}
   $(`input[type=hidden]`).each(function () {
     const name = $(this).attr("name");

package/public/saltcorn.css

@@ -319,4 +319,31 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
 .editStarRating input:checked + label,
 .editStarRating input:checked + label ~ label {
 	color: #ffc107; 
-}
+}
+
+.CodeMirror {
+  resize: vertical;
+}
+
+/* copied from bootstrap and adjusted to show the arrow on the left */
+.card .card-header-left-collapse[data-bs-toggle=collapse] {
+  text-decoration: none;
+  position: relative;
+  padding: 0.75rem 3.25rem 0.75rem 1.25rem;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse]::before {
+  position: absolute;
+  left: 0;
+  top: 0;
+  line-height: 51px;
+  font-weight: 900;
+  content: "\f107";
+  font-family: "Font Awesome 5 Free";
+  color: #d1d3e2;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed {
+  border-radius: 0.35rem;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed::before {
+  content: "\f105";
+}

package/public/saltcorn.js

@@ -143,6 +143,8 @@ function view_post(viewname, route, data, onDone) {
   }).done(function (res) {
     if (onDone) onDone(res);
     ajax_done(res);
+  }).fail(function (res) {
+    notifyAlert({ type: "danger", text: res.responseText });
   });
 }
 var logged_errors = [];
@@ -210,9 +212,9 @@ function ajax_modal(url, opts = {}) {
       $("#scmodal .modal-body").html(res);
       new bootstrap.Modal($("#scmodal")).show();
       initialize_page();
-      (opts.onOpen || function () {})(res);
+      (opts.onOpen || function () { })(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
-        (opts.onClose || function () {})(res);
+        (opts.onClose || function () { })(res);
         $("body").css("overflow", "");
       });
     },
@@ -264,7 +266,7 @@ function applyViewConfig(e, url, k) {
       "CSRF-Token": _sc_globalCsrf,
     },
     data: JSON.stringify(cfg),
-    error: function (request) {},
+    error: function (request) { },
     success: function (res) {
       k && k(res);
     },
@@ -444,16 +446,16 @@ Copyright (c) 2015 Jeff Green
             stateObject,
             document.title,
             window.location.pathname +
-              window.location.search +
-              $(this).attr("href")
+            window.location.search +
+            $(this).attr("href")
           );
         } else {
           window.history.replaceState(
             stateObject,
             document.title,
             window.location.pathname +
-              window.location.search +
-              $(this).attr("href")
+            window.location.search +
+            $(this).attr("href")
           );
         }
       });

package/routes/actions.js

@@ -8,6 +8,7 @@ const Router = require("express-promise-router");
 const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
+const { getTriggerList } = require("./common_lists");
 
 /**
  * @type {object}
@@ -97,45 +98,7 @@ router.get(
             type: "card",
             title: req.__("Triggers"),
             contents: div(
-              mkTable(
-                [
-                  { label: req.__("Name"), key: "name" },
-                  { label: req.__("Action"), key: "action" },
-                  {
-                    label: req.__("Table or Channel"),
-                    key: (r) => r.table_name || r.channel,
-                  },
-                  {
-                    label: req.__("When"),
-                    key: (a) =>
-                      a.when_trigger === "API call"
-                        ? `API: ${base_url}api/action/${a.name}`
-                        : a.when_trigger,
-                  },
-                  {
-                    label: req.__("Test run"),
-                    key: (r) =>
-                      r.table_id
-                        ? ""
-                        : link(`/actions/testrun/${r.id}`, req.__("Test run")),
-                  },
-                  {
-                    label: req.__("Edit"),
-                    key: (r) => link(`/actions/edit/${r.id}`, req.__("Edit")),
-                  },
-                  {
-                    label: req.__("Configure"),
-                    key: (r) =>
-                      link(`/actions/configure/${r.id}`, req.__("Configure")),
-                  },
-                  {
-                    label: req.__("Delete"),
-                    key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
-                  },
-                ],
-                triggers,
-                { hover: true }
-              ),
+              getTriggerList(triggers, req),
               link("/actions/new", req.__("Add trigger"))
             ),
           },