@saltcorn/server 1.6.0-beta.4 → 1.6.0-beta.6

package/routes/actions.js

@@ -75,6 +75,8 @@ const {
   h4,
   p,
   style,
+  h5,
+  textarea,
 } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
@@ -439,9 +441,14 @@ const triggerForm = async (req, trigger) => {
         label: req.__("Only if"),
         type: "String",
         class: "validate-expression",
-        sublabel: req.__(
-          "Optional JavaScript expression to determine if the trigger should run."
-        ),
+        sublabel:
+          req.__(
+            "Optional JavaScript expression to determine if the trigger should run."
+          ) +
+          " " +
+          req.__(
+            "On updates, use <code>row.old_row</code> to access values before the update."
+          ),
         parent_field: "configuration",
         showIf: {
           when_trigger: [...table_triggers, ...additional_triggers_with_onlyif],
@@ -1352,6 +1359,146 @@ router.get(
       });
       // populate form values
       form.values = trigger.configuration;
+
+      const hasCopilot =
+        trigger.action === "run_js_code" &&
+        !!getState().functions.copilot_generate_javascript;
+
+      if (hasCopilot) {
+        form.additionalButtons = [
+          {
+            label: req.__("Edit with AI"),
+            onclick: "showJsCopilotModal(this)",
+            class: "btn btn-secondary",
+          },
+        ];
+      }
+
+      const copilotModal = hasCopilot
+        ? div(
+            {
+              class: "modal fade",
+              id: "jsCopilotModal",
+              tabindex: "-1",
+            },
+            div(
+              { class: "modal-dialog" },
+              div(
+                { class: "modal-content" },
+                div(
+                  { class: "modal-header" },
+                  h5({ class: "modal-title" }, req.__("Edit with AI")),
+                  button({
+                    type: "button",
+                    class: "btn-close",
+                    "data-bs-dismiss": "modal",
+                  })
+                ),
+                div(
+                  { class: "modal-body" },
+                  p(
+                    { class: "text-muted small" },
+                    req.__(
+                      "Describe what the code should do. The existing code will be used as context."
+                    )
+                  ),
+                  textarea({
+                    id: "jsCopilotPrompt",
+                    class: "form-control",
+                    rows: 3,
+                    placeholder: req.__("Enter your prompt..."),
+                  }),
+                  div({
+                    id: "jsCopilotError",
+                    class: "alert alert-danger mt-2 mb-0 d-none",
+                  })
+                ),
+                div(
+                  { class: "modal-footer" },
+                  button(
+                    { class: "btn btn-secondary", "data-bs-dismiss": "modal" },
+                    req.__("Cancel")
+                  ),
+                  button(
+                    {
+                      id: "jsCopilotGenBtn",
+                      class: "btn btn-primary",
+                      onclick: "runJsCopilot()",
+                      disabled: true,
+                    },
+                    req.__("Generate")
+                  )
+                )
+              )
+            )
+          ) +
+          script(`
+function showJsCopilotModal() {
+  var modal = new bootstrap.Modal(document.getElementById("jsCopilotModal"));
+  modal.show();
+}
+document.addEventListener("DOMContentLoaded", function () {
+  var ta = document.getElementById("jsCopilotPrompt");
+  var btn = document.getElementById("jsCopilotGenBtn");
+  if (ta && btn) {
+    ta.addEventListener("input", function () {
+      btn.disabled = !ta.value.trim();
+    });
+  }
+});
+function runJsCopilot() {
+  var ta = document.getElementById("jsCopilotPrompt");
+  var prompt = ta.value.trim();
+  if (!prompt) return;
+  var btn = document.getElementById("jsCopilotGenBtn");
+  var errDiv = document.getElementById("jsCopilotError");
+  btn.disabled = true;
+  btn.textContent = ${JSON.stringify(req.__("Generating..."))};
+  errDiv.classList.add("d-none");
+  fetch("/actions/gen-js-copilot/${id}", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "X-Requested-With": "XMLHttpRequest",
+      "CSRF-Token": _sc_globalCsrf,
+    },
+    body: JSON.stringify({ description: prompt }),
+  })
+    .then(function (r) {
+      return r.json();
+    })
+    .then(function (data) {
+      btn.textContent = ${JSON.stringify(req.__("Generate"))};
+      if (data.error) {
+        btn.disabled = !ta.value.trim();
+        errDiv.textContent = data.error;
+        errDiv.classList.remove("d-none");
+        return;
+      }
+      ta.value = "";
+      btn.disabled = true;
+      var editorDiv = document.querySelector('textarea[name="code"]');
+      if (editorDiv) {
+        var monacoDiv = editorDiv.nextElementSibling;
+        if (monacoDiv) {
+          var ed = $(monacoDiv).data("monaco-editor");
+          if (ed) ed.setValue(data.code);
+        }
+      }
+      bootstrap.Modal.getInstance(
+        document.getElementById("jsCopilotModal")
+      ).hide();
+    })
+    .catch(function (err) {
+      btn.disabled = !ta.value.trim();
+      btn.textContent = ${JSON.stringify(req.__("Generate"))};
+      errDiv.textContent = err.message || "Request failed";
+      errDiv.classList.remove("d-none");
+    });
+}
+          `)
+        : "";
+
       // send events page
       send_events_page({
         res,
@@ -1367,7 +1514,7 @@ router.get(
             span({ class: "copy-to-clipboard" }, trigger.name)
           ),
           subtitle,
-          contents: renderForm(form, req.csrfToken()),
+          contents: copilotModal + renderForm(form, req.csrfToken()),
         },
       });
     }
