@saltcorn/server 0.9.6-beta.2 → 0.9.6-beta.20

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/search.js

@@ -202,7 +202,8 @@ const runSearch = async ({ q, _page, table }, req, res) => {
   let tablesWithResults = [];
   let tablesConfigured = 0;
   for (const [tableName, viewName] of Object.entries(cfg)) {
-    if (!viewName || viewName === "") continue;
+    if (!viewName || viewName === "" || viewName === "search_table_description")
+      continue;
     tablesConfigured += 1;
     if (table && tableName !== table) continue;
     let sectionHeader = tableName;
@@ -232,7 +233,7 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     }
 
     if (vresps.length > 0) {
-      tablesWithResults.push(tableName);
+      tablesWithResults.push({ tableName, label: sectionHeader });
       resp.push({
         type: "card",
         title: span({ id: tableName }, sectionHeader),
@@ -273,8 +274,13 @@ const runSearch = async ({ q, _page, table }, req, res) => {
               req.__("Show only matches in table:"),
               " ",
               tablesWithResults
-                .map((t) =>
-                  a({ href: `javascript:set_state_field('table', '${t}')` }, t)
+                .map(({ tableName, label }) =>
+                  a(
+                    {
+                      href: `javascript:set_state_field('table', '${tableName}')`,
+                    },
+                    label
+                  )
                 )
                 .join(" | ")
             )

package/routes/tables.js

@@ -93,14 +93,45 @@ const tableForm = async (table, req) => {
     noSubmitButton: true,
     onChange: "saveAndContinue(this)",
     fields: [
+      {
+        label: req.__("Minimum role to read"),
+        sublabel: req.__(
+          "User must have this role or higher to read rows from the table, unless they are the owner"
+        ),
+        help: {
+          topic: "Table roles",
+          context: {},
+        },
+        name: "min_role_read",
+        input_type: "select",
+        options: roleOptions,
+        attributes: { asideNext: !table.external && !table.provider_name },
+      },
       ...(!table.external && !table.provider_name
         ? [
+            {
+              label: req.__("Minimum role to write"),
+              name: "min_role_write",
+              input_type: "select",
+              help: {
+                topic: "Table roles",
+                context: {},
+              },
+              sublabel: req.__(
+                "User must have this role or higher to edit or create new rows in the table, unless they are the owner"
+              ),
+              options: roleOptions,
+            },
             {
               label: req.__("Ownership field"),
               name: "ownership_field_id",
               sublabel: req.__(
                 "The user referred to in this field will be the owner of the row"
               ),
+              help: {
+                topic: "Ownership field",
+                context: {},
+              },
               input_type: "select",
               options: [
                 { value: "", label: req.__("None") },
@@ -114,6 +145,10 @@ const tableForm = async (table, req) => {
               validator: expressionValidator,
               type: "String",
               class: "validate-expression",
+              help: {
+                topic: "Ownership formula",
+                context: {},
+              },
               sublabel:
                 req.__("User is treated as owner if true. In scope: ") +
                 ["user", ...fields.map((f) => f.name)]
@@ -126,6 +161,10 @@ const tableForm = async (table, req) => {
               sublabel: req.__(
                 "Add relations to this table in dropdown options for ownership field"
               ),
+              help: {
+                topic: "User groups",
+                context: {},
+              },
               name: "is_user_group",
               type: "Bool",
             },
@@ -141,28 +180,9 @@ const tableForm = async (table, req) => {
         ),
         //options: roleOptions,
       },
-      {
-        label: req.__("Minimum role to read"),
-        sublabel: req.__(
-          "User must have this role or higher to read rows from the table, unless they are the owner"
-        ),
-        name: "min_role_read",
-        input_type: "select",
-        options: roleOptions,
-        attributes: { asideNext: !table.external && !table.provider_name },
-      },
       ...(table.external || table.provider_name
         ? []
         : [
-            {
-              label: req.__("Minimum role to write"),
-              name: "min_role_write",
-              input_type: "select",
-              sublabel: req.__(
-                "User must have this role or higher to edit or create new rows in the table, unless they are the owner"
-              ),
-              options: roleOptions,
-            },
             {
               label: req.__("Version history"),
               sublabel: req.__("Track table data changes over time"),
@@ -681,6 +701,10 @@ const attribBadges = (f) => {
           "on_delete_cascade",
           "on_delete",
           "unique_error_msg",
+          "ref",
+          "table",
+          "agg_field",
+          "agg_relation",
         ].includes(k)
       )
         return;
@@ -750,6 +774,14 @@ router.get(
                   r.typename +
                     span({ class: "badge bg-danger ms-1" }, "Unknown type"),
           },
+          ...(table.external
+            ? []
+            : [
+                {
+                  label: req.__("Edit"),
+                  key: (r) => link(`/field/${r.id}`, req.__("Edit")),
+                },
+              ]),
           {
             label: "",
             key: (r) => typeBadges(r, req),
@@ -759,14 +791,6 @@ router.get(
             key: (r) => attribBadges(r),
           },
           { label: req.__("Variable name"), key: (t) => code(t.name) },
-          ...(table.external
-            ? []
-            : [
-                {
-                  label: req.__("Edit"),
-                  key: (r) => link(`/field/${r.id}`, req.__("Edit")),
-                },
-              ]),
           ...(table.external || db.isSQLite
             ? []
             : [

package/routes/tenant.js

@@ -44,7 +44,7 @@ const {
 const db = require("@saltcorn/data/db");
 
 const { loadAllPlugins, loadAndSaveNewPlugin } = require("../load_plugins");
-const { isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher, is_ip_address } = require("./utils.js");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const {
@@ -117,22 +117,10 @@ const create_tenant_allowed = (req) => {
   return user_role <= required_role;
 };
 
-/**
- * Check that String is IPv4 address
- * @param {string} hostname
- * @returns {boolean|string[]}
- */
-// TBD not sure that false is correct return if type of is not string
-// TBD Add IPv6 support
-const is_ip_address = (hostname) => {
-  if (typeof hostname !== "string") return false;
-  return hostname.split(".").every((s) => +s >= 0 && +s <= 255);
-};
-
 const get_cfg_tenant_base_url = (req) =>
   remove_leading_chars(
     ".",
-    getRootState().getConfig("tenant_baseurl", req.hostname)
+    getRootState().getConfig("tenant_baseurl", req.hostname) || req.hostname
   )
     .replace("http://", "")
     .replace("https://", "");
@@ -268,7 +256,8 @@ router.post(
       return;
     }
     // declare  ui form
-    const form = tenant_form(req);
+    const base_url = get_cfg_tenant_base_url(req);
+    const form = tenant_form(req, base_url);
     // validate ui form
     const valres = form.validate(req.body);
     if (valres.errors)

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");
@@ -77,11 +77,9 @@ function loggedIn(req, res, next) {
  * @returns {void}
  */
 function isAdmin(req, res, next) {
-  if (
-    req.user &&
-    req.user.role_id === 1 &&
-    req.user.tenant === db.getTenantSchema()
-  ) {
+  const cur_tenant = db.getTenantSchema();
+  //console.log({ cur_tenant, user: req.user });
+  if (req.user && req.user.role_id === 1 && req.user.tenant === cur_tenant) {
     next();
   } else {
     req.flash("danger", req.__("Must be admin"));
@@ -157,6 +155,8 @@ const get_tenant_from_req = (req, hostPartsOffset) => {
   if (req.subdomains && req.subdomains.length == 0)
     return db.connectObj.default_schema;
   if (!req.subdomains && req.headers.host) {
+    if (is_ip_address(req.headers.host.split(":")[0]))
+      return db.connectObj.default_schema;
     const parts = req.headers.host.split(".");
     if (parts.length < (!hostPartsOffset ? 3 : 3 - hostPartsOffset))
       return db.connectObj.default_schema;
@@ -299,7 +299,7 @@ const getGitRevision = () => db.connectObj.git_commit;
  * Gets session store
  * @returns {session|cookieSession}
  */
-const getSessionStore = () => {
+const getSessionStore = (pruneInterval) => {
   /*if (getState().getConfig("cookie_sessions", false)) {
     return cookieSession({
       keys: [db.connectObj.session_secret || is.str.generate()],
@@ -322,6 +322,7 @@ const getSessionStore = () => {
         schemaName: db.connectObj.default_schema,
         pool: db.pool,
         tableName: "_sc_session",
+        pruneSessionInterval: pruneInterval > 0 ? pruneInterval : false,
       }),
       secret: db.connectObj.session_secret || is.str.generate(),
       resave: false,
@@ -350,6 +351,18 @@ const is_relative_url = (url) => {
   return typeof url === "string" && !url.includes(":/") && !url.includes("//");
 };
 
+/**
+ * Check that String is IPv4 address
+ * @param {string} hostname
+ * @returns {boolean|string[]}
+ */
+// TBD not sure that false is correct return if type of is not string
+// TBD Add IPv6 support
+const is_ip_address = (hostname) => {
+  if (typeof hostname !== "string") return false;
+  return hostname.split(".").every((s) => +s >= 0 && +s <= 255);
+};
+
 const admin_config_route = ({
   router,
   path,
@@ -398,7 +411,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" });
         }
@@ -555,6 +571,7 @@ module.exports = {
   get_tenant_from_req,
   addOnDoneRedirect,
   is_relative_url,
+  is_ip_address,
   get_sys_info,
   admin_config_route,
   sendHtmlFile,

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" });
   })
 );