@objectstack/plugin-approvals 9.0.1 → 9.2.0

package/dist/index.mjs

@@ -1443,10 +1443,67 @@ var ApprovalService = class _ApprovalService {
     return void 0;
   }
   /**
-   * Attach inbox display fields (`record_title`, `submitter_name`) to rows.
-   * Batched: one query per distinct target object plus one `sys_user` lookup.
-   * Best-effort — a deleted record falls back to the payload snapshot, and a
-   * lookup failure leaves the field unset rather than failing the list.
+   * Batch-resolve `sys_user` display names for identifiers that may be user
+   * ids or emails. Best-effort — failures leave entries unresolved.
+   */
+  async resolveUserNames(identifiers) {
+    const names = /* @__PURE__ */ new Map();
+    const targets = Array.from(new Set(identifiers.filter(Boolean)));
+    if (!targets.length) return names;
+    try {
+      const users = await this.engine.find("sys_user", {
+        where: { id: { $in: targets } },
+        fields: ["id", "name", "email"],
+        limit: targets.length,
+        context: SYSTEM_CTX
+      });
+      for (const u of users ?? []) {
+        if (u?.id && (u.name || u.email)) names.set(String(u.id), String(u.name ?? u.email));
+      }
+    } catch {
+    }
+    const unresolvedEmails = targets.filter((t) => !names.has(t) && t.includes("@"));
+    if (unresolvedEmails.length) {
+      try {
+        const users = await this.engine.find("sys_user", {
+          where: { email: { $in: unresolvedEmails } },
+          fields: ["email", "name"],
+          limit: unresolvedEmails.length,
+          context: SYSTEM_CTX
+        });
+        for (const u of users ?? []) {
+          if (u?.email && u.name) names.set(String(u.email), String(u.name));
+        }
+      } catch {
+      }
+    }
+    return names;
+  }
+  /** Lookup-typed fields (key + referenced object) of an object's schema. */
+  resolveLookupFields(object) {
+    try {
+      const schema = this.engine.getSchema?.(object);
+      const fields = schema?.fields ?? {};
+      const out = [];
+      for (const [key, f] of Object.entries(fields)) {
+        if ((f?.type === "lookup" || f?.type === "master_detail") && f?.reference) {
+          out.push({ key, reference: String(f.reference) });
+        }
+      }
+      return out;
+    } catch {
+      return [];
+    }
+  }
+  /**
+   * Attach inbox display fields to rows so clients never render a raw
+   * identifier: `record_title`, `submitter_name`, `object_label`,
+   * `pending_approver_names` (user-id approvers), and `payload_display`
+   * (lookup foreign keys in the snapshot → referenced record titles).
+   * Batched: one query per distinct object (target + referenced) plus one
+   * `sys_user` lookup. Best-effort — a deleted record falls back to the
+   * payload snapshot, and any failure leaves the field unset rather than
+   * failing the list.
    */
   async enrichRows(rows) {
     if (!rows.length) return;
@@ -1461,7 +1518,13 @@ var ApprovalService = class _ApprovalService {
       set.add(r.record_id);
     }
     const titles = /* @__PURE__ */ new Map();
+    const objectLabels = /* @__PURE__ */ new Map();
     for (const [object, idSet] of byObject) {
+      try {
+        const schema = this.engine.getSchema?.(object);
+        if (schema?.label) objectLabels.set(object, String(schema.label));
+      } catch {
+      }
       const ids = Array.from(idSet);
       const displayField = this.resolveDisplayField(object);
       try {
@@ -1472,47 +1535,81 @@ var ApprovalService = class _ApprovalService {
         });
         for (const rec of recs ?? []) {
           const title = _ApprovalService.pickTitle(rec, displayField);
-          if (rec?.id && title) titles.set(`${object}\0${rec.id}`, title);
+          if (rec?.id && title) titles.set(`${object} ${rec.id}`, title);
         }
       } catch {
       }
     }