@@ -1935,6 +2082,45 @@ router.post(
   })
 );
 
+router.post(
+  "/gen-js-copilot/:id",
+  isAdminOrHasConfigMinRole("min_role_edit_triggers"),
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const trigger = await Trigger.findOne({ id });
+    if (!trigger) {
+      req.flash("warning", req.__("Action not found"));
+      res.redirect(`/actions/`);
+      return;
+    }
+    const description = (req.body || {}).description;
+    // await Trigger.update(trigger.id, { description });
+    const table = trigger.table_id
+      ? Table.findOne({ id: trigger.table_id })
+      : null;
+    const existing_code = trigger.configuration?.code || "";
+    const generated =
+      await getState().functions.copilot_generate_javascript.run(
+        description,
+        existing_code,
+        table?.name || null
+      );
+    await Trigger.update(trigger.id, {
+      configuration: { ...trigger.configuration, code: generated },
+    });
+    await getState().refresh_triggers();
+    Trigger.emitEvent("AppChange", `Trigger ${trigger.name}`, req.user, {
+      entity_type: "Trigger",
+      entity_name: trigger.name,
+    });
+    if (req.xhr) {
+      res.json({ code: generated });
+    } else {
+      res.redirect(`/actions/configure/${trigger.id}`);
+    }
+  })
+);
+
 router.post(
   "/gen-copilot/:trigger_id",
   isAdminOrHasConfigMinRole("min_role_edit_triggers"),
@@ -2207,9 +2393,9 @@ router.get(
   error_catcher(async (req, res) => {
     const { id } = req.params;
 
-    const run = await WorkflowRun.findOne({ id });
+    const run = await WorkflowRun.findOne({ id: +id });
 
-    if (!run.user_allowed_to_fill_form(req.user)) {
+    if (!run || !run.user_allowed_to_fill_form(req.user)) {
       if (req.xhr) res.json({ error: "Not authorized" });
       else {
         req.flash("danger", req.__("Not authorized"));
@@ -2249,7 +2435,8 @@ const workflowRunPromiseHandler = (promise, run, req) => {
         ...retDirs,
         page_load_tag: req.headers["page-load-tag"],
       };
-      getState().emitDynamicUpdate(db.getTenantSchema(), emitData);
+      const userIds = req.user ? undefined : null;
+      getState().emitDynamicUpdate(db.getTenantSchema(), emitData, userIds);
       if (
         !emitData.resume_workflow &&
         !emitData.popup?.startsWith?.("/actions/fill-workflow-form/")
@@ -2257,14 +2444,14 @@ const workflowRunPromiseHandler = (promise, run, req) => {
         getState().emitDynamicUpdate(db.getTenantSchema(), {
           eval_js: "reset_spinners()",
           page_load_tag: req.headers["page-load-tag"],
-        });
+        }, userIds);
     })
     .catch((e) => {
       console.error(e);
       getState().emitDynamicUpdate(db.getTenantSchema(), {
         error: e.message,
         page_load_tag: req.headers["page-load-tag"],
-      });
+      }, req.user ? undefined : null);
     });
 };
 
@@ -2274,7 +2461,7 @@ router.post(
     const { id } = req.params;
 
     const run = await WorkflowRun.findOne({ id });
-    if (!run.user_allowed_to_fill_form(req.user)) {
+    if (!run || !run.user_allowed_to_fill_form(req.user)) {
       if (req.xhr) res.json({ error: "Not authorized" });
       else {
         req.flash("danger", req.__("Not authorized"));
@@ -2332,9 +2519,9 @@ router.post(
   error_catcher(async (req, res) => {
     const { id } = req.params;
 
-    const run = await WorkflowRun.findOne({ id });
+    const run = await WorkflowRun.findOne({ id: +id });
     //TODO session if not logged in
-    if (run.started_by !== req.user?.id) {
+    if (!run || run.started_by !== req.user?.id) {
       if (req.xhr) res.json({ error: "Not authorized" });
       else {
         req.flash("danger", req.__("Not authorized"));

package/routes/admin.js

@@ -76,7 +76,6 @@ const {
   //get_other_domain_tenant,
   get_process_init_time,
 } = require("@saltcorn/data/db/state");
-const { loadAllPlugins } = require("../load_plugins");
 const {
   create_backup,
   restore,
@@ -88,7 +87,6 @@ const {
   runConfigurationCheck,
 } = require("@saltcorn/admin-models/models/config-check");
 const fs = require("fs");
-const load_plugins = require("../load_plugins");
 const {
   restore_backup,
   send_admin_page,
@@ -909,7 +907,12 @@ router.get(
   ]),
   error_catcher(async (req, res) => {
     const { type, name } = req.params;
-    const snaps = await Snapshot.entity_history(type, name);
+    const snapOffset = parseInt(req.query.snap_offset) || 0;
+    const { history: snaps, hasMore } = await Snapshot.entity_history(
+      type,
+      name,
+      snapOffset
+    );
     const locale = getState().getConfig("default_locale", "en");
     const auth = checkEditPermission(type + "s", req.user);
     if (!auth) {
@@ -917,6 +920,9 @@ router.get(
       return;
     }
     res.set("Page-Title", `Restore ${text(name)}`);
+    let olderUrl = `/admin/snapshot-restore/${type}/${encodeURIComponent(name)}?snap_offset=${snapOffset + 100}`;
+    if (req.query.on_done_redirect)
+      olderUrl += `&on_done_redirect=${encodeURIComponent(req.query.on_done_redirect)}`;
     res.send(
       mkTable(
         [
@@ -947,7 +953,10 @@ router.get(
           },
         ],
         snaps
-      )
+      ) +
+        (hasMore
+          ? `<div class="mt-2 text-center"><button class="btn btn-secondary btn-sm" onclick="ajax_modal('${olderUrl}')">${req.__("Load older snapshots")}</button></div>`
+          : "")
     );
   })
 );
@@ -1008,7 +1017,7 @@ router.post(
         const pack = JSON.parse(fs.readFileSync(req.files?.file?.tempFilePath));
         await db.withTransaction(async () => {
           await install_pack(pack, undefined, (p) =>
-            load_plugins.loadAndSaveNewPlugin(p)
+            Plugin.loadAndSaveNewPlugin(p)
           );
         });
         await getState().refresh();
@@ -1648,7 +1657,7 @@ router.post(
       if (process.send) getState().processSend("RestartServer");
       else process.exit(0);
     } else {
-      await restart_tenant(loadAllPlugins);
+      await restart_tenant(Plugin.loadAllPlugins);
       getState().processSend({
         restart_tenant: true,
         tenant: db.getTenantSchema(),
@@ -2029,9 +2038,7 @@ router.post(
   error_catcher(async (req, res) => {
     const newPath = File.get_new_path();
     await req.files.file.mv(newPath);
-    const err = await restore(newPath, (p) =>
-      load_plugins.loadAndSaveNewPlugin(p)
-    );
+    const err = await restore(newPath, (p) => Plugin.loadAndSaveNewPlugin(p));
     if (err) req.flash("error", err);
     else req.flash("success", req.__("Successfully restored backup"));
     await getState().refresh_plugins();
@@ -4550,6 +4557,54 @@ router.post(
   })
 );
 
+/**
+ * Validate synced tables: check that all tables reachable via FK from the
+ * selected synced tables are also included in the synced set.
+ */
+router.post(
+  "/build-mobile-app/validate-synced-tables",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { synchedTables } = req.body || {};
+    if (!Array.isArray(synchedTables) || synchedTables.length === 0) {
+      return res.json({ warnings: [] });
+    }
+
+    const syncedSet = new Set(synchedTables);
+    const visited = new Set();
+    const queue = [...synchedTables];
+    const missing = new Set();
+
+    while (queue.length > 0) {
+      const tblName = queue.shift();
+      if (visited.has(tblName)) continue;
+      visited.add(tblName);
+
+      const table = Table.findOne({ name: tblName });
+      if (!table) continue;
+
+      for (const field of table.getFields()) {
+        if (field.reftable_name && !field.calculated) {
+          const refName = field.reftable_name;
+          if (refName === "users") continue;
+          if (!syncedSet.has(refName)) {
+            missing.add(refName);
+          }
+          if (!visited.has(refName)) {
+            queue.push(refName);
+          }
+        }
+      }
+    }
+
+    const warnings = [...missing].map(
+      (tblName) =>
+        `Table "${tblName}" is referenced by a synced table but is not itself synced.`
+    );
+    res.json({ warnings });
+  })
+);
+
 /**
  * Do Build Mobile App
  */
@@ -5254,7 +5309,8 @@ router.get(
 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[])
+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)
 async function sleep(milliseconds: number)
 function interpolate(s: string,
   row: Row,
@@ -5365,7 +5421,7 @@ async function refreshSystemCache(entities?: "codepages" | "tables" | "views" |
             }
           });
         };
-        addTsFields(table, "", 2);
+        addTsFields(table, "", req.query.nojoins ? -1 : 2);
         ds.push(`declare const table: Table`);
         ds.push(`declare const row: {
          ${tsFields.join("\n")}
@@ -5633,7 +5689,8 @@ 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

@@ -278,7 +278,8 @@ router.post(
             folder ? File.normalise(folder) : undefined
           );
           const many = Array.isArray(f);
-          const formatLocation = (fl) => File.fieldValueFromRelative(fl.path_to_serve);
+          const formatLocation = (fl) =>
+            File.fieldValueFromRelative(fl.path_to_serve);
           const formatUrl = (loc, filename) =>
             File.pathToServeUrl(loc, { filename });
           jsonResp = {
@@ -288,9 +289,7 @@ router.post(
                 ? f.map((fl) => formatLocation(fl))
                 : formatLocation(f),
               url: many
-                ? f.map((fl) =>
-                    formatUrl(formatLocation(fl), fl.filename)
-                  )
+                ? f.map((fl) => formatUrl(formatLocation(fl), fl.filename))
                 : formatUrl(formatLocation(f), f.filename),
             },
           };
@@ -473,6 +472,7 @@ router.get(
               state: req_query,
               table,
               prefix: "a.",
+              user: req.user || user,
             });
             const joinFields = {};
             const derefs = Array.isArray(dereference)
@@ -554,6 +554,7 @@ router.get("/:tableName/count", async (req, res, next) => {
           state: req_query,
           table,
           prefix: "a.",
+          user: req.user || user
         });
         const count = await table.countRows(qstate);
         res.json({ success: count });

package/routes/delete.js

@@ -6,7 +6,7 @@
 
 const Router = require("express-promise-router");
 
-const { error_catcher, is_relative_url } = require("./utils.js");
+const { error_catcher, is_relative_url, safe_redirect } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 const { readState } = require("@saltcorn/data/plugin-helper");
 const {
@@ -86,10 +86,7 @@ router.post(
     }
     if (req.xhr) {
       res.json({ success, ...resultCollector });
-    } else
-      res.redirect(
-        (is_relative_url(redirect) && redirect) || `/list/${table.name}`
-      );
+    } else safe_redirect(res, redirect, `/list/${table.name}`);
   })
 );
 router.post(

package/routes/edit.js

@@ -6,7 +6,7 @@
 
 const Router = require("express-promise-router");
 
-const { error_catcher, is_relative_url } = require("./utils.js");
+const { error_catcher, is_relative_url, safe_redirect } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 
 /**
@@ -46,9 +46,6 @@ router.post(
 
     if (req.xhr) res.send("OK");
     else if (req.get("referer")) res.redirect(req.get("referer"));
-    else
-      res.redirect(
-        (is_relative_url(redirect) && redirect) || `/list/${table.name}`
-      );
+    else safe_redirect(res, redirect, `/list/${table.name}`);
   })
 );