@saltcorn/server 1.6.0-beta.10 → 1.6.0-beta.12

package/routes/actions.js

@@ -268,9 +268,13 @@ const triggerForm = async (req, trigger) => {
     .filter(([k, v]) => v.hasChannel)
     .map(([k, v]) => k);
   const actionExplainers = Trigger.action_explainers();
+  Trigger.find({}).forEach((tr) => {
+    if (tr.description && tr.name) actionExplainers[tr.name] = tr.description;
+  });
   const allActions = Trigger.action_options({
     notRequireRow: false,
     workflow: true,
+    allTriggers: true,
   });
   const table_triggers = ["Insert", "Update", "Delete", "Validate"];
   const additional_triggers_with_onlyif = ["Login", "PageLoad"];
@@ -278,6 +282,7 @@ const triggerForm = async (req, trigger) => {
   const actionsNotRequiringRow = Trigger.action_options({
     notRequireRow: true,
     workflow: true,
+    allTriggers: true,
   });
 
   Trigger.when_options.forEach((t) => {
@@ -1231,6 +1236,52 @@ router.get(
 
         req.__("Test run") + " »"
       );
+    // Check if trigger.action is a reference to another trigger by name
+    const refTrigger =
+      !action &&
+      trigger.action !== "Workflow" &&
+      trigger.action !== "Multi-step action"
+        ? Trigger.findOne({ name: trigger.action })
+        : null;
+
+    if (refTrigger) {
+      send_events_page({
+        res,
+        req,
+        active_sub: "Triggers",
+        sub2_page: "Configure",
+        page_title: req.__(`%s configuration`, trigger.name),
+        contents: {
+          type: "card",
+          title: req.__(
+            "Configure trigger %s",
+            span({ class: "copy-to-clipboard" }, trigger.name)
+          ),
+          subtitle,
+          contents:
+            p(
+              req.__(
+                "This trigger delegates to %s.",
+                a(
+                  { href: `/actions/configure/${refTrigger.id}` },
+                  refTrigger.name
+                )
+              )
+            ) +
+            p(
+              a(
+                {
+                  href: `/actions/configure/${refTrigger.id}`,
+                  class: "btn btn-primary",
+                },
+                req.__("Configure %s »", refTrigger.name)
+              )
+            ),
+        },
+      });
+      return;
+    }
+
     if (trigger.action === "Workflow") {
       const wfCfg = await getWorkflowConfig(req, id, table, trigger);
       send_events_page({

package/routes/admin.js

@@ -81,7 +81,10 @@ const {
   restore,
   auto_backup_now,
 } = require("@saltcorn/admin-models/models/backup");
-const { install_pack } = require("@saltcorn/admin-models/models/pack");
+const {
+  install_pack,
+  filter_pack,
+} = require("@saltcorn/admin-models/models/pack");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
 const {
   runConfigurationCheck,
@@ -700,35 +703,14 @@ router.get(
                 { href: "/admin/snapshot-list" },
                 req.__("List/download snapshots »")
               ),
-              form(
+              a(
                 {
-                  method: "post",
-                  action: "/admin/snapshot-restore-full",
-                  encType: "multipart/form-data",
+                  onclick: "ajax_modal('/admin/snapshot-restore-full')",
+                  class: "d-block",
+                  href: `javascript:void(0)`,
                 },
-                input({
-                  type: "hidden",
-                  name: "_csrf",
-                  value: req.csrfToken(),
-                }),
-                label(
-                  {
-                    class: "btn-link",
-                    for: "upload_to_snapshot",
-                    style: { cursor: "pointer" },
-                  },
-                  i({ class: "fas fa-upload me-2 mt-2" }),
-                  req.__("Restore a snapshot")
-                ),
-                input({
-                  id: "upload_to_snapshot",
-                  class: "d-none",
-                  name: "file",
-                  type: "file",
-                  accept: ".json,application/json",
-                  onchange:
-                    "notifyAlert('Restoring snapshot...', true);this.form.submit();",
-                })
+                i({ class: "fas fa-upload me-2 mt-2" }),
+                req.__("Restore a snapshot")
               )
             ),
           },
@@ -1003,6 +985,69 @@ router.post(
   })
 );
 
+router.get(
+  "/snapshot-restore-full",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const snapForm = new Form({
+      action: "/admin/snapshot-restore-full",
+      formStyle: "vert",
+      fields: [
+        {
+          name: "file",
+          label: req.__("Snapshot file"),
+          class: "form-control",
+          default: true,
+          type: "File",
+        },
+        {
+          name: "configuration",
+          label: req.__("Configuration"),
+          default: true,
+          type: "Bool",
+        },
+        {
+          name: "site_name",
+          label: req.__("Site name"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "base_url",
+          label: req.__("Base URL"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "email_settings",
+          label: req.__("Email settings"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "ssl_settings",
+          label: req.__("SSL settings"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "modules",
+          label: req.__("Modules"),
+          default: true,
+          type: "Bool",
+        },
+      ],
+    });
+    res.sendWrap(`Restore snapshot`, {
+      above: [renderForm(snapForm, req.csrfToken())],
+    });
+  })
+);
+
 /**
  * @name post/restore
  * @function
@@ -1016,6 +1061,7 @@ router.post(
     if (req.files?.file?.tempFilePath) {
       try {
         const pack = JSON.parse(fs.readFileSync(req.files?.file?.tempFilePath));
+        filter_pack(pack, req.body);
         await db.withTransaction(async () => {
           await install_pack(pack, undefined, (p) =>
             Plugin.loadAndSaveNewPlugin(p)
@@ -5311,7 +5357,7 @@ declare var console: Console;
 function setTimeout(f:Function, timeout?:number)
 declare const page_load_tag: string
 function emit_to_client(message: object, to_user_ids?: number | number[] | null)
-function emitEvent(eventType: ${Trigger.when_options.map(o=>`"${o}"`).join(" | ")}, channel?: string, payload?: any)
+function emitEvent(eventType: ${Trigger.when_options.map((o) => `"${o}"`).join(" | ")}, channel?: string, payload?: any)
 async function sleep(milliseconds: number)
 function interpolate(s: string,
   row: Row,
@@ -5690,8 +5736,11 @@ router.post(
       //ignore
     }
     try {
-      res.json({ success: true, code: stripTypes(`async () =>{${code}
-}`) });
+      res.json({
+        success: true,
+        code: stripTypes(`async () =>{${code}
+}`),
+      });
     } catch (error) {
       res.json({ success: false, error: error.message });
     }

package/routes/api.js

@@ -671,9 +671,7 @@ router.all(
               });
               delete resp.__wf_run_id;
             } else {
-              const action = getState().actions[trigger.action];
-              resp = await action.run({
-                configuration: trigger.configuration,
+              resp = await trigger.runWithoutRow({
                 body: req.body || {},
                 row,
                 req,

package/routes/homepage.js

@@ -26,7 +26,12 @@ const {
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
-const { get_base_url, sendHtmlFile, getEligiblePage } = require("./utils.js");
+const {
+  get_base_url,
+  sendHtmlFile,
+  sendHtmlStringWithGlobals,
+  getEligiblePage,
+} = require("./utils.js");
 const semver = require("semver");
 const { add_results_to_contents } = require("../markup/admin.js");
 
@@ -622,8 +627,7 @@ const get_config_response = async (role_id, res, req) => {
 
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else if (contents.html_string) {
-      res.set("Content-Type", "text/html");
-      await res.send(contents.html_string);
+      await sendHtmlStringWithGlobals(req, res, contents.html_string);
     } else
       res.sendWrap(
         {

package/routes/page.js

@@ -15,6 +15,7 @@ const {
   scan_for_page_title,
   isAdmin,
   sendHtmlFile,
+  sendHtmlStringWithGlobals,
   getEligiblePage,
   getRandomPage,
 } = require("../routes/utils.js");
@@ -74,25 +75,7 @@ const runPage = async (page, req, res, tic) => {
     }
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else if (contents.html_string) {
-      res.set("Content-Type", "text/html");
-      const state = getState();
-      const version_tag = db.connectObj.version_tag;
-      const locale = req.getLocale?.();
-      const scGlobals =
-        `<script>var _sc_globalCsrf = ${JSON.stringify(req.csrfToken())}` +
-        `, _sc_version_tag = ${JSON.stringify(version_tag)}` +
-        (locale ? `, _sc_locale = ${JSON.stringify(locale)}` : "") +
-        `, _sc_pageloadtag = Math.floor(Math.random() * 16777215).toString(16)` +
-        (req?.user?.role_id === 1 ? `, _sc_is_admin = true` : "") +
-        `;</script>`;
-      const normalized = contents.html_string.replace(
-        /\/static_assets\/[a-f0-9]+\//g,
-        `/static_assets/${version_tag}/`
-      );
-      const html = normalized.includes("</head>")
-        ? normalized.replace("</head>", `${scGlobals}</head>`)
-        : scGlobals + normalized;
-      await res.send(html);
+      await sendHtmlStringWithGlobals(req, res, contents.html_string);
     } else
       res.sendWrap(
         {
@@ -109,7 +92,11 @@ 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("/", ""))}&${objectToQueryString(req.query)}`,
+                url: `/pageedit/edit/${encodeURIComponent(
+                  page.name
+                )}?on_done_redirect=${encodeURIComponent(
+                  req.originalUrl.replace("/", "")
+                )}&${objectToQueryString(req.query)}`,
                 contents,
               }),
           resultCollector

package/routes/pageedit.js

@@ -71,6 +71,7 @@ const pagePropertiesForm = async (req, isNew) => {
     {
       mime_super: "text",
       mime_sub: "html",
+      ext: "html",
     },
     { recursive: true }
   );
@@ -230,6 +231,7 @@ const pageBuilderData = async (req, context) => {
     const table = Table.findOne(view.table_id || view.exttable_name);
     if (table) view.table_name = table.name;
     const fs = await view.get_state_fields();
+    let added_fields = new Set();
     for (const frec of fs) {
       const f = new Field(frec);
       if (f.input_type === "hidden") continue;
@@ -239,7 +241,9 @@ const pageBuilderData = async (req, context) => {
       if (f.type && f.type.name === "Bool") f.fieldview = "tristate";
 
       //await f.fill_fkey_options(true);
-      fixed_state_fields[view.name].push(f);
+      if (added_fields.has(f.name)) continue;
+      added_fields.add(f.name);
+      fixed_state_fields[view.name].push(f.toBuilder);
       if (table.name === "users" && f.primary_key)
         fixed_state_fields[view.name].push(
           new Field({
@@ -247,7 +251,7 @@ const pageBuilderData = async (req, context) => {
             label: req.__("Preset %s", f.label),
             type: "String",
             attributes: { options: ["LoggedIn"] },
-          })
+          }).toBuilder
         );
       if (f.presets) {
         fixed_state_fields[view.name].push(
@@ -256,7 +260,7 @@ const pageBuilderData = async (req, context) => {
             label: req.__("Preset %s", f.label),
             type: "String",
             attributes: { options: Object.keys(f.presets) },
-          })
+          }).toBuilder
         );
       }
     }

package/routes/utils.js

@@ -491,6 +491,72 @@ const admin_config_route = ({
   );
 };
 
+/**
+ * Send an HTML string response with injected Saltcorn globals (CSRF token,
+ * version tag, locale, page-load tag, admin flag) and normalised static-asset paths.
+ * @param {any} req
+ * @param {any} res
+ * @param {string} html_string
+ * @returns
+ */
+const sendHtmlStringWithGlobals = (req, res, html_string) => {
+  res.set("Content-Type", "text/html");
+  const state = getState();
+  const version_tag = db.connectObj.version_tag;
+  const locale = req.getLocale?.();
+  const scGlobals =
+    `<script>var _sc_globalCsrf = ${JSON.stringify(req.csrfToken())}` +
+    `, _sc_version_tag = ${JSON.stringify(version_tag)}` +
+    (locale ? `, _sc_locale = ${JSON.stringify(locale)}` : "") +
+    `, _sc_pageloadtag = Math.floor(Math.random() * 16777215).toString(16)` +
+    (req?.user?.role_id === 1 ? `, _sc_is_admin = true` : "") +
+    `;</script>`;
+  const normalized = html_string.replace(
+    /\/static_assets\/[a-f0-9]+\//g,
+    `/static_assets/${version_tag}/`
+  );
+  const assetBase = `/static_assets/${version_tag}`;
+
+  // CSS and scGlobals go into <head>; scripts go before </body> (after jQuery).
+  // Core scripts (dayjs, socket.io) come before plugin scripts from state.headers.
+  let headInject = scGlobals;
+  if (!normalized.includes("saltcorn.css"))
+    headInject += `<link rel="stylesheet" href="${assetBase}/saltcorn.css">`;
+  if (!normalized.includes("saltcorn.js"))
+    headInject += `<script src="${assetBase}/saltcorn.js"></script>`;
+
+  let bodyInject = "";
+  for (const fname of ["dayjs.min.js", "socket.io.min.js"]) {
+    if (!normalized.includes(fname))
+      bodyInject += `<script src="${assetBase}/${fname}"></script>`;
+  }
+  if (locale && !normalized.includes(`dayjslocales/${locale}.js`))
+    bodyInject += `<script src="${assetBase}/dayjslocales/${locale}.js"></script>`;
+  if (!normalized.includes("dynamic_updates_cfg")) {
+    const dynamic_updates_enabled = state.getConfig("enable_dynamic_updates", false);
+    bodyInject += `<script>var dynamic_updates_cfg = ${JSON.stringify({ enabled: dynamic_updates_enabled })};</script>`;
+  }
+
+  const stateHeaders = Array.isArray(state.headers)
+    ? state.headers
+    : Object.values(state.headers || {}).flat();
+  for (const h of stateHeaders) {
+    if (h.css && !normalized.includes(h.css))
+      headInject += `<link rel="stylesheet" href="${h.css}">`;
+    else if (h.script && !normalized.includes(h.script))
+      bodyInject += `<script src="${h.script}"></script>`;
+  }
+
+  let html = normalized.includes("</head>")
+    ? normalized.replace("</head>", `${headInject}</head>`)
+    : headInject + normalized;
+  if (bodyInject)
+    html = html.includes("</body>")
+      ? html.replace("</body>", `${bodyInject}</body>`)
+      : html + bodyInject;
+  return res.send(html);
+};
+
 /**
  * Send HTML file to client without any menu
  * @param {any} req
@@ -662,6 +728,7 @@ module.exports = {
   get_sys_info,
   admin_config_route,
   sendHtmlFile,
+  sendHtmlStringWithGlobals,
   setRole,
   getEligiblePage,
   getRandomPage,