@saltcorn/server 1.1.1-beta.8 → 1.1.1-rc.2

package/serve.js

@@ -99,20 +99,24 @@ const ensurePluginsFolder = async () => {
   const staticDeps = ["@saltcorn/markup", "@saltcorn/data", "jest"];
   const allPluginFolders = new Set();
   await eachTenant(async () => {
-    const allPlugins = (await Plugin.find()).filter(
-      (p) => !["base", "sbadmin2"].includes(p.name)
-    );
-    for (const plugin of allPlugins) {
-      const tokens =
-        plugin.source === "npm"
-          ? plugin.location.split("/")
-          : plugin.name.split("/");
-      const pluginDir = path.join(
-        rootFolder,
-        plugin.source === "git" ? "git_plugins" : "plugins_folder",
-        ...tokens
+    try {
+      const allPlugins = (await Plugin.find()).filter(
+        (p) => !["base", "sbadmin2"].includes(p.name)
       );
-      allPluginFolders.add(pluginDir);
+      for (const plugin of allPlugins) {
+        const tokens =
+          plugin.source === "npm"
+            ? plugin.location.split("/")
+            : plugin.name.split("/");
+        const pluginDir = path.join(
+          rootFolder,
+          plugin.source === "git" ? "git_plugins" : "plugins_folder",
+          ...tokens
+        );
+        allPluginFolders.add(pluginDir);
+      }
+    } catch {
+      //ignore
     }
   });
   for (const folder of allPluginFolders) {

package/tests/api.test.js

@@ -107,6 +107,19 @@ describe("API read", () => {
         )
       );
   });
+  it("should get books limit", async () => {
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/api/books/?limit=1&offset=1&sortBy=pages")
+      .expect(
+        succeedJsonWith(
+          (rows) =>
+            rows.length == 1 &&
+            rows[0].author === "Herman Melville" &&
+            rows[0].pages === 967
+        )
+      );
+  });
   it("should handle fkey args ", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });

package/tests/clientjs.test.js

@@ -54,6 +54,26 @@ test("updateQueryStringParameter", () => {
       "AK"
     )
   ).toBe("/foo?publisher.publisher->name=AK");
+  expect(
+    updateQueryStringParameter(
+      "/foo?factor.Factors->focus_area.Focus%20area->short_name=Leadership",
+      "factor.Factors->focus_area.Focus%20area->short_name",
+      "Marketing"
+    )
+  ).toBe("/foo?factor.Factors->focus_area.Focus%20area->short_name=Marketing");
+  expect(
+    updateQueryStringParameter(
+      "/foo?factor.Factors%20(Solaris)->focus_area.Focus%20area%20(Solaris)->short_name=Leadership",
+      "factor.Factors%20(Solaris)->focus_area.Focus%20area%20(Solaris)->short_name",
+      "Marketing"
+    )
+  ).toBe(
+    "/foo?factor.Factors%20(Solaris)->focus_area.Focus%20area%20(Solaris)->short_name=Marketing"
+  );
+  expect(removeQueryStringParameter("/foo?name=Bar&factor.Factors%20(Solaris)->focus_area.Focus%20area%20(Solaris)->short_name=Leadership", "factor.Factors%20(Solaris)->focus_area.Focus%20area%20(Solaris)->short_name")).toBe(
+    "/foo?name=Bar"
+  );
+
   expect(updateQueryStringParameter("/foo", "_or_field", ["baz", "bar"])).toBe(
     "/foo?_or_field=baz&_or_field=bar"
   );

package/tests/files.test.js

@@ -407,7 +407,7 @@ describe("visible_entries test", () => {
       .set("Cookie", staffCookie);
     expect(resp.statusCode).toBe(200);
     expect(
-      resp.body.directories.find((file) => file.filename === "subsubfolder")
+      resp.body.directories.find((file) => file.filename === "_sc_test_subfolder_one/subsubfolder")
     ).toBeDefined();
   });
 

package/wrapper.js

@@ -96,6 +96,7 @@ const get_menu = (req) => {
   const canEditViews = state.getConfig("min_role_edit_views", 1) >= role;
   const canEditPages = state.getConfig("min_role_edit_pages", 1) >= role;
   const canEditTriggers = state.getConfig("min_role_edit_triggers", 1) >= role;
+  const canEditMenu = state.getConfig("min_role_edit_menu", 1) >= role;
   const isAdmin = role === 1;
   const hasAdmin =
     isAdmin ||
@@ -103,6 +104,7 @@ const get_menu = (req) => {
     canInspectTables ||
     canEditPages ||
     canEditViews ||
+    canEditMenu ||
     canEditTriggers;
   /*
    * Admin Menu items
@@ -128,13 +130,41 @@ const get_menu = (req) => {
         icon: "far fa-file",
         label: req.__("Pages"),
       });
-    if (canEditTriggers && !isAdmin)
+    if (canEditTriggers && !canEditMenu && !isAdmin)
       adminItems.push({
         link: "/actions",
         altlinks: ["/events", "/eventlog", "/crashlog"],
         icon: "fas fa-calendar-check",
         label: req.__("Triggers"),
       });
+    if (canEditMenu && !isAdmin) {
+      const subitems = [
+        {
+          link: "/menu",
+          altlinks: [
+            "/site-structure",
+            "/search/config",
+            "/library/list",
+            "/tenant/list",
+          ],
+          icon: "fas fa-compass",
+          label: req.__("Menu"),
+        },
+      ];
+      if (canEditTriggers)
+        subitems.push({
+          link: "/actions",
+          altlinks: ["/events", "/eventlog", "/crashlog"],
+          icon: "fas fa-calendar-check",
+          label: req.__("Triggers"),
+        });
+      adminItems.push({
+        label: req.__("Settings"),
+        icon: "fas fa-wrench",
+        subitems,
+      });
+    }
+
     if (isAdmin)
       adminItems.push({
         label: req.__("Settings"),