@saltcorn/server 0.8.7-beta.3 → 0.8.7-beta.5

package/routes/diagram.js

@@ -22,6 +22,7 @@ const { isAdmin, error_catcher } = require("./utils.js");
 const Tag = require("@saltcorn/data/models/tag");
 const Router = require("express-promise-router");
 const User = require("@saltcorn/data/models/user");
+const db = require("@saltcorn/data/db");
 
 const router = new Router();
 module.exports = router;
@@ -343,16 +344,13 @@ router.get(
             }`,
         },
         {
-          script:
-            "https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.9.2/umd/popper.min.js",
+          script: `/static_assets/${db.connectObj.version_tag}/popper.min.js`,
         },
         {
-          script:
-            "https://cdnjs.cloudflare.com/ajax/libs/cytoscape/3.22.1/cytoscape.min.js",
+          script: `/static_assets/${db.connectObj.version_tag}/cytoscape.min.js`,
         },
         {
-          script:
-            "https://cdnjs.cloudflare.com/ajax/libs/cytoscape-popper/2.0.0/cytoscape-popper.min.js",
+          script: `/static_assets/${db.connectObj.version_tag}/cytoscape-popper.min.js`,
         },
       ],
     });

package/routes/fields.js

@@ -454,11 +454,11 @@ const fieldFlow = (req) =>
                 required: true,
                 attributes: {
                   explainers: {
-                    Fail: "Prevent any deletion of parent rows",
+                    Fail: req.__("Prevent any deletion of parent rows"),
                     Cascade:
-                      "If the parent row is deleted, automatically delete the child rows.",
+                        req.__("If the parent row is deleted, automatically delete the child rows."),
                     "Set null":
-                      "If the parent row is deleted, set key fields on child rows to null",
+                        req.__("If the parent row is deleted, set key fields on child rows to null"),
                   },
                 },
                 sublabel: req.__(

package/routes/files.js

@@ -69,9 +69,12 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     // todo limit select from file by 10 or 20
-    const { dir } = req.query;
+    const { dir, search } = req.query;
     const safeDir = File.normalise(dir || "/");
-    const rows = await File.find({ folder: dir }, { orderBy: "filename" });
+    const rows = await File.find(
+      { folder: dir, search },
+      { orderBy: "filename" }
+    );
     const roles = await User.get_roles();
     if (safeDir && safeDir !== "/" && safeDir !== ".") {
       let dirname = path.dirname(safeDir);
@@ -383,7 +386,7 @@ router.post(
   "/upload",
   setTenant,
   error_catcher(async (req, res) => {
-    let { folder } = req.body;
+    let { folder, sortBy, sortDesc } = req.body;
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);
     const role = req.user && req.user.id ? req.user.role_id : 100;
@@ -404,16 +407,11 @@ router.post(
       );
       const many = Array.isArray(f);
       file_for_redirect = many ? f[0] : f;
-      if (!req.xhr)
-        req.flash(
-          "success",
-          req.__(
-            `File %s uploaded`,
-            many
-              ? f.map((fl) => text(fl.filename)).join(", ")
-              : text(f.filename)
-          )
-        );
+      const successMsg = req.__(
+        `File %s uploaded`,
+        many ? f.map((fl) => text(fl.filename)).join(", ") : text(f.filename)
+      );
+      if (!req.xhr) req.flash("success", successMsg);
       else
         jsonResp = {
           success: {
@@ -422,16 +420,18 @@ router.post(
             url: many
               ? f.map((fl) => `/files/serve/${fl.path_to_serve}`)
               : `/files/serve/${f.path_to_serve}`,
+            msg: successMsg,
           },
         };
     }
-    if (!req.xhr)
-      res.redirect(
-        !file_for_redirect
-          ? "/files"
-          : `/files?dir=${encodeURIComponent(file_for_redirect.current_folder)}`
-      );
-    else res.json(jsonResp);
+    if (!req.xhr) {
+      const sp = new URLSearchParams();
+      if (file_for_redirect) sp.append("dir", file_for_redirect.current_folder);
+      if (sortBy) sp.append("sortBy", sortBy);
+      if (sortDesc) sp.append("sortDesc", sortDesc);
+      const query = sp.toString();
+      res.redirect(`/files${query ? `?${query}` : ""}`);
+    } else res.json(jsonResp);
   })
 );
 
@@ -449,7 +449,7 @@ router.post(
     const { redirect } = req.query;
     const f = await File.findOne(serve_path);
     if (!f) {
-      req.flash("error", "File not found");
+      req.flash("error", req.__("File not found"));
       res.redirect("/files");
       return;
     }

package/routes/list.js

@@ -100,15 +100,7 @@ router.post(
   error_catcher(async (req, res) => {
     const { tableName, id, _version } = req.params;
     const table = Table.findOne({ name: tableName });
-
-    const fields = table.getFields();
-    const row = await db.selectOne(`${db.sqlsanitize(table.name)}__history`, {
-      id,
-      _version,
-    });
-    var r = {};
-    fields.forEach((f) => (r[f.name] = row[f.name]));
-    await table.updateRow(r, +id);
+    await table.restore_row_version(id, _version);
     req.flash("success", req.__("Version %s restored", _version));
     res.redirect(`/list/_versions/${table.name}/${id}`);
   })

package/routes/notifications.js

@@ -70,7 +70,7 @@ router.get(
             {
               type: "card",
               contents: [
-                "Receive notifications by:",
+                req.__("Receive notifications by:"),
                 renderForm(notificationSettingsForm(), req.csrfToken()),
               ],
             },

package/routes/plugins.js

@@ -526,7 +526,8 @@ const plugin_store_html = (items, req) => {
         contents: div(
           { class: "d-flex justify-content-between" },
           storeNavPills(req),
-          div(search_bar("q", req.query.q || "", { stateField: "q" })),
+          div(search_bar("q", req.query.q || "",
+              { placeHolder: req.__("Search for..."), stateField: "q" })),
           div(store_actions_dropdown(req))
         ),
       },
@@ -825,7 +826,7 @@ router.get(
       pkgjson = require(path.join(mod.location, "package.json"));
 
     if (!plugin_db) {
-      req.flash("warning", "Module not found");
+      req.flash("warning", req.__("Module not found"));
       res.redirect("/plugins");
       return;
     }
@@ -1035,7 +1036,7 @@ router.post(
 
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
-      req.flash("warning", "Module not found");
+      req.flash("warning", req.__("Module not found"));
       res.redirect("/plugins");
       return;
     }

package/routes/tables.js

@@ -42,6 +42,7 @@ const {
   domReady,
   code,
   pre,
+  button,
 } = require("@saltcorn/markup/tags");
 const stringify = require("csv-stringify");
 const TableConstraint = require("@saltcorn/data/models/table_constraints");
@@ -54,8 +55,11 @@ const {
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
 const { tablesList } = require("./common_lists");
-const { InvalidConfiguration } = require("@saltcorn/data/utils");
-const { sleep } = require("@saltcorn/data/utils");
+const {
+  InvalidConfiguration,
+  removeAllWhiteSpace,
+} = require("@saltcorn/data/utils");
+const { EOL } = require("os");
 
 const path = require("path");
 /**
@@ -421,6 +425,101 @@ router.post(
   })
 );
 
+const indentString = (str, indent) => `${" ".repeat(indent)}${str}`;
+
+const srcCardinality = (field) => (field.required ? "||" : "|o");
+
+const buildTableMarkup = (table) => {
+  const fields = table.getFields();
+  const members = fields
+    // .filter((f) => !f.reftable_name)
+    .map((f) =>
+      indentString(`${removeAllWhiteSpace(f.type_name)} ${f.name}`, 6)
+    )
+    .join(EOL);
+  const keys = table
+    .getForeignKeys()
+    .map((f) =>
+      indentString(
+        `"${table.name}"${srcCardinality(f)}--|| "${f.reftable_name}" : "${
+          f.name
+        }"`,
+        2
+      )
+    )
+    .join(EOL);
+  return `${keys}
+  "${table.name}" {${EOL}${members}${EOL}  }`;
+};
+
+const buildMermaidMarkup = (tables) => {
+  const lines = tables.map((table) => buildTableMarkup(table)).join(EOL);
+  return `${indentString("erDiagram", 2)}${EOL}${lines}`;
+};
+
+const navigationPanel = () =>
+  div(
+    { class: "er-navigation-panel" },
+    button(
+      {
+        class: "btn btn-primary er-up",
+        onclick: "erHelper.translateY(-100)",
+      },
+      i({ class: "fas fa-chevron-up" })
+    ),
+    button(
+      {
+        class: "btn btn-primary er-zoom-in",
+        onclick: "erHelper.zoom(0.1)",
+      },
+      i({ class: "fas fa-search-plus" })
+    ),
+    button(
+      {
+        class: "btn btn-primary er-left",
+        onclick: "erHelper.translateX(-100)",
+      },
+      i({ class: "fas fa-chevron-left" })
+    ),
+    button(
+      { class: "btn btn-primary er-reset", onclick: "erHelper.reset()" },
+      i({ class: "fas fa-sync-alt" })
+    ),
+    button(
+      {
+        class: "btn btn-primary er-right",
+        onclick: "erHelper.translateX(100)",
+      },
+      i({ class: "fas fa-chevron-right" })
+    ),
+    button(
+      {
+        class: "btn btn-primary er-down",
+        onclick: "erHelper.translateY(100)",
+      },
+      i({ class: "fas fa-chevron-down" })
+    ),
+    button(
+      {
+        class: "btn btn-primary er-zoom-out",
+        onclick: "erHelper.zoom(-0.1)",
+      },
+      i({ class: "fas fa-search-minus" })
+    )
+  );
+
+const screenshotPanel = () =>
+  div(
+    { class: "er-screenshot-panel" },
+    button(
+      {
+        class: "btn btn-primary",
+        onclick: "erHelper.takePicture()",
+      },
+      i({ class: "fas fa-camera" })
+    )
+  );
+
 /**
  * Show Relational Diagram (get)
  * @name get/relationship-diagram
@@ -433,34 +532,24 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external({}, { orderBy: "name" });
-    const edges = [];
-    for (const table of tables) {
-      const fields = table.getFields();
-      for (const field of fields) {
-        if (field.reftable_name)
-          edges.push({
-            from: table.name,
-            to: field.reftable_name,
-            arrows: "to",
-          });
-      }
-    }
-    const data = {
-      nodes: tables.map((t) => ({
-        id: t.name,
-        label: `<b>${t.name}</b>\n${t.fields
-          .map((f) => `${f.name} : ${f.pretty_type}`)
-          .join("\n")}`,
-        title: t.description ? t.description : t.name,
-      })),
-      edges,
-    };
     res.sendWrap(
       {
         title: req.__("Tables"),
         headers: [
           {
-            script: `/static_assets/${db.connectObj.version_tag}/vis-network.min.js`,
+            script: `/static_assets/${db.connectObj.version_tag}/mermaid.min.js`,
+          },
+          {
+            headerTag: `
+            <script type="module">
+              mermaid.initialize({ startOnLoad: false });
+              await mermaid.run({
+                querySelector: ".mermaid",
+                postRenderCallback: (id) => {
+                  $("#" + id).css("height", "calc(100vh - 250px)");
+                }
+              });
+            </script>`,
           },
         ],
       },
@@ -482,29 +571,19 @@ router.get(
               },
             ]),
             contents: [
-              div({ id: "erdvis" }),
-              script(
-                domReady(`
-            var container = document.getElementById('erdvis');        
-            var data = ${JSON.stringify(data)};
-            var options = {
-              edges: {length: 250},
-              nodes: {
-                font: { align: 'left', multi: "html", size: 20 },
-                shape: "box"
-              },
-              physics: {
-                // Even though it's disabled the options still apply to network.stabilize().
-                enabled: false,
-                solver: "repulsion",
-                repulsion: {
-                  nodeDistance: 100 // Put more distance between the nodes.
-                }
-              }
-            };        
-            var network = new vis.Network(container, data, options);
-            network.stabilize();`)
+              div(
+                {
+                  style: "height: calc(100vh - 250px);",
+                  class: "overflow-scroll position-relative",
+                },
+                screenshotPanel(),
+                pre(
+                  { class: "mermaid", style: "height: calc(100vh - 250px);" },
+                  buildMermaidMarkup(tables)
+                ),
+                navigationPanel()
               ),
+              script({ src: "/relationship_diagram_utils.js" }),
             ],
           },
         ],
@@ -1135,7 +1214,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { name } = req.params;
     const table = Table.findOne({ name });
-    const rows = await table.getRows({}, { orderBy: "id", orderDesc: true });
+    const rows = await table.getRows({}, { orderBy: "id" });
     res.setHeader("Content-Type", "text/csv");
     res.setHeader("Content-Disposition", `attachment; filename="${name}.csv"`);
     res.setHeader("Cache-Control", "no-cache");

package/tests/clientjs.test.js

@@ -34,6 +34,9 @@ test("updateQueryStringParameter", () => {
   expect(removeQueryStringParameter("/foo?name=Bar&age=45", "age")).toBe(
     "/foo?name=Bar"
   );
+  expect(
+    removeQueryStringParameter("/foo?name=Baz&name=Foo&age=45", "name")
+  ).not.toContain("name");
   expect(
     updateQueryStringParameter("/foo", "publisher.publisher->name", "AK")
   ).toBe("/foo?publisher.publisher->name=AK");

package/tests/files.test.js

@@ -7,9 +7,9 @@ const {
   itShouldRedirectUnauthToLogin,
   toInclude,
   toSucceed,
-  toNotInclude,
   resetToFixtures,
   toSucceedWithImage,
+  respondJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const fs = require("fs").promises;
@@ -18,7 +18,17 @@ const File = require("@saltcorn/data/models/file");
 const Field = require("@saltcorn/data/models/field");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
-const { table } = require("console");
+const { existsSync } = require("fs");
+
+const createTestFile = async (folder, name, mimetype, content) => {
+  if (
+    !existsSync(
+      path.join(db.connectObj.file_store, db.getTenantSchema(), folder, name)
+    )
+  ) {
+    await File.from_contents(name, mimetype, content, 1, 100, folder);
+  }
+};
 
 beforeAll(async () => {
   await resetToFixtures();
@@ -47,6 +57,33 @@ beforeAll(async () => {
     1,
     100
   );
+
+  await File.new_folder(path.join("_sc_test_subfolder_one", "subsubfolder"));
+  await createTestFile(
+    "_sc_test_subfolder_one",
+    "foo_image.png",
+    "image/png",
+    "imagecontent"
+  );
+  await createTestFile(
+    "_sc_test_subfolder_one",
+    "bar_image.png",
+    "image/png",
+    "imagecontent"
+  );
+  await createTestFile(
+    path.join("_sc_test_subfolder_one", "subsubfolder"),
+    "bar_image.png",
+    "image/png",
+    "imagecontent"
+  );
+  await File.new_folder("_sc_test_subfolder_two");
+  await createTestFile(
+    "_sc_test_subfolder_two",
+    "foo_image.png",
+    "image/png",
+    "imagecontent"
+  );
 });
 afterAll(db.close);
 
@@ -146,6 +183,90 @@ describe("files admin", () => {
 
       .expect(toRedirect("/files?dir=."));
   });
+  it("search files by name", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    const checkFiles = (files, expecteds) =>
+      files.length === expecteds.length &&
+      expecteds.every(({ filename, location }) =>
+        files.find(
+          (file) => file.filename === filename && file.location === location
+        )
+      );
+    const searchTestHelper = async (dir, search, expected) => {
+      await request(app)
+        .get("/files")
+        .query({ dir, search })
+        .set("X-Requested-With", "XMLHttpRequest")
+        .set("Cookie", loginCookie)
+        .expect(
+          respondJsonWith(200, (data) => checkFiles(data.files, expected))
+        );
+    };
+
+    await searchTestHelper("/", "foo", [
+      {
+        filename: "foo_image.png",
+        location: path.join("_sc_test_subfolder_one", "foo_image.png"),
+      },
+      {
+        filename: "foo_image.png",
+        location: path.join("_sc_test_subfolder_two", "foo_image.png"),
+      },
+    ]);
+    await searchTestHelper("_sc_test_subfolder_two", "foo", [
+      {
+        filename: "foo_image.png",
+        location: path.join("_sc_test_subfolder_two", "foo_image.png"),
+      },
+      {
+        filename: "..",
+        location: "",
+      },
+    ]);
+    await searchTestHelper("/", "bar", [
+      {
+        filename: "bar_image.png",
+        location: path.join("_sc_test_subfolder_one", "bar_image.png"),
+      },
+      {
+        filename: "bar_image.png",
+        location: path.join(
+          "_sc_test_subfolder_one",
+          "subsubfolder",
+          "bar_image.png"
+        ),
+      },
+    ]);
+    await searchTestHelper(
+      path.join("_sc_test_subfolder_one", "subsubfolder"),
+      "foo",
+      [
+        {
+          filename: "..",
+          location: "_sc_test_subfolder_one",
+        },
+      ]
+    );
+    await searchTestHelper(
+      path.join("_sc_test_subfolder_one", "subsubfolder"),
+      "bar",
+      [
+        {
+          filename: "..",
+          location: "_sc_test_subfolder_one",
+        },
+        {
+          filename: "bar_image.png",
+          location: path.join(
+            "_sc_test_subfolder_one",
+            "subsubfolder",
+            "bar_image.png"
+          ),
+        },
+      ]
+    );
+  });
 });
 describe("files edit", () => {
   it("creates table and view", async () => {