@saltcorn/server 1.6.0-alpha.8 → 1.6.0-beta.1

package/routes/page.js

@@ -18,7 +18,7 @@ const {
   getEligiblePage,
   getRandomPage,
 } = require("../routes/utils.js");
-const { isTest } = require("@saltcorn/data/utils");
+const { isTest, objectToQueryString } = require("@saltcorn/data/utils");
 const { add_edit_bar, add_results_to_contents } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
@@ -92,7 +92,7 @@ const runPage = async (page, req, res, tic) => {
                 role,
                 title: page.name,
                 what: req.__("Page"),
-                url: `/pageedit/edit/${encodeURIComponent(page.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
+                url: `/pageedit/edit/${encodeURIComponent(page.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}&${objectToQueryString(req.query)}`,
                 contents,
               }),
           resultCollector

package/routes/pageedit.js

@@ -261,7 +261,7 @@ const pageBuilderData = async (req, context) => {
       }
     }
   }
-
+  const { on_done_redirect, ...current_filter_state } = req.query;
   //console.log(fixed_state_fields.ListTasks);
   const icons = getState().icons;
   return {
@@ -271,7 +271,9 @@ const pageBuilderData = async (req, context) => {
     images,
     pages,
     page_groups,
+    current_filter_state,
     actions: actionsNotRequiringRow,
+    has_copilot_generate: !!getState().functions.copilot_generate_layout,
     builtInActions: ["GoBack"],
     triggerActions,
     library,
@@ -316,12 +318,20 @@ const getRootPageForm = (pages, pageGroups, roles, req) => {
           label: r.role,
           input_type: "select",
           options: [
-            "",
+            r.id === 1 ? { label: req.__("Admin dashboard"), value: "" } : "",
             ...pages.filter((p) => p.min_role >= r.id).map((p) => p.name),
             ...pageGroups.map((g) => ({
               label: `${g.name} (group)`,
               value: g.name,
             })),
+            ...(r.id === 1
+              ? [
+                  {
+                    label: req.__("All entities list"),
+                    value: "_sc_entities_list",
+                  },
+                ]
+              : []),
           ],
         })
     ),
@@ -436,6 +446,8 @@ const wrap = (contents, noCard, req, page) => ({
           ? { href: `/page/${encodeURIComponent(page.name)}`, text: page.name }
           : { text: req.__("New") },
       ],
+      right:
+        '<div id="builder-header-actions" class="d-flex align-items-center gap-2"></div>',
     },
     {
       type: noCard ? "container" : "card",

package/routes/plugins.js

@@ -702,7 +702,7 @@ router.get(
                       label: version,
                       selected: version === selected,
                     })
-                  )
+                  ).reverse()
               ),
               // tag
               label(

package/routes/tables.js

@@ -894,7 +894,10 @@ router.get(
             label: req.__("Attributes"),
             key: (r) => attribBadges(r),
           },
-          { label: req.__("Variable name"), key: (t) => code(t.name) },
+          {
+            label: req.__("Variable name"),
+            key: (t) => span({ class: "copy-to-clipboard" }, code(t.name)),
+          },
           ...(table.external || !user_can_edit_tables || table.provider_name
             ? []
             : [
@@ -1206,7 +1209,7 @@ router.get(
             {
               text: span(
                 { class: "fw-bold text-body" },
-                table.name,
+                span({ class: "copy-to-clipboard" }, table.name),
                 table.provider_name && ` (${table.provider_name} provider)`
               ),
             },

package/routes/tenant.js

@@ -117,10 +117,10 @@ const tenant_form = (req, base_url) =>
  */
 // TBD To allow few roles to create tenants - currently only one role has such rights simultaneously
 const create_tenant_allowed = (req) => {
-  const required_role =
-    +getRootState().getConfig("role_to_create_tenant") || 100;
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+  const required_role = +getRootState().getConfig("role_to_create_tenant") || 1;
   const user_role = req.user ? req.user.role_id : 100;
-  return user_role <= required_role;
+  return user_role <= required_role && (isRoot || required_role === 100);
 };
 
 const get_cfg_tenant_base_url = (req) =>

package/routes/tsdecls/assert.d.ts

@@ -0,0 +1,23 @@
+interface Assert {
+  (value: unknown, message?: string | Error): asserts value;
+
+  ok(value: unknown, message?: string | Error): asserts value;
+  fail(message?: string | Error): never;
+  equal(actual: unknown, expected: unknown, message?: string | Error): void;
+  notEqual(actual: unknown, expected: unknown, message?: string | Error): void;
+  strictEqual<T>(actual: unknown, expected: T, message?: string | Error): asserts actual is T;
+  notStrictEqual(actual: unknown, expected: unknown, message?: string | Error): void;
+  deepEqual(actual: unknown, expected: unknown, message?: string | Error): void;
+  notDeepEqual(actual: unknown, expected: unknown, message?: string | Error): void;
+  deepStrictEqual<T>(actual: unknown, expected: T, message?: string | Error): asserts actual is T;
+  notDeepStrictEqual(actual: unknown, expected: unknown, message?: string | Error): void;
+  throws(fn: () => unknown, message?: string | Error): void;
+  doesNotThrow(fn: () => unknown, message?: string | Error): void;
+  rejects(fn: () => Promise<unknown>, message?: string | Error): Promise<void>;
+  doesNotReject(fn: () => Promise<unknown>, message?: string | Error): Promise<void>;
+  ifError(value: unknown): asserts value is null | undefined;
+  match(value: string, regExp: RegExp, message?: string | Error): void;
+  doesNotMatch(value: string, regExp: RegExp, message?: string | Error): void;
+}
+
+declare const assert: Assert;

package/routes/view.js

@@ -20,7 +20,7 @@ const {
   isAdminOrHasConfigMinRole,
 } = require("../routes/utils.js");
 const { add_edit_bar, add_results_to_contents } = require("../markup/admin.js");
-const { InvalidConfiguration, isTest } = require("@saltcorn/data/utils");
+const { InvalidConfiguration, isTest, objectToQueryString } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 
 /**
@@ -191,7 +191,7 @@ router.get(
                 title: view.name,
                 what: req.__("View"),
                 url: `/viewedit/edit/${encodeURIComponent(view.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
-                cfgUrl: `/viewedit/config/${encodeURIComponent(view.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
+                cfgUrl: `/viewedit/config/${encodeURIComponent(view.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}&${objectToQueryString(req.query)}`,
                 contents,
                 req,
                 view,

package/routes/viewedit.js

@@ -635,6 +635,8 @@ const respondWorkflow = (view, wf, wfres, req, res, table) => {
           },
           { workflow: wf, step: wfres },
         ],
+        right:
+          '<div id="builder-header-actions" class="d-flex align-items-center gap-2"></div>',
       },
       {
         type: noCard ? "container" : "card",
@@ -1011,3 +1013,20 @@ router.post(
     res.json({ view });
   })
 );
+
+router.post(
+  "/copilot-generate-layout",
+  isAdminOrHasConfigMinRole(["min_role_edit_views", "min_role_edit_pages"]),
+  error_catcher(async (req, res) => {
+    const { mode, table, prompt } = req.body;
+    const f = getState().functions.copilot_generate_layout;
+    if (!f) {
+      res.json({
+        error: `Copilot layout generator not found. Copilot module 0.7.2 or later required`,
+      });
+      return;
+    }
+    const layout = await f.run(prompt, mode, table);
+    res.json({ success: "ok", layout });
+  })
+);

package/serve.js

@@ -52,7 +52,7 @@ const {
 } = require("@saltcorn/admin-models/models/tenant");
 const { auto_backup_now } = require("@saltcorn/admin-models/models/backup");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
-const { writeFileSync, rmdirSync, readFileSync } = require("fs");
+const { writeFileSync, rmSync, readFileSync, readdirSync } = require("fs");
 const { pathExistsSync } = require("fs-extra");
 const envPaths = require("env-paths");
 
@@ -94,6 +94,7 @@ const ensurePluginsFolder = async () => {
     "jest",
   ];
   const allPluginFolders = new Set();
+  const localPluginParentDirs = new Set();
   await eachTenant(async () => {
     try {
       const allPlugins = (await Plugin.find()).filter(
@@ -111,11 +112,29 @@ const ensurePluginsFolder = async () => {
           plugin.version || "unknownversion"
         );
         allPluginFolders.add(pluginDir);
+        if (plugin.source === "local") {
+          localPluginParentDirs.add(
+            path.join(rootFolder, "plugins_folder", ...tokens)
+          );
+        }
       }
     } catch {
       //ignore
     }
   });
+  // Remove leftover cache-busted localversion_<timestamp> directories
+  for (const parentDir of localPluginParentDirs) {
+    try {
+      if (!pathExistsSync(parentDir)) continue;
+      for (const entry of readdirSync(parentDir)) {
+        if (/^localversion_\d+$/.test(entry)) {
+          rmSync(path.join(parentDir, entry), { recursive: true });
+        }
+      }
+    } catch (e) {
+      console.log(`Error cleaning localversion cache dirs: ${e.message || e}`);
+    }
+  }
   for (const folder of allPluginFolders) {
     try {
       if (pathExistsSync(folder)) {
@@ -131,7 +150,7 @@ const ensurePluginsFolder = async () => {
             )) &&
           !pathExistsSync(path.join(folder, "node_modules"))
         )
-          rmdirSync(folder, { recursive: true });
+          rmSync(folder, { recursive: true });
       }
     } catch (e) {
       console.log(`Error checking plugin folder: ${e.message || e}`);
@@ -246,7 +265,7 @@ const initMaster = async (
   if (db.is_it_multi_tenant()) {
     const tenants = await getAllTenants();
     await init_multi_tenant(
-      loadAllPlugins,
+      () => loadAllPlugins(true),
       disableMigrate,
       tenants,
       db.connectObj.multi_node ? getMultiNodeListener : null
@@ -305,6 +324,9 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
     );
   }
 
+  if (msg.reload_plugins) {
+    loadAllPlugins(cluster.isPrimary, true);
+  }
   if (msg.refresh) {
     if (msg.refresh === "ephemeral_config")
       getState().refresh_ephemeral_config(msg.key, msg.value);
@@ -475,10 +497,34 @@ module.exports =
     dev,
     ...appargs
   } = {}) => {
-    if (cluster.isMaster) {
+    if (cluster.isPrimary) {
       ensureJwtSecret();
       await ensurePluginsFolder();
       await ensureNotificationSubscriptions();
+
+      // reload plugins on SIGHUP
+      process.on("SIGHUP", async () => {
+        getState().log(
+          4,
+          "SIGHUP received: reloading plugins and state for all tenants"
+        );
+        await loadAllPlugins(true, true);
+        await getState().refresh_plugins(true);
+        Object.entries(cluster.workers || {}).forEach(([wpid, w]) => {
+          w.send({ reload_plugins: true });
+        });
+        if (db.is_it_multi_tenant()) {
+          for (const tenant of await getAllTenants()) {
+            await db.runWithTenant(tenant, async () => {
+              await loadAllPlugins(true, true);
+              await getState().refresh_plugins(true);
+              Object.entries(cluster.workers || {}).forEach(([wpid, w]) => {
+                w.send({ tenant, reload_plugins: true });
+              });
+            });
+          }
+        }
+      });
     }
     process.on("unhandledRejection", (reason, p) => {
       console.error(reason, "Unhandled Rejection at Promise");
@@ -837,7 +883,9 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
               });
           } else socket.join(`${ten}_${viewname}_${room_id}`);
         } catch (err) {
-          getState().log(1, `Socket join_room error: ${err.stack}`);
+          const state = getState();
+          if (state) state.log(1, `Socket join_room error: ${err.stack}`);
+          else console.error("Socket join_room error:", err);
         }
       };
       if (ten && ten !== "public") db.runWithTenant(ten, f);

package/tests/page.test.js

@@ -304,6 +304,51 @@ describe("pageedit", () => {
 
       .expect(toInclude("Root pages updated"));
   });
+  it("shows Admin dashboard and All entities list options for admin role", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/pageedit")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Admin dashboard"))
+      .expect(toInclude("All entities list"));
+  });
+  it("does not show All entities list option for non-admin roles", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    const res = await request(app)
+      .get("/pageedit")
+      .set("Cookie", loginCookie)
+      .expect(200);
+    // The value _sc_entities_list should appear exactly once (only for admin field)
+    const matches = (res.text.match(/_sc_entities_list/g) || []).length;
+    expect(matches).toBe(1);
+  });
+  it("redirects to /entities when admin home is set to entities list", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/pageedit/set_root_page")
+      .send("admin=_sc_entities_list")
+      .send("public=")
+      .send("user=")
+      .send("staff=")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/pageedit"));
+    await request(app)
+      .get("/")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/entities"));
+    // Reset admin home
+    await request(app)
+      .post("/pageedit/set_root_page")
+      .send("admin=")
+      .send("public=")
+      .send("user=")
+      .send("staff=")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/pageedit"));
+  });
   it("should delete page", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();

package/wrapper.js

@@ -103,7 +103,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
         locale ? `, _sc_locale = "${locale}"` : ""
       }, _sc_lightmode = ${JSON.stringify(
         state.getLightDarkMode?.(req.user) || "light"
-      )}, _sc_pageloadtag = Math.floor(Math.random() * 16777215).toString(16);</script>`,
+      )}, _sc_pageloadtag = Math.floor(Math.random() * 16777215).toString(16)${req?.user?.role_id===1 ? `, _sc_is_admin = true`:""};</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },