diff --git a/frontend/src/views/Project/AuditLogsPage/AuditLogsPage.tsx b/frontend/src/views/Project/AuditLogsPage/AuditLogsPage.tsx index d9f95f2d5..e9b8504a2 100644 --- a/frontend/src/views/Project/AuditLogsPage/AuditLogsPage.tsx +++ b/frontend/src/views/Project/AuditLogsPage/AuditLogsPage.tsx @@ -12,7 +12,7 @@ export const AuditLogsPage = withProjectPermission(

Audit Logs

- + ); diff --git a/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx b/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx index 8df4338b6..aeb12468d 100644 --- a/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx +++ b/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx @@ -68,6 +68,7 @@ export const LogsSection = ({ isOrgAuditLogs={isOrgAuditLogs} eventType={eventType} userAgentType={userAgentType} + showActorColumn={!presetActor} actor={actor} startDate={startDate} endDate={endDate} diff --git a/frontend/src/views/Project/AuditLogsPage/components/LogsTable.tsx b/frontend/src/views/Project/AuditLogsPage/components/LogsTable.tsx index 22022ee67..3a628a0d0 100644 --- a/frontend/src/views/Project/AuditLogsPage/components/LogsTable.tsx +++ b/frontend/src/views/Project/AuditLogsPage/components/LogsTable.tsx @@ -26,6 +26,7 @@ type Props = { startDate?: Date; endDate?: Date; isOrgAuditLogs?: boolean; + showActorColumn: boolean; }; const AUDIT_LOG_LIMIT = 15; @@ -33,6 +34,7 @@ const AUDIT_LOG_LIMIT = 15; export const LogsTable = ({ eventType, userAgentType, + showActorColumn, actor, startDate, endDate, @@ -63,7 +65,7 @@ export const LogsTable = ({ Timestamp Event {isOrgAuditLogs && Project} - Actor + {showActorColumn && Actor} Source Metadata @@ -74,6 +76,7 @@ export const LogsTable = ({ {group.map((auditLog) => ( { +export const LogsTableRow = ({ auditLog, isOrgAuditLogs, showActorColumn }: Props) => { const renderActor = (actor: Actor) => { switch (actor.type) { case ActorType.USER: @@ -471,7 +472,7 @@ export const LogsTableRow = ({ auditLog, isOrgAuditLogs }: Props) => { {formatDate(auditLog.createdAt)} {`${eventToNameMap[auditLog.event.type]}`} {isOrgAuditLogs && {auditLog.project.name}} - {renderActor(auditLog.actor)} + {showActorColumn && renderActor(auditLog.actor)}

{userAgentTTypeoNameMap[auditLog.userAgentType]}

{auditLog.ipAddress}