@saltcorn/server 0.9.6-beta.1 → 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

@@ -1425,5 +1425,10 @@
 	"Keystore Alias": "Keystore Alias",
 	"Keystore Password": "Keystore Password",
 	"xcodebuild": "xcodebuild",
-	"Provisioning Profile": "Provisioning Profile"
+	"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.1",
+  "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.1",
-    "@saltcorn/builder": "0.9.6-beta.1",
-    "@saltcorn/data": "0.9.6-beta.1",
-    "@saltcorn/admin-models": "0.9.6-beta.1",
-    "@saltcorn/filemanager": "0.9.6-beta.1",
-    "@saltcorn/markup": "0.9.6-beta.1",
-    "@saltcorn/plugins-loader": "0.9.6-beta.1",
-    "@saltcorn/sbadmin2": "0.9.6-beta.1",
+    "@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) {

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/`);
     }

package/routes/fields.js

@@ -255,6 +255,7 @@ const fieldFlow = (req) =>
         expression = "__aggregation";
         attributes.agg_relation = context.agg_relation;
         attributes.agg_field = context.agg_field;
+        attributes.agg_order_by = context.agg_order_by;
         attributes.aggwhere = context.aggwhere;
         attributes.aggregate = context.aggregate;
         const [table, ref] = context.agg_relation.split(".");
@@ -435,46 +436,64 @@ const fieldFlow = (req) =>
 
           const { child_field_list, child_relations } =
             await table.get_child_relations(true);
-          const agg_field_opts = child_relations.map(
-            ({ table, key_field, through }) => {
-              const aggKey =
-                (through ? `${through.name}->` : "") +
-                `${table.name}.${key_field.name}`;
-              aggStatOptions[aggKey] = [
-                "Count",
-                "CountUnique",
-                "Avg",
-                "Sum",
-                "Max",
-                "Min",
-                "Array_Agg",
-              ];
-              table.fields.forEach((f) => {
-                if (f.type && f.type.name === "Date") {
-                  aggStatOptions[aggKey].push(`Latest ${f.name}`);
-                  aggStatOptions[aggKey].push(`Earliest ${f.name}`);
-                }
-              });
-              return {
-                name: `agg_field`,
-                label: req.__("On Field"),
-                type: "String",
-                required: true,
-                attributes: {
-                  options: table.fields
-                    .filter((f) => !f.calculated || f.stored)
-                    .map((f) => ({
-                      label: f.name,
-                      name: `${f.name}@${f.type_name}`,
-                    })),
-                },
-                showIf: {
-                  agg_relation: aggKey,
-                  expression_type: "Aggregation",
-                },
-              };
-            }
-          );
+          const agg_field_opts = [];
+          const agg_order_opts = [];
+          child_relations.forEach(({ table, key_field, through }) => {
+            const aggKey =
+              (through ? `${through.name}->` : "") +
+              `${table.name}.${key_field.name}`;
+            aggStatOptions[aggKey] = [
+              "Count",
+              "CountUnique",
+              "Avg",
+              "Sum",
+              "Max",
+              "Min",
+              "Array_Agg",
+            ];
+            table.fields.forEach((f) => {
+              if (f.type && f.type.name === "Date") {
+                aggStatOptions[aggKey].push(`Latest ${f.name}`);
+                aggStatOptions[aggKey].push(`Earliest ${f.name}`);
+              }
+            });
+            agg_field_opts.push({
+              name: `agg_field`,
+              label: req.__("On Field"),
+              type: "String",
+              required: true,
+              attributes: {
+                options: table.fields
+                  .filter((f) => !f.calculated || f.stored)
+                  .map((f) => ({
+                    label: f.name,
+                    name: `${f.name}@${f.type_name}`,
+                  })),
+              },
+              showIf: {
+                agg_relation: aggKey,
+                expression_type: "Aggregation",
+              },
+            });
+            agg_order_opts.push({
+              name: `agg_order_by`,
+              label: req.__("Order by"),
+              type: "String",
+              attributes: {
+                options: table.fields
+                  .filter((f) => !f.calculated || f.stored)
+                  .map((f) => ({
+                    label: f.name,
+                    name: f.name,
+                  })),
+              },
+              showIf: {
+                agg_relation: aggKey,
+                expression_type: "Aggregation",
+                aggregate: "Array_Agg",
+              },
+            });
+          });
           return new Form({
             fields: [
               {
@@ -520,6 +539,7 @@ const fieldFlow = (req) =>
                 required: false,
                 showIf: { expression_type: "Aggregation" },
               },
+              ...agg_order_opts,
               {
                 name: "model",
                 label: req.__("Model"),
@@ -1156,7 +1176,8 @@ router.post(
       if (!fv) res.send(text(result));
       else res.send(fv.run(result, req, { row, ...configuration }));
     } catch (e) {
-      return res.status(400).send(`Error: ${e.message}`);
+      console.error("show-calculated error", e);
+      return res.status(200).send(``);
     }
   })
 );

package/routes/index.js

@@ -36,6 +36,7 @@ const roleadmin = require("../auth/roleadmin");
 const tags = require("./tags");
 const tagentries = require("./tag_entries");
 const diagram = require("./diagram");
+const registry = require("./registry");
 const sync = require("./sync");
 
 module.exports =
@@ -78,5 +79,6 @@ module.exports =
     app.use("/tag", tags);
     app.use("/tag-entries", tagentries);
     app.use("/diagram", diagram);
+    app.use("/registry-editor", registry);
     app.use("/sync", sync);
   };

package/routes/pageedit.js

@@ -94,7 +94,7 @@ const pagePropertiesForm = async (req, isNew) => {
           if (groups.includes(s) && isNew)
             return req.__("A page group with this name already exists");
         },
-        sublabel: req.__("A short name that will be in your URL"),
+        sublabel: req.__("A short name that will be in the page URL"),
         type: "String",
         attributes: { autofocus: true },
       }),
@@ -107,13 +107,15 @@ const pagePropertiesForm = async (req, isNew) => {
       new Field({
         label: req.__("Description"),
         name: "description",
-        sublabel: req.__("A longer description"),
+        sublabel: req.__(
+          "A longer description that is not visible but appears in the page header and is indexed by search engines"
+        ),
         input_type: "text",
       }),
       {
         name: "min_role",
         label: req.__("Minimum role"),
-        sublabel: req.__("Role required to access page"),
+        sublabel: req.__("User role required to access page"),
         input_type: "select",
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       },
@@ -336,6 +338,15 @@ router.get(
             )
           ),
         },
+        {
+          type: "card",
+          title: req.__("Root pages"),
+          titleAjaxIndicator: true,
+          contents: renderForm(
+            getRootPageForm(pages, pageGroups, roles, req),
+            req.csrfToken()
+          ),
+        },
         {
           type: "card",
           title: req.__("Your page groups"),
@@ -357,15 +368,6 @@ router.get(
             )
           ),
         },
-        {
-          type: "card",
-          title: req.__("Root pages"),
-          titleAjaxIndicator: true,
-          contents: renderForm(
-            getRootPageForm(pages, pageGroups, roles, req),
-            req.csrfToken()
-          ),
-        },
       ],
     });
   })
@@ -392,6 +394,7 @@ const wrap = (contents, noCard, req, page) => ({
     {
       type: noCard ? "container" : "card",
       title: page ? page.name : req.__("New"),
+      titleAjaxIndicator: true,
       contents,
     },
   ],
@@ -418,6 +421,7 @@ router.get(
       form.hidden("id");
       form.values = page;
       form.values.no_menu = page.attributes?.no_menu;
+      form.onChange = `saveAndContinue(this)`;
       res.sendWrap(
         req.__(`Page attributes`),
         wrap(renderForm(form, req.csrfToken()), false, req, page)
@@ -477,7 +481,8 @@ router.post(
           pageRow.layout = {};
         }
         await Page.update(+id, pageRow);
-        res.redirect(`/pageedit/`);
+        if (req.xhr) res.json({ success: "ok" });
+        else res.redirect(`/pageedit/`);
       } else {
         if (!pageRow.layout) pageRow.layout = {};
         if (!pageRow.fixed_states) pageRow.fixed_states = {};

package/routes/plugins.js

@@ -1315,7 +1315,12 @@ router.get(
       await upgrade_all_tenants_plugins((p, f) =>
         load_plugins.loadPlugin(p, f)
       );
-      req.flash("success", req.__(`Modules up-to-date. Please restart server`));
+      req.flash(
+        "success",
+        req.__(`Modules up-to-date. Please restart server`) +
+          ". " +
+          a({ href: "/admin/system" }, req.__("Restart here"))
+      );
     } else {
       const installed_plugins = await Plugin.find({});
       for (const plugin of installed_plugins) {

package/routes/registry.js

@@ -0,0 +1,289 @@
+const Router = require("express-promise-router");
+
+const db = require("@saltcorn/data/db");
+const { mkTable, link, post_btn, renderForm } = require("@saltcorn/markup");
+const {
+  script,
+  domReady,
+  a,
+  div,
+  i,
+  text,
+  button,
+  input,
+  label,
+  form,
+  ul,
+  li,
+  details,
+  summary,
+} = require("@saltcorn/markup/tags");
+const Table = require("@saltcorn/data/models/table");
+const { isAdmin, error_catcher } = require("./utils");
+const { send_infoarch_page } = require("../markup/admin.js");
+const View = require("@saltcorn/data/models/view");
+const Page = require("@saltcorn/data/models/page");
+const Form = require("@saltcorn/data/models/form");
+const {
+  table_pack,
+  view_pack,
+  plugin_pack,
+  page_pack,
+  page_group_pack,
+  role_pack,
+  library_pack,
+  trigger_pack,
+  tag_pack,
+  model_pack,
+  model_instance_pack,
+  event_log_pack,
+  install_pack,
+} = require("@saltcorn/admin-models/models/pack");
+const Trigger = require("@saltcorn/data/models/trigger");
+/**
+ * @type {object}
+ * @const
+ * @namespace listRouter
+ * @category server
+ * @subcategory routes
+ */
+const router = new Router();
+
+// export our router to be mounted by the parent application
+module.exports = router;
+
+async function asyncFilter(arr, cb) {
+  const filtered = [];
+
+  for (const element of arr) {
+    const needAdd = await cb(element);
+
+    if (needAdd) {
+      filtered.push(element);
+    }
+  }
+
+  return filtered;
+}
+router.get(
+  "/",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { etype, ename, q } = req.query;
+    const qlink = q ? `&q=${encodeURIComponent(q)}` : "";
+    let edContents = "Choose an entity to edit";
+    const all_tables = await Table.find({}, { orderBy: "name", nocase: true });
+    const all_views = await View.find({}, { orderBy: "name", nocase: true });
+    const all_pages = await Page.find({}, { orderBy: "name", nocase: true });
+    const all_triggers = await Trigger.find(
+      {},
+      { orderBy: "name", nocase: true }
+    );
+    let tables, views, pages, triggers;
+    if (q) {
+      const qlower = q.toLowerCase();
+      const includesQ = (s) => s.toLowerCase().includes(qlower);
+
+      tables = await asyncFilter(all_tables, async (t) => {
+        const pack = await table_pack(t);
+        return includesQ(JSON.stringify(pack));
+      });
+      views = await asyncFilter(all_views, async (t) => {
+        const pack = await view_pack(t);
+        return includesQ(JSON.stringify(pack));
+      });
+      pages = await asyncFilter(all_pages, async (t) => {
+        const pack = await page_pack(t);
+        return includesQ(JSON.stringify(pack));
+      });
+      triggers = await asyncFilter(all_triggers, async (t) => {
+        const pack = await trigger_pack(t);
+        return includesQ(JSON.stringify(pack));
+      });
+    } else {
+      tables = all_tables;
+      views = all_views;
+      pages = all_pages;
+      triggers = all_triggers;
+    }
+    const li_link = (etype1, ename1) =>
+      li(
+        a(
+          {
+            href: `/registry-editor?etype=${etype1}&ename=${encodeURIComponent(
+              ename1
+            )}${qlink}`,
+            class: etype1 === etype && ename1 === ename ? "fw-bold" : undefined,
+          },
+          ename1
+        )
+      );
+    const mkForm = (jsonVal) =>
+      new Form({
+        labelCols: 0,
+        action: `/registry-editor?etype=${etype}&ename=${encodeURIComponent(
+          ename
+        )}${qlink}`,
+
+        values: { regval: JSON.stringify(jsonVal, null, 2) },
+        fields: [
+          {
+            name: "regval",
+            label: "",
+            input_type: "code",
+            attributes: { mode: "application/json" },
+          },
+        ],
+      });
+    switch (etype) {
+      case "table":
+        const tpack = await table_pack(
+          all_tables.find((t) => t.name === ename)
+        );
+        edContents = renderForm(mkForm(tpack), req.csrfToken());
+        break;
+      case "view":
+        const vpack = await view_pack(all_views.find((v) => v.name === ename));
+        edContents = renderForm(mkForm(vpack), req.csrfToken());
+        break;
+      case "page":
+        const ppack = await page_pack(all_pages.find((v) => v.name === ename));
+        edContents = renderForm(mkForm(ppack), req.csrfToken());
+        break;
+      case "trigger":
+        const trpack = await trigger_pack(
+          all_triggers.find((t) => t.name === ename)
+        );
+        edContents = renderForm(mkForm(trpack), req.csrfToken());
+        break;
+    }
+    send_infoarch_page({
+      res,
+      req,
+      active_sub: "Registry editor",
+      contents: {
+        widths: [3, 9],
+        besides: [
+          {
+            type: "card",
+            bodyClass: "p-1",
+            title: "Entities",
+            contents: div(
+              form(
+                { method: "GET", action: `/registry-editor` },
+                div(
+                  { class: "input-group search-bar mb-2" },
+                  etype &&
+                    input({ type: "hidden", name: "etype", value: etype }),
+                  ename &&
+                    input({ type: "hidden", name: "ename", value: ename }),
+                  input({
+                    type: "search",
+                    class: "form-control search-bar ps-2 hasbl",
+                    placeholder: "Search",
+                    name: "q",
+                    value: q,
+                    "aria-label": "Search",
+                    "aria-describedby": "button-search-submit",
+                  }),
+                  button(
+                    {
+                      class: "btn btn-outline-secondary search-bar",
+                      type: "submit",
+                    },
+                    i({ class: "fas fa-search" })
+                  )
+                )
+              ),
+              // following https://iamkate.com/code/tree-views/
+              ul(
+                { class: "katetree ps-2" },
+                li(
+                  details(
+                    { open: q || etype === "table" },
+                    summary("Tables"),
+                    ul(
+                      { class: "ps-3" },
+                      tables.map((t) => li_link("table", t.name))
+                    )
+                  )
+                ),
+                li(
+                  details(
+                    { open: q || etype === "view" },
+                    summary("Views"),
+                    ul(
+                      { class: "ps-3" },
+                      views.map((v) => li_link("view", v.name))
+                    )
+                  )
+                ),
+                li(
+                  details(
+                    { open: q || etype === "page" }, //
+                    summary("Pages"),
+                    ul(
+                      { class: "ps-3" },
+                      pages.map((p) => li_link("page", p.name))
+                    )
+                  )
+                ),
+                li(
+                  details(
+                    { open: q || etype === "trigger" }, //
+                    summary("Triggers"),
+                    ul(
+                      { class: "ps-3" },
+                      triggers.map((t) => li_link("trigger", t.name))
+                    )
+                  )
+                )
+              )
+            ),
+          },
+          {
+            type: "card",
+            title:
+              ename && etype
+                ? `Registry editor: ${ename} ${etype}`
+                : "Registry editor",
+            contents: edContents,
+          },
+        ],
+      },
+    });
+  })
+);
+
+router.post(
+  "/",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { etype, ename, q } = req.query;
+    const qlink = q ? `&q=${encodeURIComponent(q)}` : "";
+
+    const entVal = JSON.parse(req.body.regval);
+    let pack = { plugins: [], tables: [], views: [], pages: [], triggers: [] };
+
+    switch (etype) {
+      case "table":
+        pack.tables = [entVal];
+        break;
+      case "view":
+        pack.views = [entVal];
+        break;
+      case "page":
+        pack.pages = [entVal];
+        break;
+      case "trigger":
+        pack.triggers = [entVal];
+        break;
+    }
+    await install_pack(pack);
+    res.redirect(
+      `/registry-editor?etype=${etype}&ename=${encodeURIComponent(
+        ename
+      )}${qlink}`
+    );
+  })
+);

package/routes/tables.js

@@ -681,6 +681,10 @@ const attribBadges = (f) => {
           "on_delete_cascade",
           "on_delete",
           "unique_error_msg",
+          "ref",
+          "table",
+          "agg_field",
+          "agg_relation",
         ].includes(k)
       )
         return;

package/routes/utils.js

@@ -14,7 +14,7 @@ const {
 } = require("@saltcorn/data/db/state");
 const { get_base_url } = require("@saltcorn/data/models/config");
 const { hash } = require("@saltcorn/data/utils");
-const { input, script, domReady } = require("@saltcorn/markup/tags");
+const { input, script, domReady, a } = require("@saltcorn/markup/tags");
 const session = require("express-session");
 const cookieSession = require("cookie-session");
 const is = require("contractis/is");
@@ -398,7 +398,10 @@ const admin_config_route = ({
           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/routes/view.js

@@ -127,7 +127,7 @@ router.get(
     else {
       const qs = "";
       const contents =
-        typeof contents0 === "string" && !req.xhr
+        typeof contents0 === "string"
           ? div(
               {
                 class: "d-inline",

package/routes/viewedit.js

@@ -371,6 +371,7 @@ router.get(
     const form = await viewForm(req, tableOptions, roles, pages, viewrow);
     const inbound_connected = await viewrow.inbound_connected_objects();
     form.hidden("id");
+    form.onChange = `saveAndContinue(this)`;
     res.sendWrap(req.__(`Edit view`), {
       above: [
         {
@@ -383,6 +384,7 @@ router.get(
         {
           type: "card",
           class: "mt-0",
+          titleAjaxIndicator: true,
           title: req.__(
             `%s view - %s on %s`,
             viewname,
@@ -541,12 +543,14 @@ router.post(
           //console.log(v);
           await View.create(v);
         }
-        res.redirect(
-          addOnDoneRedirect(
-            `/viewedit/config/${encodeURIComponent(v.name)}`,
-            req
-          )
-        );
+        if (req.xhr) res.json({ success: "ok" });
+        else
+          res.redirect(
+            addOnDoneRedirect(
+              `/viewedit/config/${encodeURIComponent(v.name)}`,
+              req
+            )
+          );
       }
     } else {
       sendForm(form);
@@ -902,7 +906,7 @@ router.post(
           ? `/${req.query.on_done_redirect}`
           : "/viewedit";
       res.redirect(redirectTarget);
-    } else res.json({ okay: true, responseText: message });
+    } else res.json({ success: "ok" });
   })
 );
 

package/tests/page.test.js

@@ -76,7 +76,7 @@ describe("page create", () => {
     await request(app)
       .get("/pageedit/new")
       .set("Cookie", loginCookie)
-      .expect(toInclude("A short name that will be in your URL"));
+      .expect(toInclude("A short name that will be in the page URL"));
   });
   it("shows new with html file selector", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -237,7 +237,7 @@ describe("pageedit", () => {
     await request(app)
       .get("/pageedit/edit-properties/a_page")
       .set("Cookie", loginCookie)
-      .expect(toInclude("A short name that will be in your URL"));
+      .expect(toInclude("A short name that will be in the page URL"));
 
     //TODO full context
     const ctx = encodeURIComponent(JSON.stringify({}));

package/tests/plugins.test.js

@@ -137,8 +137,10 @@ describe("Plugin dependency resolution and upgrade", () => {
       .expect(toRedirect("/plugins"));
     const quill = await Plugin.findOne({ name: "quill-editor" });
     expect(quill.location).toBe("@saltcorn/quill-editor");
+    expect(quill.name).toBe("quill-editor");
     const html = await Plugin.findOne({ location: "@saltcorn/html" });
     expect(html.location).toBe("@saltcorn/html");
+    expect(html.name).toBe("html");
     const html_type = getState().types.HTML;
     expect(!!html_type.fieldviews.Quill).toBe(true);
   });