@saltcorn/server 0.9.6-beta.7 → 0.9.6-beta.8

package/locales/en.json

@@ -1425,5 +1425,6 @@
 	"Keystore Alias": "Keystore Alias",
 	"Keystore Password": "Keystore Password",
 	"xcodebuild": "xcodebuild",
-	"Provisioning Profile": "Provisioning Profile"
+	"Provisioning Profile": "Provisioning Profile",
+	"Registry editor": "Registry editor"
 }

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/package.json

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

package/public/saltcorn-common.js

@@ -179,7 +179,11 @@ 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}`));

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