-    const submitters = Array.from(new Set(rows.map((r) => r.submitter_id).filter(Boolean)));
-    const names = /* @__PURE__ */ new Map();
-    if (submitters.length) {
+    const lookupFieldsByObject = /* @__PURE__ */ new Map();
+    for (const object of byObject.keys()) {
+      const lookups = this.resolveLookupFields(object);
+      if (lookups.length) lookupFieldsByObject.set(object, lookups);
+    }
+    const refIds = /* @__PURE__ */ new Map();
+    for (const r of rows) {
+      const lookups = lookupFieldsByObject.get(r.object_name);
+      const payload = r.payload;
+      if (!lookups || !payload || typeof payload !== "object") continue;
+      for (const { key, reference } of lookups) {
+        const v = payload[key];
+        if (v == null || typeof v === "object" || !String(v).trim()) continue;
+        let set = refIds.get(reference);
+        if (!set) {
+          set = /* @__PURE__ */ new Set();
+          refIds.set(reference, set);
+        }
+        set.add(String(v));
+      }
+    }
+    const refTitles = /* @__PURE__ */ new Map();
+    for (const [object, idSet] of refIds) {
+      const ids = Array.from(idSet);
+      const displayField = this.resolveDisplayField(object);
       try {
-        const users = await this.engine.find("sys_user", {
-          where: { id: { $in: submitters } },
-          fields: ["id", "name", "email"],
-          limit: submitters.length,
+        const recs = await this.engine.find(object, {
+          where: { id: { $in: ids } },
+          limit: ids.length,
           context: SYSTEM_CTX
         });
-        for (const u of users ?? []) {
-          if (u?.id && (u.name || u.email)) names.set(String(u.id), String(u.name ?? u.email));
+        for (const rec of recs ?? []) {
+          const title = _ApprovalService.pickTitle(rec, displayField);
+          if (rec?.id && title) refTitles.set(`${object} ${rec.id}`, title);
         }
       } catch {
       }
-      const unresolvedEmails = submitters.filter((s) => !names.has(s) && s.includes("@"));
-      if (unresolvedEmails.length) {
-        try {
-          const users = await this.engine.find("sys_user", {
-            where: { email: { $in: unresolvedEmails } },
-            fields: ["email", "name"],
-            limit: unresolvedEmails.length,
-            context: SYSTEM_CTX
-          });
-          for (const u of users ?? []) {
-            if (u?.email && u.name) names.set(String(u.email), String(u.name));
-          }
-        } catch {
-        }
+    }
+    const userIdentifiers = [];
+    for (const r of rows) {
+      userIdentifiers.push(r.submitter_id);
+      for (const a of r.pending_approvers ?? []) {
+        if (a && !a.includes(":")) userIdentifiers.push(a);
       }
     }
+    const names = await this.resolveUserNames(userIdentifiers);
     for (const r of rows) {
-      const title = titles.get(`${r.object_name}\0${r.record_id}`) ?? _ApprovalService.pickTitle(r.payload, void 0);
+      const title = titles.get(`${r.object_name} ${r.record_id}`) ?? _ApprovalService.pickTitle(r.payload, void 0);
       if (title) r.record_title = title;
       const name = r.submitter_id ? names.get(String(r.submitter_id)) : void 0;
       if (name) r.submitter_name = name;
+      const label = objectLabels.get(r.object_name);
+      if (label) r.object_label = label;
+      const approverNames = {};
+      for (const a of r.pending_approvers ?? []) {
+        const n = names.get(String(a));
+        if (n) approverNames[a] = n;
+      }
+      if (Object.keys(approverNames).length) r.pending_approver_names = approverNames;
+      const lookups = lookupFieldsByObject.get(r.object_name);
+      if (lookups && r.payload && typeof r.payload === "object") {
+        const display = {};
+        for (const { key, reference } of lookups) {
+          const v = r.payload[key];
+          if (v == null) continue;
+          const t = refTitles.get(`${reference} ${String(v)}`);
+          if (t) display[key] = t;
+        }
+        if (Object.keys(display).length) r.payload_display = display;
+      }
     }
   }
   // ── Read API ─────────────────────────────────────────────────
@@ -1571,7 +1668,15 @@ var ApprovalService = class _ApprovalService {
       orderBy: [{ field: "created_at", direction: "asc" }],
       context: SYSTEM_CTX
     });
-    return Array.isArray(rows) ? rows.map(rowFromAction) : [];
+    const actions = Array.isArray(rows) ? rows.map(rowFromAction) : [];
+    const names = await this.resolveUserNames(
+      actions.map((a) => a.actor_id).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;
+    }
+    return actions;
   }
 };