@objectstack/plugin-approvals 17.0.0-rc.0 → 17.0.0-rc.1

package/dist/index.mjs

@@ -245,6 +245,14 @@ var init_en_objects_generated = __esm({
           comment: {
             label: "Comment"
           },
+          reassign_from: {
+            label: "Reassigned From",
+            help: "User whose pending-approver slot was handed over (reassign actions only)"
+          },
+          reassign_to: {
+            label: "Reassigned To",
+            help: "User who received the pending-approver slot (reassign actions only)"
+          },
           attachments: {
             label: "Attachments",
             help: "Files supporting this action \u2014 e.g. a signed contract or evidence (#3266)."
@@ -554,6 +562,14 @@ var init_zh_CN_objects_generated = __esm({
           comment: {
             label: "\u8BC4\u8BBA"
           },
+          reassign_from: {
+            label: "\u8F6C\u51FA\u4EBA",
+            help: "\u88AB\u79FB\u4EA4\u5F85\u5BA1\u6279\u69FD\u4F4D\u7684\u7528\u6237\uFF08\u4EC5\u8F6C\u7B7E\u64CD\u4F5C\uFF09"
+          },
+          reassign_to: {
+            label: "\u8F6C\u5165\u4EBA",
+            help: "\u63A5\u6536\u5F85\u5BA1\u6279\u69FD\u4F4D\u7684\u7528\u6237\uFF08\u4EC5\u8F6C\u7B7E\u64CD\u4F5C\uFF09"
+          },
           attachments: {
             label: "\u9644\u4EF6",
             help: "\u652F\u6301\u8BE5\u64CD\u4F5C\u7684\u6587\u4EF6\u2014\u2014\u4F8B\u5982\u5DF2\u7B7E\u7F72\u7684\u5408\u540C\u6216\u8BC1\u660E\u6750\u6599\uFF08#3266\uFF09\u3002"
@@ -863,6 +879,14 @@ var init_ja_JP_objects_generated = __esm({
           comment: {
             label: "\u30B3\u30E1\u30F3\u30C8"
           },
+          reassign_from: {
+            label: "\u5F15\u304D\u7D99\u304E\u5143",
+            help: "\u627F\u8A8D\u5F85\u3061\u30B9\u30ED\u30C3\u30C8\u3092\u5F15\u304D\u6E21\u3057\u305F\u30E6\u30FC\u30B6\u30FC\uFF08\u5F15\u304D\u7D99\u304E\u64CD\u4F5C\u306E\u307F\uFF09"
+          },
+          reassign_to: {
+            label: "\u5F15\u304D\u7D99\u304E\u5148",
+            help: "\u627F\u8A8D\u5F85\u3061\u30B9\u30ED\u30C3\u30C8\u3092\u53D7\u3051\u53D6\u3063\u305F\u30E6\u30FC\u30B6\u30FC\uFF08\u5F15\u304D\u7D99\u304E\u64CD\u4F5C\u306E\u307F\uFF09"
+          },
           attachments: {
             label: "\u6DFB\u4ED8\u30D5\u30A1\u30A4\u30EB",
             help: "\u3053\u306E\u64CD\u4F5C\u3092\u88CF\u4ED8\u3051\u308B\u30D5\u30A1\u30A4\u30EB\u2014\u2014\u7F72\u540D\u6E08\u307F\u5951\u7D04\u66F8\u3084\u8A3C\u6191\u306A\u3069\uFF08#3266\uFF09\u3002"
@@ -1172,6 +1196,14 @@ var init_es_ES_objects_generated = __esm({
           comment: {
             label: "Comentario"
           },
+          reassign_from: {
+            label: "Reasignado de",
+            help: "Usuario cuyo turno de aprobaci\xF3n pendiente fue traspasado (solo acciones de reasignaci\xF3n)"
+          },
+          reassign_to: {
+            label: "Reasignado a",
+            help: "Usuario que recibi\xF3 el turno de aprobaci\xF3n pendiente (solo acciones de reasignaci\xF3n)"
+          },
           attachments: {
             label: "Adjuntos",
             help: "Archivos que respaldan esta acci\xF3n, p. ej. un contrato firmado o pruebas (#3266)."
@@ -1273,6 +1305,7 @@ var init_translations = __esm({
 
 // src/sys-approval-request.object.ts
 import { ObjectSchema, Field } from "@objectstack/spec/data";
+import { APPROVAL_STATUSES } from "@objectstack/spec/contracts";
 var SysApprovalRequest = ObjectSchema.create({
   name: "sys_approval_request",
   label: "Approval Request",
@@ -1371,9 +1404,10 @@ var SysApprovalRequest = ObjectSchema.create({
       group: "Target"
     }),
     status: Field.select(
-      // Keep in sync with `ApprovalStatus` (spec/contracts). `returned` =
-      // sent back for revision (ADR-0044) — terminal for this round.
-      ["pending", "approved", "rejected", "recalled", "returned"],
+      // Spread from the contract, not re-typed (#3786). `APPROVAL_STATUSES` is
+      // where the list and the reason for each entry live; `ApprovalStatus` is
+      // derived from it, so this column and the contract cannot disagree.
+      [...APPROVAL_STATUSES],
       {
         label: "Status",
         required: true,
@@ -1642,6 +1676,7 @@ var SysApprovalRequest = ObjectSchema.create({
 
 // src/sys-approval-action.object.ts
 import { ObjectSchema as ObjectSchema2, Field as Field2 } from "@objectstack/spec/data";
+import { APPROVAL_ACTION_KINDS } from "@objectstack/spec/contracts";
 var SysApprovalAction = ObjectSchema2.create({
   name: "sys_approval_action",
   label: "Approval Action",
@@ -1720,12 +1755,11 @@ var SysApprovalAction = ObjectSchema2.create({
       group: "Target"
     }),
     action: Field2.select(
-      // Keep in sync with `ApprovalActionKind` (spec/contracts). reassign /
-      // remind / request_info / comment are thread interactions — they never
-      // move the flow. revise / resubmit (ADR-0044) DO move it: send back for
-      // revision and the later resubmission. ooo_substitute (#1322 M1) is a
-      // system-recorded reroute of an out-of-office approver — no flow movement.
-      ["submit", "approve", "reject", "recall", "escalate", "reassign", "remind", "request_info", "comment", "revise", "resubmit", "ooo_substitute"],
+      // Spread from the contract, not re-typed (#3786). `APPROVAL_ACTION_KINDS`
+      // is where the list and the per-kind notes live (which kinds move the flow
+      // and which are thread-only); `ApprovalActionKind` is derived from it, so
+      // this column and the contract cannot disagree.
+      [...APPROVAL_ACTION_KINDS],
       {
         label: "Action",
         required: true,
@@ -1738,6 +1772,23 @@ var SysApprovalAction = ObjectSchema2.create({
       group: "Action"
     }),
     comment: Field2.textarea({ label: "Comment", required: false, group: "Action" }),
+    // Structured hand-off parties for `action: 'reassign'` (#4365). Before
+    // these existed the pair lived only inside a default free-text comment
+    // ("<from_id> → <to_id>"), which no client could parse or render readably.
+    // `comment` is pure user input again; timelines render "from A to B" from
+    // these fields.
+    reassign_from: Field2.lookup("sys_user", {
+      label: "Reassigned From",
+      required: false,
+      group: "Action",
+      description: "User whose pending-approver slot was handed over (reassign actions only)"
+    }),
+    reassign_to: Field2.lookup("sys_user", {
+      label: "Reassigned To",
+      required: false,
+      group: "Action",
+      description: "User who received the pending-approver slot (reassign actions only)"
+    }),
     attachments: Field2.file({
       label: "Attachments",
       required: false,
@@ -1929,6 +1980,7 @@ import {
   normalizeDecisionOutputs
 } from "@objectstack/spec/automation";
 import { ExpressionEngine, collectCelRootIdentifiers } from "@objectstack/formula";
+import { keysetWalk } from "@objectstack/types";
 import {
   ADMIN_FULL_ACCESS,
   ORGANIZATION_ADMIN_GRANTS,
@@ -1949,7 +2001,7 @@ function fail(message) {
 async function findOrg(engine, where) {
   try {
     const rows = await engine.find("sys_organization", {
-      filter: where,
+      where,
       fields: ["id", "slug", "parent_organization_id"],
       limit: 1,
       context: SYSTEM_CTX
@@ -2036,7 +2088,7 @@ async function filterApproversWhoCanRead(deps, userIds, requestOrgId, context) {
   let members = [];
   try {
     members = await deps.engine.find("sys_member", {
-      filter: { organization_id: requestOrg, user_id: { $in: userIds } },
+      where: { organization_id: requestOrg, user_id: { $in: userIds } },
       fields: ["user_id"],
       limit: 1e4,
       context: SYSTEM_CTX
@@ -2106,6 +2158,12 @@ function csvSplit(raw) {
   if (Array.isArray(raw)) return raw.map(String).filter(Boolean);
   return String(raw).split(",").map((s) => s.trim()).filter(Boolean);
 }
+function isBlankDecisionOutput(value) {
+  if (value === void 0 || value === null) return true;
+  if (typeof value === "string") return value.trim() === "";
+  if (Array.isArray(value)) return value.filter((v) => v !== null && v !== void 0 && String(v).trim() !== "").length === 0;
+  return false;
+}
 function prettifyMachineName(raw) {
   if (!raw) return void 0;
   const base = String(raw).replace(/^flow:/, "").trim();
@@ -2198,6 +2256,9 @@ function rowFromAction(row) {
     action: row.action,
     actor_id: row.actor_id ?? void 0,
     comment: row.comment ?? void 0,
+    // Structured reassign hand-off parties (#4365).
+    reassign_from: row.reassign_from ?? void 0,
+    reassign_to: row.reassign_to ?? void 0,
     // Decision attachments (#3266): rich descriptors carrying the display name +
     // download URL, so consumers label/open them without reading `sys_file`.
     attachments: attachments.length ? attachments : void 0,
@@ -2337,9 +2398,10 @@ var _ApprovalService = class _ApprovalService {
    * (having also put them on the context). Those are the only two callers that
    * hold a trustworthy actor with no session behind them.
    *
-   * A caller with NO identity at all cannot act. That case is reachable: the
-   * REST anonymous-deny only fires when `api.requireAuth` is set, so without it
-   * an anonymous request previously decided approvals outright by naming one.
+   * A caller with NO identity at all cannot act. Belt-and-suspenders: the REST
+   * anonymous-deny now denies every anonymous request (#3963), but this service
+   * must not rely on a caller upstream — an anonymous actor could otherwise
+   * decide approvals outright by naming one.
    */
   async resolveActor(actorId, context) {
     if (context?.isSystem) {
@@ -2625,7 +2687,7 @@ var _ApprovalService = class _ApprovalService {
     let rows = [];
     try {
       rows = await this.engine.find("sys_team_member", {
-        filter: { team_id: teamId },
+        where: { team_id: teamId },
         fields: ["user_id"],
         limit: 1e4,
         context: SYSTEM_CTX2
@@ -2664,7 +2726,7 @@ var _ApprovalService = class _ApprovalService {
     if (!businessUnitId) return [];
     try {
       const seed = await this.engine.find("sys_business_unit", {
-        filter: this.businessUnitOrgScope({ id: businessUnitId }, organizationId),
+        where: this.businessUnitOrgScope({ id: businessUnitId }, organizationId),
         fields: ["id", "active"],
         limit: 1,
         context: SYSTEM_CTX2
@@ -2699,7 +2761,7 @@ var _ApprovalService = class _ApprovalService {
     let rows = [];
     try {
       rows = await this.engine.find("sys_business_unit_member", {
-        filter: { business_unit_id: { $in: Array.from(seen) } },
+        where: { business_unit_id: { $in: Array.from(seen) } },
         fields: ["user_id"],
         limit: 1e4,
         context: SYSTEM_CTX2
@@ -2759,7 +2821,7 @@ var _ApprovalService = class _ApprovalService {
   async lookupManager(userId) {
     try {
       const rows = await this.engine.find("sys_user", {
-        filter: { id: userId },
+        where: { id: userId },
         fields: ["id", "manager_id"],
         limit: 1,
         context: SYSTEM_CTX2
@@ -2809,7 +2871,7 @@ var _ApprovalService = class _ApprovalService {
     let rows = [];
     try {
       rows = await this.engine.find("sys_approval_delegation", {
-        filter: { delegator_id: delegatorId },
+        where: { delegator_id: delegatorId },
         fields: ["id", "delegator_id", "delegate_id", "valid_from", "valid_until", "reason", "organization_id"],
         limit: 50,
         context: SYSTEM_CTX2
@@ -3135,8 +3197,9 @@ var _ApprovalService = class _ApprovalService {
     const now = this.clock.now().toISOString();
     const outputKeys = input.outputs ? Object.keys(input.outputs) : [];
     let acceptedOutputs;
+    const declaredDefs = normalizeDecisionOutputs(config.decisionOutputs);
     if (outputKeys.length) {
-      const declared = normalizeDecisionOutputs(config.decisionOutputs).map((d) => d.key);
+      const declared = declaredDefs.map((d) => d.key);
       if (!declared.length) {
         throw new Error(
           `VALIDATION_FAILED: this approval node declares no decisionOutputs \u2014 outputs are not accepted. Declare the keys on the node config (decisionOutputs: [${outputKeys.map((k) => `'${k}'`).join(", ")}]) to let approvers hand them to the flow.`
@@ -3156,6 +3219,14 @@ var _ApprovalService = class _ApprovalService {
       }
       acceptedOutputs = { ...input.outputs };
     }
+    if (input.decision === "approve") {
+      const missing = declaredDefs.filter((d) => d.required === true && isBlankDecisionOutput(input.outputs?.[d.key])).map((d) => d.key);
+      if (missing.length) {
+        throw new Error(
+          `VALIDATION_FAILED: decision output(s) \`${missing.join("`, `")}\` are required to approve this request \u2014 open the approval and fill them in before approving.`
+        );
+      }
+    }
     await this.engine.insert("sys_approval_action", {
       id: uid("aact"),
       request_id: requestId,
@@ -3690,8 +3761,13 @@ var _ApprovalService = class _ApprovalService {
       step_name: raw.flow_node_id ?? raw.current_step ?? null,
       step_index: 0,
       action: "reassign",
+      // The hand-off parties are STRUCTURED fields (#4365) — the old default
+      // comment (`"<from> → <to>"`) baked raw user ids into user-facing text.
+      // `comment` is pure user input: absent unless the actor wrote one.
       actor_id: actorId,
-      comment: input.comment ?? `${from} \u2192 ${to}`,
+      reassign_from: from,
+      reassign_to: to,
+      comment: input.comment ?? null,
       created_at: now
     }, { context: SYSTEM_CTX2 });
     let configPatch = {};
@@ -4499,35 +4575,28 @@ var _ApprovalService = class _ApprovalService {
   async rebuildApproverIndex() {
     const desired = /* @__PURE__ */ new Map();
     const PAGE = 500;
-    for (let offset = 0; ; offset += PAGE) {
-      const batch = await this.engine.find("sys_approval_request", {
-        where: { status: "pending" },
+    const requests = keysetWalk(
+      (q) => this.engine.find("sys_approval_request", {
+        ...q,
         fields: ["id", "pending_approvers", "organization_id"],
-        limit: PAGE,
-        offset,
         context: SYSTEM_CTX2
-      });
-      const rows = Array.isArray(batch) ? batch : [];
+      }),
+      { where: { status: "pending" }, pageSize: PAGE }
+    );
+    for await (const rows of requests.pages()) {
       for (const r of rows) {
         desired.set(String(r.id), {
           approvers: new Set(csvSplit(r.pending_approvers)),
           org: r.organization_id ?? null
         });
       }
-      if (rows.length < PAGE) break;
     }
     const indexRows = [];
-    for (let offset = 0; ; offset += PAGE) {
-      const batch = await this.engine.find("sys_approval_approver", {
-        orderBy: [{ field: "created_at", order: "asc" }],
-        limit: PAGE,
-        offset,
-        context: SYSTEM_CTX2
-      });
-      const rows = Array.isArray(batch) ? batch : [];
-      indexRows.push(...rows);
-      if (rows.length < PAGE) break;
-    }
+    const index = keysetWalk(
+      (q) => this.engine.find("sys_approval_approver", { ...q, context: SYSTEM_CTX2 }),
+      { pageSize: PAGE }
+    );
+    for await (const rows of index.pages()) indexRows.push(...rows);
     let inserted = 0;
     let deleted = 0;
     const seen = /* @__PURE__ */ new Map();
@@ -4911,11 +4980,15 @@ var _ApprovalService = class _ApprovalService {
     });
     const actions = Array.isArray(rows) ? rows.map(rowFromAction) : [];
     const names = await this.resolveUserNames(
-      actions.map((a) => a.actor_id).filter((id) => id && !id.includes(":"))
+      actions.flatMap((a) => [a.actor_id, a.reassign_from, a.reassign_to]).filter((id) => id && !id.includes(":"))
     );
     for (const a of actions) {
       const n = a.actor_id ? names.get(String(a.actor_id)) : void 0;
       if (n) a.actor_name = n;
+      const fromName = a.reassign_from ? names.get(String(a.reassign_from)) : void 0;
+      if (fromName) a.reassign_from_name = fromName;
+      const toName = a.reassign_to ? names.get(String(a.reassign_to)) : void 0;
+      if (toName) a.reassign_to_name = toName;
     }
     return actions;
   }