@saltcorn/server 0.9.6-beta.0 → 0.9.6-beta.10

package/auth/admin.js

@@ -99,6 +99,10 @@ const getUserFields = async (req) => {
         input_type: "email",
       };
     }
+    if (f.name === "role_id") {
+      f.fieldview = "role_select";
+      await f.fill_fkey_options();
+    }
   }
   return userFields;
 };
@@ -110,65 +114,59 @@ const getUserFields = async (req) => {
  * @param {User} user
  * @returns {Promise<Form>}
  */
-const userForm = contract(
-  is.fun(
-    [is.obj({}), is.maybe(is.class("User"))],
-    is.promise(is.class("Form"))
-  ),
-  async (req, user) => {
-    const roleField = new Field({
-      label: req.__("Role"),
-      name: "role_id",
-      type: "Key",
-      reftable_name: "roles",
-    });
-    const roles = (await User.get_roles()).filter((r) => r.role !== "public");
-    roleField.options = roles.map((r) => ({ label: r.role, value: r.id }));
-    const can_reset = getState().getConfig("smtp_host", "") !== "";
-    const userFields = await getUserFields(req);
-    const form = new Form({
-      fields: [roleField, ...userFields],
-      action: "/useradmin/save",
-      submitLabel: user ? req.__("Save") : req.__("Create"),
-    });
-    if (!user) {
+const userForm = async (req, user) => {
+  const roleField = new Field({
+    label: req.__("Role"),
+    name: "role_id",
+    type: "Key",
+    reftable_name: "roles",
+  });
+  const roles = (await User.get_roles()).filter((r) => r.role !== "public");
+  roleField.options = roles.map((r) => ({ label: r.role, value: r.id }));
+  const can_reset = getState().getConfig("smtp_host", "") !== "";
+  const userFields = await getUserFields(req);
+  const form = new Form({
+    fields: userFields,
+    action: "/useradmin/save",
+    submitLabel: user ? req.__("Save") : req.__("Create"),
+  });
+  if (!user) {
+    form.fields.push(
+      new Field({
+        label: req.__("Set random password"),
+        name: "rnd_password",
+        type: "Bool",
+        default: true,
+      })
+    );
+    form.fields.push(
+      new Field({
+        label: req.__("Password"),
+        name: "password",
+        input_type: "password",
+        showIf: { rnd_password: false },
+      })
+    );
+    can_reset &&
       form.fields.push(
         new Field({
-          label: req.__("Set random password"),
-          name: "rnd_password",
+          label: req.__("Send password reset email"),
+          name: "send_pwreset_email",
           type: "Bool",
           default: true,
+          showIf: { rnd_password: true },
         })
       );
-      form.fields.push(
-        new Field({
-          label: req.__("Password"),
-          name: "password",
-          input_type: "password",
-          showIf: { rnd_password: false },
-        })
-      );
-      can_reset &&
-        form.fields.push(
-          new Field({
-            label: req.__("Send password reset email"),
-            name: "send_pwreset_email",
-            type: "Bool",
-            default: true,
-            showIf: { rnd_password: true },
-          })
-        );
-    }
-    if (user) {
-      form.hidden("id");
-      form.values = user;
-      delete form.values.password;
-    } else {
-      form.values.role_id = roles[roles.length - 1].id;
-    }
-    return form;
   }
-);
+  if (user) {
+    form.hidden("id");
+    form.values = user;
+    delete form.values.password;
+  } else {
+    form.values.role_id = roles[roles.length - 1].id;
+  }
+  return form;
+};
 
 /**
  * Dropdown for User Info in left menu
@@ -531,7 +529,10 @@ router.post(
         if (restart_required)
           res.json({
             success: "ok",
-            notify: req.__("Restart required for changes to take effect."),
+            notify:
+              req.__("Restart required for changes to take effect.") +
+              " " +
+              a({ href: "/admin/system" }, req.__("Restart here")),
           });
         else res.json({ success: "ok" });
       }

package/load_plugins.js

@@ -141,7 +141,11 @@ const loadAndSaveNewPlugin = async (
     const existing = await Plugin.findOne({ location: loc });
     if (!existing && loc !== plugin.location) {
       await loadAndSaveNewPlugin(
-        new Plugin({ name: loc, location: loc, source: "npm" }),
+        new Plugin({
+          name: loc.replace("@saltcorn/", ""),
+          location: loc,
+          source: "npm",
+        }),
         force,
         noSignalOrDB
       );

package/locales/en.json

@@ -1416,5 +1416,19 @@
 	"Description header": "Description header",
 	"Lazy load views": "Lazy load views",
 	"Log IP address": "Log IP address",
-	"Record the request IP address in log messages": "Record the request IP address in log messages"
+	"Record the request IP address in log messages": "Record the request IP address in log messages",
+	"App ID": "App ID",
+	"Build type": "Build type",
+	"debug": "debug",
+	"release": "release",
+	"Keystore File": "Keystore File",
+	"Keystore Alias": "Keystore Alias",
+	"Keystore Password": "Keystore Password",
+	"xcodebuild": "xcodebuild",
+	"Provisioning Profile": "Provisioning Profile",
+	"Registry editor": "Registry editor",
+	"A short name that will be in the page URL": "A short name that will be in the page URL",
+	"A longer description that is not visible but appears in the page header and is indexed by search engines": "A longer description that is not visible but appears in the page header and is indexed by search engines",
+	"User role required to access page": "User role required to access page",
+	"Example: <code>`/view/TheOtherView?id=${id}`</code>": "Example: <code>`/view/TheOtherView?id=${id}`</code>"
 }

package/locales/it.json

@@ -518,5 +518,6 @@
 	"Save before going back": "Save before going back",
 	"Reload after going back": "Reload after going back",
 	"Steps to go back": "Steps to go back",
-	"%s configuration": "%s configuration"
-}
+	"%s configuration": "%s configuration",
+	"The current theme has no user specific settings": "The current theme has no user specific settings"
+}

package/markup/admin.js

@@ -241,6 +241,7 @@ const send_infoarch_page = (args) => {
       { text: "Pagegroups", href: "/page_group/settings" },
       { text: "Tags", href: "/tag" },
       { text: "Diagram", href: "/diagram" },
+      { text: "Registry editor", href: "/registry-editor" },
     ],
     ...args,
   });

package/markup/forms.js

@@ -28,10 +28,14 @@ const editRoleForm = ({ url, current_role, roles, req }) =>
     {
       action: url,
       method: "post",
+      onchange: "saveAndContinue(this)",
     },
     csrfField(req),
     select(
-      { name: "role", onchange: "form.submit()" },
+      {
+        name: "role",
+        class: "w-unset form-select form-select-sm",
+      },
       roles.map((role) =>
         option(
           {

package/package.json

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

package/public/saltcorn-common.js

@@ -179,14 +179,19 @@ function apply_showif() {
             is_or ? "&_or_field=" + k : ""
           }`;
     };
-    const qss = Object.entries(dynwhere.whereParsed).map(kvToQs);
+    const qss = Object.entries(dynwhere.whereParsed).map((kv) => kvToQs(kv));
+    if (dynwhere.existingValue) {
+      qss.push(`id=${dynwhere.existingValue}`);
+      qss.push(`_or_field=id`);
+    }
     if (dynwhere.dereference) {
       if (Array.isArray(dynwhere.dereference))
         qss.push(...dynwhere.dereference.map((d) => `dereference=${d}`));
       else qss.push(`dereference=${dynwhere.dereference}`);
     }
     const qs = qss.join("&");
-    var current = e.attr("data-selected");
+    let current = e.attr("data-selected");
+    if (current === "null") current = null;
     e.change(function (ec) {
       e.attr("data-selected", ec.target.value);
     });
@@ -195,12 +200,14 @@ function apply_showif() {
     if (currentOptionsSet === qs) return;
 
     const activate = (success, qs) => {
+      //re-fetch current, because it may have changed
+      let current = e.attr("data-selected");
+      if (current === "null") current = null;
       if (e.prop("data-fetch-options-current-set") === qs) return;
       e.empty();
       e.prop("data-fetch-options-current-set", qs);
       const toAppend = [];
-      if (!dynwhere.required)
-        toAppend.push({ label: dynwhere.neutral_label || "", value: "" });
+
       let currentDataOption = undefined;
       const dataOptions = [];
       //console.log(success);
@@ -231,13 +238,24 @@ function apply_showif() {
           ? 1
           : -1
       );
+      if (!dynwhere.required)
+        toAppend.unshift({ label: dynwhere.neutral_label || "", value: "" });
+      if (dynwhere.required && dynwhere.placeholder)
+        toAppend.unshift({
+          disabled: true,
+          label: dynwhere.placeholder,
+          value: "",
+          selected: !current,
+        });
       e.html(
         toAppend
           .map(
-            ({ label, value, selected }) =>
+            ({ label, value, selected, disabled }) =>
               `<option${selected ? ` selected` : ""}${
-                typeof value !== "undefined" ? ` value="${value}"` : ""
-              }>${label || ""}</option>`
+                disabled ? ` disabled` : ""
+              }${typeof value !== "undefined" ? ` value="${value}"` : ""}>${
+                label || ""
+              }</option>`
           )
           .join("")
       );
@@ -428,7 +446,7 @@ function get_form_record(e_in, select_labels) {
 
   const e = e_in.viewname
     ? $(`form[data-viewname="${e_in.viewname}"]`)
-    : e_in.closest(".form-namespace");
+    : $(e_in).closest(".form-namespace");
 
   const form = $(e).closest("form");
 
@@ -462,6 +480,38 @@ function get_form_record(e_in, select_labels) {
       rec[name] = f(rec[name], $this);
     }
   });
+
+  const joinFieldsStr =
+    typeof e_in !== "string" && $(e_in).attr("data-show-if-joinfields");
+  if (joinFieldsStr) {
+    const joinFields = JSON.parse(decodeURIComponent(joinFieldsStr));
+
+    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) {
+        keyVals[ref] = rec[ref];
+        $.ajax(`/api/${refTable}?id=${rec[ref]}`, {
+          success: (val) => {
+            const jvs = $(e_in).prop("data-join-values") || {};
+
+            jvs[ref] = val.success[0];
+            $(e_in).prop("data-join-values", jvs);
+            apply_showif();
+          },
+        });
+      }
+      $(e_in).prop("data-join-key-values", keyVals);
+    } else if (joinFieldsStr) {
+      Object.assign(rec, joinVals);
+    }
+  }
   return rec;
 }
 function showIfFormulaInputs(e, fml) {
@@ -1219,7 +1269,13 @@ function restore_old_button(btnId) {
   btn.removeData("old-text");
 }
 
-async function common_done(res, viewname, isWeb = true) {
+async function common_done(res, viewnameOrElem, isWeb = true) {
+  const viewname =
+    typeof viewnameOrElem === "string"
+      ? viewnameOrElem
+      : $(viewnameOrElem)
+          .closest("[data-sc-embed-viewname]")
+          .attr("data-sc-embed-viewname");
   if (window._sc_loglevel > 4)
     console.log("ajax result directives", viewname, res);
   const handle = async (element, fn) => {
@@ -1231,15 +1287,15 @@ async function common_done(res, viewname, isWeb = true) {
     if (res.row && res.field_names) {
       const f = new Function(`viewname, row, {${res.field_names}}`, s);
       const evalres = await f(viewname, res.row, res.row);
-      if (evalres) await common_done(evalres, viewname, isWeb);
+      if (evalres) await common_done(evalres, viewnameOrElem, isWeb);
     } else if (res.row) {
       const f = new Function(`viewname, row`, s);
       const evalres = await f(viewname, res.row);
-      if (evalres) await common_done(evalres, viewname, isWeb);
+      if (evalres) await common_done(evalres, viewnameOrElem, isWeb);
     } else {
       const f = new Function(`viewname`, s);
       const evalres = await f(viewname);
-      if (evalres) await common_done(evalres, viewname, isWeb);
+      if (evalres) await common_done(evalres, viewnameOrElem, isWeb);
     }
   };
   if (res.notify) await handle(res.notify, notifyAlert);
@@ -1252,9 +1308,10 @@ async function common_done(res, viewname, isWeb = true) {
       notifyAlert({ type: "success", text: text })
     );
   if (res.set_fields && (viewname || res.set_fields._viewname)) {
-    const form = $(
-      `form[data-viewname="${res.set_fields._viewname || viewname}"]`
-    );
+    const form =
+      typeof viewnameOrElem === "string" || res.set_fields._viewname
+        ? $(`form[data-viewname="${res.set_fields._viewname || viewname}"]`)
+        : $(viewnameOrElem).closest("form[data-viewname]");
     if (form.length === 0 && set_state_fields) {
       // assume this is a filter
       set_state_fields(
@@ -1279,9 +1336,14 @@ async function common_done(res, viewname, isWeb = true) {
         if (input.attr("type") === "checkbox")
           input.prop("checked", res.set_fields[k]);
         else input.val(res.set_fields[k]);
+        if (input.attr("data-selected")) {
+          input.attr("data-selected", res.set_fields[k]);
+        }
+
         input.trigger("set_form_field");
       });
     }
+    form.trigger("change");
   }
 
   if (res.download) {
@@ -1440,10 +1502,10 @@ const columnSummary = (col) => {
 };
 
 function submitWithEmptyAction(form) {
-  var formAction = form.action;
-  form.action = "javascript:void(0)";
+  var formAction = form.getAttribute("action");
+  form.setAttribute("action", "javascript:void(0)");
   form.submit();
-  form.action = formAction;
+  form.setAttribute("action", formAction);
 }
 
 function unique_field_from_rows(

package/public/saltcorn.css

@@ -506,3 +506,11 @@ tr[onclick] {
 .modal-header {
   justify-content: space-between;
 }
+
+ul.katetree {
+  list-style-type: none;
+}
+
+ul.katetree details ul {
+  list-style-type: none;
+}

package/public/saltcorn.js

@@ -236,7 +236,13 @@ function reset_spinners() {
   });
 }
 
-function view_post(viewname, route, data, onDone, sendState) {
+function view_post(viewnameOrElem, route, data, onDone, sendState) {
+  const viewname =
+    typeof viewnameOrElem === "string"
+      ? viewnameOrElem
+      : $(viewnameOrElem)
+          .closest("[data-sc-embed-viewname]")
+          .attr("data-sc-embed-viewname");
   const query = sendState
     ? `?${new URL(get_current_state_url()).searchParams.toString()}`
     : "";
@@ -254,7 +260,7 @@ function view_post(viewname, route, data, onDone, sendState) {
   })
     .done(function (res) {
       if (onDone) onDone(res);
-      ajax_done(res, viewname);
+      ajax_done(res, viewnameOrElem);
       reset_spinners();
     })
     .fail(function (res) {
@@ -751,6 +757,42 @@ function removeSpinner(elementId, orginalHtml) {
   $(`#${elementId}`).html(orginalHtml);
 }
 
+function builderMenuChanged(e) {
+  const form = $(e);
+  const params = {};
+  form.serializeArray().forEach((item) => {
+    params[item.name] = item.value;
+  });
+  params.synchedTables = Array.from($("#synched-tbls-select-id")[0].options)
+    .filter((option) => !option.hidden)
+    .map((option) => option.value);
+  const pluginsSelect = $("#included-plugins-select-id")[0];
+  params.includedPlugins = Array.from(pluginsSelect.options || []).map(
+    (option) => option.value
+  );
+  const indicator = $(".sc-ajax-indicator");
+  indicator.attr("title", "Saving the configuration");
+  indicator.attr("style", "display: inline-block;");
+  const icon = $(".fa-save, .fa-exclamation-triangle");
+  icon.attr("class", "fas fa-save");
+  const setErrorIcon = () => {
+    icon.attr("class", "fas fa-exclamation-triangle");
+    icon.attr("style", "color: #ff0033!important;");
+    indicator.attr("title", "Unable to save the configuration");
+  };
+  $.ajax("/admin/mobile-app/save-config", {
+    type: "POST",
+    data: params,
+    success: function (res) {
+      if (res.success) indicator.attr("style", "display: none;");
+      else setErrorIcon();
+    },
+    error: function (res) {
+      setErrorIcon();
+    },
+  });
+}
+
 function poll_mobile_build_finished(outDirName, pollCount, orginalBtnHtml) {
   $.ajax("/admin/build-mobile-app/finished", {
     type: "GET",
@@ -898,26 +940,32 @@ function move_to_synched() {
   const opts = $("#unsynched-tbls-select-id");
   $("#synched-tbls-select-id").removeAttr("selected");
   for (const selected of opts.val()) {
-    const jUnsOpt = $(`[id='${selected}_unsynched_opt']`);
-    jUnsOpt.attr("hidden", "true");
-    jUnsOpt.removeAttr("selected");
-    const jSynOpt = $(`[id='${selected}_synched_opt']`);
-    jSynOpt.removeAttr("hidden");
-    jSynOpt.removeAttr("selected");
+    $(`[id='${selected}_unsynched_opt']`).remove();
+    $("#synched-tbls-select-id").append(
+      $("<option>", {
+        value: selected,
+        label: selected,
+        id: `${selected}_synched_opt`,
+      })
+    );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function move_to_unsynched() {
   const opts = $("#synched-tbls-select-id");
   $("#unsynched-tbls-select-id").removeAttr("selected");
   for (const selected of opts.val()) {
-    const jSynOpt = $(`[id='${selected}_synched_opt']`);
-    jSynOpt.attr("hidden", "true");
-    jSynOpt.removeAttr("selected");
-    const jUnsOpt = $(`[id='${selected}_unsynched_opt']`);
-    jUnsOpt.removeAttr("hidden");
-    jUnsOpt.removeAttr("selected");
+    $(`[id='${selected}_synched_opt']`).remove();
+    $("#unsynched-tbls-select-id").append(
+      $("<option>", {
+        value: selected,
+        label: selected,
+        id: `${selected}_unsynched_opt`,
+      })
+    );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function move_plugin_to_included() {
@@ -933,6 +981,7 @@ function move_plugin_to_included() {
       })
     );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function move_plugin_to_excluded() {
@@ -948,6 +997,7 @@ function move_plugin_to_excluded() {
       })
     );
   }
+  $("#buildMobileAppForm").trigger("change");
 }
 
 function toggle_tbl_sync() {

package/routes/actions.js

@@ -375,6 +375,7 @@ router.get(
 
     const form = await triggerForm(req, trigger);
     form.values = trigger;
+    form.onChange = `saveAndContinue(this)`;
     send_events_page({
       res,
       req,
@@ -383,6 +384,7 @@ router.get(
       contents: {
         type: "card",
         title: req.__("Edit trigger %s", id),
+        titleAjaxIndicator: true,
         contents: renderForm(form, req.csrfToken()),
       },
     });
@@ -464,6 +466,10 @@ router.post(
           ...form.values.configuration,
         };
       await Trigger.update(trigger.id, form.values); //{configuration: form.values});
+      if (req.xhr) {
+        res.json({ success: "ok" });
+        return;
+      }
       req.flash("success", req.__("Action information saved"));
       res.redirect(`/actions/`);
     }
@@ -668,6 +674,7 @@ router.get(
       // get configuration fields
       const cfgFields = await getActionConfigFields(action, table, {
         mode: "trigger",
+        when_trigger: trigger.when_trigger,
       });
       // create form
       const form = new Form({
@@ -720,6 +727,7 @@ router.post(
     } else {
       const cfgFields = await getActionConfigFields(action, table, {
         mode: "trigger",
+        when_trigger: trigger.when_trigger,
       });
       form = new Form({
         action: `/actions/configure/${id}`,