@saltcorn/server 0.7.3-beta.6 → 0.7.4-beta.0

package/markup/admin.js

@@ -345,7 +345,7 @@ const flash_restart = (req) => {
  * @param {*} opts.formArgs
  * @returns {Promise<Form>}
  */
-const config_fields_form = async ({ field_names, req, ...formArgs }) => {
+const config_fields_form = async ({ field_names, req, action, ...formArgs }) => {
   const values = {};
   const state = getState();
   const fields = [];
@@ -396,8 +396,9 @@ const config_fields_form = async ({ field_names, req, ...formArgs }) => {
   const form = new Form({
     fields,
     values,
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    action,
+    noSubmitButton: true,
+    onChange: `saveAndContinue(this)`,
     ...formArgs,
   });
   await form.fill_fkey_options();

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.3-beta.6",
+  "version": "0.7.4-beta.0",
   "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-beta.6",
-    "@saltcorn/builder": "0.7.3-beta.6",
-    "@saltcorn/data": "0.7.3-beta.6",
-    "@saltcorn/admin-models": "0.7.3-beta.6",
-    "@saltcorn/markup": "0.7.3-beta.6",
-    "@saltcorn/sbadmin2": "0.7.3-beta.6",
+    "@saltcorn/base-plugin": "0.7.4-beta.0",
+    "@saltcorn/builder": "0.7.4-beta.0",
+    "@saltcorn/data": "0.7.4-beta.0",
+    "@saltcorn/admin-models": "0.7.4-beta.0",
+    "@saltcorn/markup": "0.7.4-beta.0",
+    "@saltcorn/sbadmin2": "0.7.4-beta.0",
     "@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

@@ -142,8 +142,18 @@ function MenuEditor(e, t) {
               ? c.iconpicker("setIcon", t.icon)
               : c.iconpicker("setIcon", "empty");
           r.removeAttr("disabled");
+          i.find("[name]").each(function () {
+            try {
+              const el = $(this);
+              if (typeof t[el.attr("name")] === "undefined") {
+                el.val("");
+              }
+            } catch (e) {
+              console.warn(e);
+            }
+          });
         })((n = $(this).closest("li")));
-      l.onUpdate();
+      //l.onUpdate();
     }),
     s.on("click", ".btnUp", function (e) {
       e.preventDefault();

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>`
             )
           );
@@ -502,7 +517,7 @@ function common_done(res, isWeb = true) {
   }
 }
 
-const repeaterCopyValuesToForm = (form, editor) => {
+const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
   const setVal = (k, ix, v) => {
@@ -510,7 +525,7 @@ const repeaterCopyValuesToForm = (form, editor) => {
     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) => {
     });
   });
   //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");
@@ -533,6 +548,7 @@ const repeaterCopyValuesToForm = (form, editor) => {
     if (typeof ix !== "number" || isNaN(ix)) return;
     if (ix >= vs.length) $(this).remove();
   });
+  !noTriggerChange && form.trigger("change");
 };
 function align_dropdown(id) {
   setTimeout(() => {

package/public/saltcorn.css

@@ -302,4 +302,21 @@ section.range-slider input[type="range"]::-moz-focus-outer {
 table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
   border: 1px solid black;
   border-collapse: collapse;
+}
+
+/* https://codepen.io/pezmotion/pen/RQERdm */
+
+.editStarRating {
+	direction: rtl;
+	unicode-bidi: bidi-override;
+	color: #ddd;
+}
+.editStarRating input {
+	display: none;
+}
+.editStarRating label:hover,
+.editStarRating label:hover ~ label,
+.editStarRating input:checked + label,
+.editStarRating input:checked + label ~ label {
+	color: #ffc107; 
 }

package/public/saltcorn.js

@@ -213,6 +213,7 @@ function ajax_modal(url, opts = {}) {
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
         (opts.onClose || function () {})(res);
+        $("body").css("overflow", "");
       });
     },
   });
@@ -248,7 +249,7 @@ function saveAndContinue(e, k) {
   return false;
 }
 
-function applyViewConfig(e, url) {
+function applyViewConfig(e, url, k) {
   var form = $(e).closest("form");
   var form_data = form.serializeArray();
   const cfg = {};
@@ -264,6 +265,9 @@ function applyViewConfig(e, url) {
     },
     data: JSON.stringify(cfg),
     error: function (request) {},
+    success: function (res) {
+      k && k(res);
+    },
   });
 
   return false;