@saltcorn/server 1.6.0-alpha.11 → 1.6.0-alpha.13

package/public/saltcorn.css

@@ -1005,4 +1005,54 @@ input[type="file"].file-has-existing {
   overflow: auto;
   display: flex;
   flex-direction: column-reverse;
-}
+}
+
+span.copy-to-clipboard {
+  position: relative;
+  cursor: pointer;
+}
+
+span.copy-to-clipboard::before {
+  content: "";
+  position: absolute;
+  right: 0;
+  top: 0;
+  height: 100%;
+  width: 2em;
+  background: linear-gradient(to right, transparent, #fff);
+  pointer-events: none;
+  opacity: 0;
+  transition: opacity 0.2s ease;
+}
+
+span.copy-to-clipboard:hover::before {
+  opacity: 1;
+}
+
+span.copy-to-clipboard::after {
+  content: "";
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 0.9em;
+  line-height: 1;
+  pointer-events: none;
+  opacity: 0;
+  transition: opacity 0.2s ease;
+}
+
+span.copy-to-clipboard:hover::after {
+  content: "📋";
+  opacity: 1;
+}
+
+span.copy-to-clipboard.copied::before {
+  opacity: 1;
+}
+
+span.copy-to-clipboard.copied::after {
+  content: "✔";
+  color: #2a9d5c;
+  opacity: 1;
+}

package/public/saltcorn.js

@@ -620,6 +620,7 @@ function saveAndContinue(e, k, event) {
     },
     data: form_data,
     success: function (res) {
+      $(`[toast-title="Save error"]`).removeClass("show");
       ajax_indicator(false);
       form.removeAttr("data-unsaved-changes");
       form.parent().find(".full-form-error").text("");
@@ -637,7 +638,11 @@ function saveAndContinue(e, k, event) {
       var ct = request.getResponseHeader("content-type") || "";
       if (checkNetworkError(request)) {
       } else if (ct.startsWith && ct.startsWith("application/json")) {
-        notifyAlert({ type: "danger", text: request.responseJSON.error });
+        notifyAlert({
+          type: "danger",
+          text: request.responseJSON.error,
+          toast_title: "Save error",
+        });
       } else {
         $("#page-inner-content").html(request.responseText);
         initialize_page();
@@ -1572,6 +1577,18 @@ function cfu_translate(that) {
   }
 }
 
+$(document).on("click", "span.copy-to-clipboard", function () {
+  var $el = $(this);
+  var text = $el.text().trim();
+
+  navigator.clipboard.writeText(text).then(function () {
+    $el.addClass("copied");
+    setTimeout(function () {
+      $el.removeClass("copied");
+    }, 1000);
+  });
+});
+
 function ensure_script_loaded(src, callback) {
   //https://stackoverflow.com/questions/26331600/load-js-script-only-when-it-has-not-been-loaded-already-and-then-only-once
   let scripts = Array.from(document.querySelectorAll("script")).map(
@@ -1679,14 +1696,14 @@ function ensure_css_loaded(src) {
         l = function (a, b) {
           d = setTimeout(function () {
             d = !1;
-            if (h || c) e.apply(a, b), c && (j = +new Date());
+            if (h || c) (e.apply(a, b), c && (j = +new Date()));
             i && g.apply(a, b);
           }, f);
         },
         k = function () {
           if (!d || a) {
             if (!d && !h && (!c || +new Date() - j > f))
-              e.apply(this, arguments), c && (j = +new Date());
+              (e.apply(this, arguments), c && (j = +new Date()));
             (a || !c) && clearTimeout(d);
             l(this, arguments);
           }

package/routes/actions.js

@@ -74,6 +74,7 @@ const {
   h2,
   h4,
   p,
+  style,
 } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
@@ -139,7 +140,7 @@ const workflowStrings = (req, trigger) => ({
   onlyIf: req.__("Only if"),
   loopBody: req.__("Loop body"),
   openRuns: req.__("Show runs »"),
-  configure: req.__(`%s configuration`, trigger.name),
+  configure: req.__(`Configure trigger %s`, trigger.name),
   copyStep: req.__("Copy"),
 });
 
@@ -359,6 +360,7 @@ const triggerForm = async (req, trigger) => {
         help: { topic: "Actions" },
         attributes: {
           calcOptions: ["when_trigger", action_options],
+          onChange: "$('select[name=action]').val(event.target.value)",
         },
         showIf: {
           when_trigger: Trigger.when_options.filter((t) => t !== "Never"),
@@ -373,6 +375,7 @@ const triggerForm = async (req, trigger) => {
         help: { topic: "Actions" },
         attributes: {
           options: actionsNotRequiringRow,
+          onChange: "$('select[name=action]').val(event.target.value)",
         },
         showIf: {
           when_trigger: "Never",
@@ -388,6 +391,7 @@ const triggerForm = async (req, trigger) => {
         help: { topic: "Actions" },
         attributes: {
           options: allActions,
+          onChange: "$('select[name=action]').val(event.target.value)",
         },
         showIf: {
           when_trigger: "Never",
@@ -400,6 +404,7 @@ const triggerForm = async (req, trigger) => {
         label: req.__("Description"),
         type: "String",
         fieldview: "textarea",
+        attributes: { rows: 2 },
         sublabel: req.__(
           "Description allows you to give more information about the action"
         ),
@@ -635,6 +640,7 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
     onChange: "saveAndContinue(this)",
     noSubmitButton: true,
     formStyle: "vert",
+    class: "compact-form-group",
     fields: [
       {
         name: "save_traces",
@@ -671,14 +677,28 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
     renderWorkflow(workflowData, db.connectObj.version_tag) +
     div(
       { class: "mt-3" },
-      a(
+      div(
         {
-          href: `/actions/runs/?trigger=${trigger.id}`,
-          class: "d-block mb-2",
+          class:
+            "d-flex justify-content-between align-items-center flex-wrap gap-2",
         },
-        req.__("Show runs »")
+        renderForm(trigCfgForm, req.csrfToken()),
+        a(
+          {
+            href: `/actions/runs/?trigger=${trigger.id}`,
+            class: "d-inline-block",
+          },
+          req.__("Show runs »")
+        )
       ),
-      renderForm(trigCfgForm, req.csrfToken())
+      style(/*css*/ `
+        .compact-form-group > .form-group {
+          margin-bottom: 0;
+        }
+        .compact-form-group form {
+          margin-bottom: 0;
+        }
+      `)
     )
   );
 };
@@ -997,19 +1017,6 @@ const getWorkflowStepForm = async (
 
   const form = new Form({
     action: addOnDoneRedirect(`/actions/stepedit/${trigger.id}`, req),
-    // submitLabel: step_id ? req.__("Done") : undefined,
-    // submitLabel: null,
-    // onSubmit: "press_store_button(this)",
-    // additionalButtons: step_id
-    //   ? [
-    //       {
-    //         label: req.__("Delete"),
-    //         class: "btn btn-outline-danger",
-    //         onclick: `ajax_post('/actions/delete-step/${+step_id}')`,
-    //         afterSave: true,
-    //       },
-    //     ]
-    //   : undefined,
     noSubmitButton: true,
     fields: [
       {
@@ -1217,10 +1224,14 @@ router.get(
         active_sub: "Triggers",
         sub2_page: "Configure",
         page_title: req.__(`%s configuration`, trigger.name),
+        requestFluidLayout: true,
         contents: {
           type: "card",
           titleAjaxIndicator: true,
-          title: req.__("Configure trigger %s", trigger.name),
+          title: req.__(
+            "Configure trigger %s",
+            span({ class: "copy-to-clipboard" }, trigger.name)
+          ),
           subtitle,
           contents: wfCfg,
         },
@@ -1237,7 +1248,10 @@ router.get(
         contents: {
           type: "card",
           titleAjaxIndicator: true,
-          title: req.__("Configure trigger %s", trigger.name),
+          title: req.__(
+            "Configure trigger %s",
+            span({ class: "copy-to-clipboard" }, trigger.name)
+          ),
           subtitle,
           contents: renderForm(form, req.csrfToken()),
         },
@@ -1271,7 +1285,10 @@ router.get(
         contents: {
           type: "card",
           titleAjaxIndicator: true,
-          title: req.__("Configure trigger %s", trigger.name),
+          title: req.__(
+            "Configure trigger %s",
+            span({ class: "copy-to-clipboard" }, trigger.name)
+          ),
           subtitle,
           contents: {
             widths: [8, 4],
@@ -1345,7 +1362,10 @@ router.get(
         contents: {
           type: "card",
           titleAjaxIndicator: true,
-          title: req.__("Configure trigger %s", trigger.name),
+          title: req.__(
+            "Configure trigger %s",
+            span({ class: "copy-to-clipboard" }, trigger.name)
+          ),
           subtitle,
           contents: renderForm(form, req.csrfToken()),
         },
@@ -1639,6 +1659,8 @@ router.get(
       before_step,
       after_step_for
     );
+    if (+req.query.vw < 1000 && req.query.render === "dialog")
+      form.formStyle = "vert";
 
     if (initial_step) form.values.wf_initial_step = true;
     if (!step_id) {

package/routes/admin.js

@@ -2034,6 +2034,7 @@ router.post(
     if (err) req.flash("error", err);
     else req.flash("success", req.__("Successfully restored backup"));
     await getState().refresh_plugins();
+    Trigger.emitEvent("Startup");
     fs.unlink(newPath, function () {});
     res.redirect(`/admin`);
   })

package/routes/entities.js

@@ -1219,7 +1219,6 @@ router.get(
               : "",
           "data-module-kind": entity.metadata?.type || "",
           "data-searchable": searchableValues.join(" "),
-          "data-deep-searchable": deepSearchable || searchableValues.join(" "),
           "data-tags": tagIds.join(" "),
           "data-min-role-read":
             typeof minRoleRead !== "undefined" ? String(minRoleRead) : "",

package/routes/fields.js

@@ -99,6 +99,10 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
             return req.__("Column %s already exists", s);
           if (Field.labelToName(s) === "row")
             return req.__("Not a valid field name");
+          if (s.length > 63)
+            return req.__(
+              "Field names are limited to 63 characters"
+            );
           try {
             new Function(Field.labelToName(s), "return;");
           } catch {

package/routes/homepage.js

@@ -524,7 +524,10 @@ const welcome_page = async (req) => {
 const no_views_logged_in = async (req, res) => {
   const role = req.user && req.user.id ? req.user.role_id : 100;
   if (role > 1 || req.user.tenant !== db.getTenantSchema())
-    res.sendWrap(req.__("Hello"), req.__("Welcome to Saltcorn!"));
+    res.sendWrap(
+      req.__("Hello"),
+      req.__("Welcome to %s!", getState().getConfig("site_name", "Saltcorn"))
+    );
   else {
     const airgap = getState().getConfig("airgap", false);
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
@@ -638,6 +641,10 @@ const get_config_response = async (role_id, res, req) => {
   let homeCfg = modernCfg && modernCfg[role_id];
   if (typeof homeCfg !== "string")
     homeCfg = getState().getConfig(legacy_role + "_home");
+  if (homeCfg === "_sc_entities_list") {
+    res.redirect("/entities");
+    return true;
+  }
   if (homeCfg) {
     const db_page = Page.findOne({ name: homeCfg });
     if (db_page) {

package/routes/pageedit.js

@@ -272,6 +272,7 @@ const pageBuilderData = async (req, context) => {
     pages,
     page_groups,
     actions: actionsNotRequiringRow,
+    has_copilot_generate: !!getState().functions.copilot_generate_layout,
     builtInActions: ["GoBack"],
     triggerActions,
     library,
@@ -316,12 +317,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,7 +445,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>',
+      right:
+        '<div id="builder-header-actions" class="d-flex align-items-center gap-2"></div>',
     },
     {
       type: noCard ? "container" : "card",

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

@@ -635,7 +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>',
+        right:
+          '<div id="builder-header-actions" class="d-flex align-items-center gap-2"></div>',
       },
       {
         type: noCard ? "container" : "card",
@@ -1012,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");

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();