From 01af2124eb173c2e2b774513b15f2e7507bfa150 Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Thu, 5 Feb 2026 13:04:51 +0100
Subject: [PATCH] feat: enhance audit log display in OrganizationSettings by
 adding Log ID and improving actor identification with email fallback

---
 components/settings/OrganizationSettings.tsx | 8 ++++++--
 lib/api/audit.ts                             | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/settings/OrganizationSettings.tsx b/components/settings/OrganizationSettings.tsx
index d017f44..7989164 100644
--- a/components/settings/OrganizationSettings.tsx
+++ b/components/settings/OrganizationSettings.tsx
@@ -849,21 +849,25 @@ export default function OrganizationSettings() {
                       <table className="w-full text-sm">
                         <thead>
                           <tr className="border-b border-neutral-200 dark:border-neutral-800 bg-neutral-50 dark:bg-neutral-800/50">
+                            <th className="text-left px-4 py-3 font-medium text-neutral-700 dark:text-neutral-300">Log ID</th>
                             <th className="text-left px-4 py-3 font-medium text-neutral-700 dark:text-neutral-300">Time</th>
                             <th className="text-left px-4 py-3 font-medium text-neutral-700 dark:text-neutral-300">Actor</th>
                             <th className="text-left px-4 py-3 font-medium text-neutral-700 dark:text-neutral-300">Action</th>
                             <th className="text-left px-4 py-3 font-medium text-neutral-700 dark:text-neutral-300">Resource</th>
-                            <th className="text-left px-4 py-3 font-medium text-neutral-700 dark:text-neutral-300">ID</th>
+                            <th className="text-left px-4 py-3 font-medium text-neutral-700 dark:text-neutral-300">Resource ID</th>
                           </tr>
                         </thead>
                         <tbody>
                           {(auditEntries ?? []).map((entry) => (
                             <tr key={entry.id} className="border-b border-neutral-100 dark:border-neutral-800 hover:bg-neutral-50 dark:hover:bg-neutral-800/30">
+                              <td className="px-4 py-3 text-neutral-500 dark:text-neutral-500 font-mono text-xs" title={entry.id}>
+                                {entry.id.slice(0, 8)}…
+                              </td>
                               <td className="px-4 py-3 text-neutral-600 dark:text-neutral-400 whitespace-nowrap">
                                 {new Date(entry.occurred_at).toLocaleString()}
                               </td>
                               <td className="px-4 py-3 text-neutral-900 dark:text-white">
-                                {entry.actor_id ? entry.actor_id : 'System'}
+                                {entry.actor_email || entry.actor_id || 'System'}
                               </td>
                               <td className="px-4 py-3 font-medium text-neutral-900 dark:text-white">{entry.action}</td>
                               <td className="px-4 py-3 text-neutral-600 dark:text-neutral-400">{entry.resource_type}</td>
diff --git a/lib/api/audit.ts b/lib/api/audit.ts
index 45671f1..cbb27fc 100644
--- a/lib/api/audit.ts
+++ b/lib/api/audit.ts
@@ -8,6 +8,7 @@ export interface AuditLogEntry {
   id: string
   org_id: string
   actor_id?: string
+  actor_email?: string
   action: string
   resource_type: string
   resource_id?: string