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

package/routes/admin.js

@@ -1710,11 +1710,14 @@ router.get(
         above: [
           {
             type: "card",
+            titleAjaxIndicator: true,
             title: req.__("Build mobile app"),
             contents: form(
               {
                 action: "/admin/build-mobile-app",
                 method: "post",
+                onchange: "builderMenuChanged(this)",
+                id: "buildMobileAppForm",
               },
 
               fieldset(
@@ -2178,19 +2181,21 @@ router.get(
                               class: "form-control form-select",
                               multiple: true,
                             },
-                            withSyncInfo.map((table) =>
-                              option({
-                                id: `${table.name}_unsynched_opt`,
-                                value: table.name,
-                                label: table.name,
-                                hidden:
-                                  builderSettings.synchedTables?.indexOf(
+                            withSyncInfo
+                              .filter(
+                                (table) =>
+                                  !builderSettings.synchedTables ||
+                                  builderSettings.synchedTables.indexOf(
                                     table.name
-                                  ) >= 0
-                                    ? true
-                                    : false,
-                              })
-                            )
+                                  ) < 0
+                              )
+                              .map((table) =>
+                                option({
+                                  id: `${table.name}_unsynched_opt`,
+                                  value: table.name,
+                                  label: table.name,
+                                })
+                              )
                           )
                         ),
                         div(
@@ -2228,19 +2233,20 @@ router.get(
                               class: "form-control form-select",
                               multiple: true,
                             },
-                            withSyncInfo.map((table) =>
-                              option({
-                                id: `${table.name}_synched_opt`,
-                                value: table.name,
-                                label: table.name,
-                                hidden:
+                            withSyncInfo
+                              .filter(
+                                (table) =>
                                   builderSettings.synchedTables?.indexOf(
                                     table.name
                                   ) >= 0
-                                    ? false
-                                    : true,
-                              })
-                            )
+                              )
+                              .map((table) =>
+                                option({
+                                  id: `${table.name}_synched_opt`,
+                                  value: table.name,
+                                  label: table.name,
+                                })
+                              )
                           )
                         )
                       )
@@ -2875,13 +2881,6 @@ router.post(
     ) {
       spawnParams.push("--tenantAppName", db.getTenantSchema());
     }
-    const excludedPlugins = (await Plugin.find())
-      .filter(
-        (plugin) =>
-          ["base", "sbadmin2"].indexOf(plugin.name) < 0 &&
-          includedPlugins.indexOf(plugin.name) < 0
-      )
-      .map((plugin) => plugin.name);
 
     if (buildType) spawnParams.push("--buildType", buildType);
     if (keystoreFile) spawnParams.push("--androidKeystore", keystoreFile);
@@ -2889,28 +2888,6 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
-    await getState().setConfig("mobile_builder_settings", {
-      entryPoint,
-      entryPointType,
-      androidPlatform,
-      iOSPlatform,
-      useDocker,
-      appName,
-      appId,
-      appVersion,
-      appIcon,
-      serverURL,
-      splashPage,
-      autoPublicLogin,
-      allowOfflineMode,
-      synchedTables: synchedTables,
-      includedPlugins: includedPlugins,
-      excludedPlugins,
-      provisioningProfile,
-      keystoreFile,
-      keystoreAlias,
-      buildType,
-    });
     // end http call, return the out directory name
     // the gui polls for results
     res.json({ build_dir_name: outDirName });
@@ -3014,6 +2991,29 @@ router.get(
   })
 );
 
+router.post(
+  "/mobile-app/save-config",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    try {
+      const newCfg = { ...req.body };
+      const excludedPlugins = (await Plugin.find())
+        .filter(
+          (plugin) =>
+            ["base", "sbadmin2"].indexOf(plugin.name) < 0 &&
+            newCfg.includedPlugins.indexOf(plugin.name) < 0
+        )
+        .map((plugin) => plugin.name);
+      newCfg.excludedPlugins = excludedPlugins;
+      await getState().setConfig("mobile_builder_settings", newCfg);
+      res.json({ success: true });
+    } catch (e) {
+      getState().log(1, `Unable to save mobile builder config: ${e.message}`);
+      res.json({ error: e.message });
+    }
+  })
+);
+
 /**
  * Do Clear All
  * @function

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