Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions packages/web/src/pages/EventsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ===========================================
// Audit log browser with filters, pagination, and detail expansion.

import { useState, type ReactNode } from 'react';
import { Fragment, useState, type ReactNode } from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import Paper from '@mui/material/Paper';
Expand Down Expand Up @@ -163,7 +163,8 @@ export function EventsPage(): ReactNode {
<TableSkeleton rows={6} columns={7} />
) : data && data.data.length > 0 ? (
data.data.map((event) => (
<TableRow key={event.id} hover sx={{ '& > *': { borderBottom: expandedId === event.id ? 'unset' : undefined } }}>
<Fragment key={event.id}>
<TableRow hover sx={{ '& > *': { borderBottom: expandedId === event.id ? 'unset' : undefined } }}>
<TableCell padding="checkbox">
<IconButton
aria-label={expandedId === event.id ? 'Collapse event details' : 'Expand event details'}
Expand Down Expand Up @@ -209,6 +210,14 @@ export function EventsPage(): ReactNode {
</Typography>
</TableCell>
</TableRow>
<TableRow>
<TableCell colSpan={7} sx={{ py: 0, borderBottom: expandedId === event.id ? undefined : 'none' }}>
<Collapse in={expandedId === event.id} timeout="auto" unmountOnExit>
<EventDetailPanel eventId={event.id} />
</Collapse>
</TableCell>
</TableRow>
</Fragment>
))
) : (
<TableRow>
Expand All @@ -222,17 +231,6 @@ export function EventsPage(): ReactNode {
</TableCell>
</TableRow>
)}

{/* Expanded Detail Row */}
{!isLoading && data?.data.map((event) => (
<TableRow key={`detail-${String(event.id)}`}>
<TableCell colSpan={7} sx={{ py: 0, borderBottom: expandedId === event.id ? undefined : 'none' }}>
<Collapse in={expandedId === event.id} timeout="auto" unmountOnExit>
<EventDetailPanel eventId={event.id} />
</Collapse>
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
{data && data.pagination.total > 0 ? (
Expand Down
Loading