Patch service account UI in audit logs, add lastUsed for API keys and service accounts/tokens

frontend/src/ee/components/ActivityTable.tsx

@@ -21,6 +21,12 @@ interface LogData {
   createdAt: string;
   ipAddress: string;
   user: string;
+  serviceAccount: {
+    name: string;
+  };
+  serviceTokenData: {
+    name: string;
+  };
   payload: PayloadProps[];
 }
 
@@ -41,6 +47,14 @@ const ActivityLogsRow = ({
   const [payloadOpened, setPayloadOpened] = useState(false);
   const { t } = useTranslation();
 
+  const renderUser = () => {
+    if (row?.user) return `User: ${row.user}`;
+    if (row?.serviceAccount) return `Service Account: ${row.serviceAccount.name}`;
+    if (row?.serviceTokenData.name) return `Service Token: ${row.serviceTokenData.name}`;
+    
+    return '';
+  }
+
   return (
     <>
       <tr key={guidGenerator()} className="bg-bunker-800 duration-100 w-full text-sm">
@@ -64,7 +78,7 @@ const ActivityLogsRow = ({
             )
             .join(' and ')}
         </td>
-        <td className="pl-6 py-3 border-mineshaft-700 border-t text-gray-300">{row.user}</td>
+        <td className="pl-6 py-3 border-mineshaft-700 border-t text-gray-300">{renderUser()}</td>
         <td className="pl-6 py-3 border-mineshaft-700 border-t text-gray-300">{row.channel}</td>
         <td className="pl-6 py-3 border-mineshaft-700 border-t text-gray-300">
           {timeSince(new Date(row.createdAt))}

frontend/src/pages/activity/[id].tsx

@@ -20,6 +20,12 @@ interface LogData {
   user: {
     email: string;
   };
+  serviceAccount?: {
+    string: string;
+  },
+  serviceTokenData?: {
+    name: string;
+  }
   actions: {
     _id: string;
     name: string;
@@ -69,13 +75,16 @@ export default function Activity() {
         userId: '',
         actionNames: eventChosen
       });
+
       setLogsData(
         tempLogsData.map((log: LogData) => ({
           _id: log._id,
           channel: log.channel,
           createdAt: log.createdAt,
           ipAddress: log.ipAddress,
-          user: log.user.email,
+          user: log?.user?.email,
+          serviceAccount: log?.serviceAccount,
+          serviceTokenData: log?.serviceTokenData,
           payload: log.actions.map((action) => ({
             _id: action._id,
             name: action.name,
@@ -106,7 +115,9 @@ export default function Activity() {
             channel: log.channel,
             createdAt: log.createdAt,
             ipAddress: log.ipAddress,
-            user: log.user.email,
+            user: log?.user?.email,
+            serviceAccount: log?.serviceAccount,
+            serviceTokenData: log?.serviceTokenData,
             payload: log.actions.map((action) => ({
               _id: action._id,
               name: action.name,