Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore(studio): add pagination to webhook deliveries table (#43847)

Danny White6b6598994fc5
diff --git a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.mock.ts b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.mock.ts
index 06cea016399..a5e5efa4192 100644
--- a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.mock.ts
+++ b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.mock.ts
@@ -1,4 +1,160 @@
-import type { PlatformWebhooksMockSeed, WebhookScope } from './PlatformWebhooks.types'
+import type {
+ PlatformWebhooksMockSeed,
+ WebhookDelivery,
+ WebhookScope,
+} from './PlatformWebhooks.types'
+
+const createDeliveries = (
+ endpointId: string,
+ prefix: string,
+ deliveries: Array<Pick<WebhookDelivery, 'eventType' | 'status' | 'responseCode' | 'attemptAt'>>
+): WebhookDelivery[] =>
+ deliveries.map((delivery, index) => ({
+ id: `${prefix}-${index + 1}`,
+ endpointId,
+ ...delivery,
+ }))
+
+const organizationPrimaryDeliveries = createDeliveries(
+ '7f2c9d4a-6e31-4d9d-9a1f-2c4b5e6f7081',
+ 'org-delivery',
+ [
+ {
+ eventType: 'project.created',
+ status: 'success',
+ responseCode: 200,
+ attemptAt: '2026-02-27T08:04:00.000Z',
+ },
+ {
+ eventType: 'project.updated',
+ status: 'failure',
+ responseCode: 500,
+ attemptAt: '2026-02-27T07:56:00.000Z',
+ },
+ {
+ eventType: 'project.deleted',
+ status: 'pending',
+ attemptAt: '2026-02-27T07:45:00.000Z',
+ },
+ {
+ eventType: 'organization.member_invited',
+ status: 'success',
+ responseCode: 202,
+ attemptAt: '2026-02-27T07:37:00.000Z',
+ },
+ {
+ eventType: 'project.resumed',
+ status: 'success',
+ responseCode: 204,
+ attemptAt: '2026-02-27T07:18:00.000Z',
+ },
+ {
+ eventType: 'organization.member_removed',
+ status: 'failure',
+ responseCode: 400,
+ attemptAt: '2026-02-27T06:59:00.000Z',
+ },
+ {
+ eventType: 'organization.updated',
+ status: 'skipped',
+ attemptAt: '2026-02-27T06:40:00.000Z',
+ },
+ {
+ eventType: 'project.paused',
+ status: 'success',
+ responseCode: 200,
+ attemptAt: '2026-02-27T06:21:00.000Z',
+ },
+ {
+ eventType: 'project.created',
+ status: 'failure',
+ responseCode: 503,
+ attemptAt: '2026-02-27T06:03:00.000Z',
+ },
+ {
+ eventType: 'project.updated',
+ status: 'success',
+ responseCode: 200,
+ attemptAt: '2026-02-27T05:44:00.000Z',
+ },
+ {
+ eventType: 'project.deleted',
+ status: 'skipped',
+ attemptAt: '2026-02-27T05:25:00.000Z',
+ },
+ {
+ eventType: 'organization.member_invited',
+ status: 'success',
+ responseCode: 201,
+ attemptAt: '2026-02-27T05:07:00.000Z',
+ },
+ ]
+)
+
+const organizationSecondaryDeliveries = createDeliveries(
+ '1a4e8c73-5b29-44af-8c62-9f1d2b3c4d5e',
+ 'org-secondary-delivery',
+ [
+ {
+ eventType: 'organization.updated',
+ status: 'skipped',
+ attemptAt: '2026-02-26T14:12:00.000Z',
+ },
+ ]
+)
+
+const projectDeliveries = createDeliveries(
+ '3c9b7e21-8d54-4f63-b2a1-6e7d8c9f0a12',
+ 'project-delivery',
+ [
+ {
+ eventType: 'project.updated',
+ status: 'success',
+ responseCode: 200,
+ attemptAt: '2026-02-27T09:01:00.000Z',
+ },
+ {
+ eventType: 'project.resource_exhausted',
+ status: 'failure',
+ responseCode: 429,
+ attemptAt: '2026-02-27T08:47:00.000Z',
+ },
+ {
+ eventType: 'project.paused',
+ status: 'success',
+ responseCode: 202,
+ attemptAt: '2026-02-26T21:10:00.000Z',
+ },
+ {
+ eventType: 'project.branch_created',
+ status: 'success',
+ responseCode: 200,
+ attemptAt: '2026-02-26T19:45:00.000Z',
+ },
+ {
+ eventType: 'project.resumed',
+ status: 'pending',
+ attemptAt: '2026-02-26T18:30:00.000Z',
+ },
+ {
+ eventType: 'project.branch_deleted',
+ status: 'success',
+ responseCode: 204,
+ attemptAt: '2026-02-26T17:04:00.000Z',
+ },
+ {
+ eventType: 'project.updated',
+ status: 'failure',
+ responseCode: 500,
+ attemptAt: '2026-02-26T15:59:00.000Z',
+ },
+ {
+ eventType: 'project.resource_exhausted',
+ status: 'skipped',
+ attemptAt: '2026-02-26T14:12:00.000Z',
+ },
+ ]
+)
export const PLATFORM_WEBHOOKS_MOCK_DATA: Record<WebhookScope, PlatformWebhooksMockSeed> = {
organization: {
@@ -39,38 +195,7 @@ export const PLATFORM_WEBHOOKS_MOCK_DATA: Record<WebhookScope, PlatformWebhooksM
createdAt: '2026-02-12T10:14:00.000Z',
},
],
- deliveries: [
- {
- id: 'org-delivery-1',
- endpointId: '7f2c9d4a-6e31-4d9d-9a1f-2c4b5e6f7081',
- eventType: 'project.created',
- status: 'success',
- responseCode: 200,
- attemptAt: '2026-02-27T08:04:00.000Z',
- },
- {
- id: 'org-delivery-2',
- endpointId: '7f2c9d4a-6e31-4d9d-9a1f-2c4b5e6f7081',
- eventType: 'project.updated',
- status: 'failure',
- responseCode: 500,
- attemptAt: '2026-02-27T07:56:00.000Z',
- },
- {
- id: 'org-delivery-3',
- endpointId: '7f2c9d4a-6e31-4d9d-9a1f-2c4b5e6f7081',
- eventType: 'project.deleted',
- status: 'pending',
- attemptAt: '2026-02-27T07:45:00.000Z',
- },
- {
- id: 'org-delivery-4',
- endpointId: '1a4e8c73-5b29-44af-8c62-9f1d2b3c4d5e',
- eventType: 'organization.updated',
- status: 'skipped',
- attemptAt: '2026-02-26T14:12:00.000Z',
- },
- ],
+ deliveries: [...organizationPrimaryDeliveries, ...organizationSecondaryDeliveries],
},
project: {
eventTypes: [
@@ -94,31 +219,6 @@ export const PLATFORM_WEBHOOKS_MOCK_DATA: Record<WebhookScope, PlatformWebhooksM
createdAt: '2026-02-18T11:23:00.000Z',
},
],
- deliveries: [
- {
- id: 'project-delivery-1',
- endpointId: '3c9b7e21-8d54-4f63-b2a1-6e7d8c9f0a12',
- eventType: 'project.updated',
- status: 'success',
- responseCode: 200,
- attemptAt: '2026-02-27T09:01:00.000Z',
- },
- {
- id: 'project-delivery-2',
- endpointId: '3c9b7e21-8d54-4f63-b2a1-6e7d8c9f0a12',
- eventType: 'project.resource_exhausted',
- status: 'failure',
- responseCode: 429,
- attemptAt: '2026-02-27T08:47:00.000Z',
- },
- {
- id: 'project-delivery-3',
- endpointId: '3c9b7e21-8d54-4f63-b2a1-6e7d8c9f0a12',
- eventType: 'project.paused',
- status: 'success',
- responseCode: 202,
- attemptAt: '2026-02-26T21:10:00.000Z',
- },
- ],
+ deliveries: projectDeliveries,
},
}
diff --git a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.store.test.ts b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.store.test.ts
index 1f7c05739c8..7b5d2630ed6 100644
--- a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.store.test.ts
+++ b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooks.store.test.ts
@@ -126,12 +126,28 @@ describe('PlatformWebhooks.store', () => {
'project-delivery-2',
{ now: '2026-03-17T02:15:00.000Z' }
)
+ const endpointDeliveries = filterWebhookDeliveries(
+ nextState.deliveries,
+ '3c9b7e21-8d54-4f63-b2a1-6e7d8c9f0a12',
+ ''
+ )
+ expect(endpointDeliveries).toHaveLength(8)
+ expect(endpointDeliveries.map((delivery) => delivery.id).slice(0, 3)).toEqual([
+ 'project-delivery-2',
+ 'project-delivery-1',
+ 'project-delivery-3',
+ ])
expect(
- filterWebhookDeliveries(nextState.deliveries, '3c9b7e21-8d54-4f63-b2a1-6e7d8c9f0a12', '').map(
- (delivery) => delivery.id
- )
- ).toEqual(['project-delivery-2', 'project-delivery-1', 'project-delivery-3'])
+ endpointDeliveries.every((delivery, index) => {
+ if (index === 0) return true
+
+ return (
+ new Date(endpointDeliveries[index - 1].attemptAt).getTime() >=
+ new Date(delivery.attemptAt).getTime()
+ )
+ })
+ ).toBe(true)
})
it('does not retry successful deliveries', () => {
diff --git a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsx b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsx
index 446442d1a5b..00a29595091 100644
--- a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsx
+++ b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksDeliveryDetailsSheet.tsx
@@ -1,7 +1,6 @@
-import { Copy, RotateCcw } from 'lucide-react'
-
import { getStatusLevel } from 'components/interfaces/UnifiedLogs/UnifiedLogs.utils'
import { DataTableColumnStatusCode } from 'components/ui/DataTable/DataTableColumn/DataTableColumnStatusCode'
+import { Copy, RotateCcw } from 'lucide-react'
import {
AlertDialog,
Badge,
@@ -21,6 +20,7 @@ import {
TabsTrigger_Shadcn_ as TabsTrigger,
} from 'ui'
import { TimestampInfo } from 'ui-patterns'
+
import type { WebhookDelivery } from './PlatformWebhooks.types'
import { formatDeliveryStatus, statusBadgeVariant } from './PlatformWebhooksView.utils'
@@ -192,7 +192,7 @@ export const PlatformWebhooksDeliveryDetailsSheet = ({
<SheetFooter className="shrink-0">
<Button
type="default"
- icon={<RotateCcw size={14} />}
+ icon={<RotateCcw />}
onClick={() => onRetryDelivery(retryableDelivery.id)}
>
Retry delivery
diff --git a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointDetails.test.tsx b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointDetails.test.tsx
new file mode 100644
index 00000000000..b226e92b59c
--- /dev/null
+++ b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointDetails.test.tsx
@@ -0,0 +1,141 @@
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import type { ComponentProps } from 'react'
+import { describe, expect, it, vi } from 'vitest'
+
+import { PLATFORM_WEBHOOKS_MOCK_DATA } from './PlatformWebhooks.mock'
+import { PlatformWebhooksEndpointDetails } from './PlatformWebhooksEndpointDetails'
+
+vi.mock('components/ui/DataTable/DataTableColumn/DataTableColumnStatusCode', () => ({
+ DataTableColumnStatusCode: ({ value }: { value: number }) => <span>{value}</span>,
+}))
+
+vi.mock('components/ui/ButtonTooltip', () => ({
+ ButtonTooltip: ({
+ icon,
+ children,
+ size: _size,
+ tooltip: _tooltip,
+ type: _type,
+ ...props
+ }: any) => (
+ <button type="button" {...props}>
+ {icon}
+ {children}
+ </button>
+ ),
+}))
+
+vi.mock('ui-patterns', async () => {
+ const actual = await vi.importActual<typeof import('ui-patterns')>('ui-patterns')
+
+ return {
+ ...actual,
+ TimestampInfo: ({ utcTimestamp, className }: { utcTimestamp: string; className?: string }) => (
+ <span className={className}>{utcTimestamp}</span>
+ ),
+ }
+})
+
+describe('PlatformWebhooksEndpointDetails', () => {
+ const selectedEndpoint = PLATFORM_WEBHOOKS_MOCK_DATA.organization.endpoints[0]
+ const allDeliveries = PLATFORM_WEBHOOKS_MOCK_DATA.organization.deliveries.filter(
+ (delivery) => delivery.endpointId === selectedEndpoint.id
+ )
+
+ const renderComponent = (
+ props?: Partial<ComponentProps<typeof PlatformWebhooksEndpointDetails>>
+ ) =>
+ render(
+ <PlatformWebhooksEndpointDetails
+ deliverySearch=""
+ filteredDeliveries={allDeliveries}
+ selectedEndpoint={selectedEndpoint}
+ onDeliverySearchChange={vi.fn()}
+ onOpenDelivery={vi.fn()}
+ onRetryDelivery={vi.fn()}
+ {...props}
+ />
+ )
+
+ it('renders paginated deliveries with previous and next controls', async () => {
+ const user = userEvent.setup()
+
+ renderComponent()
+
+ expect(screen.getByText('Showing 1 to 5 of 12 deliveries')).toBeInTheDocument()
+ expect(screen.queryByText('organization.member_removed')).not.toBeInTheDocument()
+
+ await user.click(screen.getByLabelText('Next page'))
+
+ expect(screen.getByText('Showing 6 to 10 of 12 deliveries')).toBeInTheDocument()
+ expect(screen.getByText('organization.member_removed')).toBeInTheDocument()
+
+ await user.click(screen.getByLabelText('Previous page'))
+
+ expect(screen.getByText('Showing 1 to 5 of 12 deliveries')).toBeInTheDocument()
+ expect(screen.queryByText('organization.member_removed')).not.toBeInTheDocument()
+ })
+
+ it('sorts deliveries by event type from the header', async () => {
+ const user = userEvent.setup()
+
+ renderComponent()
+
+ await user.click(screen.getByRole('button', { name: 'Event type' }))
+
+ expect(screen.getAllByRole('row')[1]).toHaveTextContent('organization.member_invited')
+
+ await user.click(screen.getByRole('button', { name: 'Event type' }))
+
+ expect(screen.getAllByRole('row')[1]).toHaveTextContent('project.updated')
+ })
+
+ it('resets to the first page when the delivery search changes', async () => {
+ const user = userEvent.setup()
+ const projectDeliveries = allDeliveries.filter((delivery) =>
+ delivery.eventType.includes('project')
+ )
+ const { rerender } = renderComponent()
+
+ await user.click(screen.getByLabelText('Next page'))
+ expect(screen.getByText('Showing 6 to 10 of 12 deliveries')).toBeInTheDocument()
+
+ rerender(
+ <PlatformWebhooksEndpointDetails
+ deliverySearch="project"
+ filteredDeliveries={projectDeliveries}
+ selectedEndpoint={selectedEndpoint}
+ onDeliverySearchChange={vi.fn()}
+ onOpenDelivery={vi.fn()}
+ onRetryDelivery={vi.fn()}
+ />
+ )
+
+ await waitFor(() => {
+ expect(screen.getByText('Showing 1 to 5 of 8 deliveries')).toBeInTheDocument()
+ })
+ })
+
+ it('retries a failed delivery without opening the delivery row', async () => {
+ const user = userEvent.setup()
+ const onOpenDelivery = vi.fn()
+ const onRetryDelivery = vi.fn()
+
+ renderComponent({ onOpenDelivery, onRetryDelivery })
+
+ await user.click(screen.getByLabelText('Retry org-delivery-2'))
+
+ expect(onRetryDelivery).toHaveBeenCalledWith('org-delivery-2')
+ expect(onOpenDelivery).not.toHaveBeenCalled()
+ })
+
+ it('renders a zero response code instead of the placeholder', () => {
+ renderComponent({
+ filteredDeliveries: [{ ...allDeliveries[0], id: 'org-delivery-zero', responseCode: 0 }],
+ })
+
+ expect(screen.getByText('0')).toBeInTheDocument()
+ expect(screen.queryByText('–')).not.toBeInTheDocument()
+ })
+})
diff --git a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointDetails.tsx b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointDetails.tsx
index 931a13dee6f..ca83443e2d6 100644
--- a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointDetails.tsx
+++ b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointDetails.tsx
@@ -1,16 +1,30 @@
+import {
+ flexRender,
+ getCoreRowModel,
+ getPaginationRowModel,
+ getSortedRowModel,
+ useReactTable,
+ type ColumnDef,
+ type PaginationState,
+ type SortingState,
+} from '@tanstack/react-table'
import { getStatusLevel } from 'components/interfaces/UnifiedLogs/UnifiedLogs.utils'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import { DataTableColumnStatusCode } from 'components/ui/DataTable/DataTableColumn/DataTableColumnStatusCode'
-import { RotateCcw, Search } from 'lucide-react'
+import { ChevronLeft, ChevronRight, RotateCcw, Search } from 'lucide-react'
+import { useEffect, useState, type ReactNode } from 'react'
import {
Badge,
+ Button,
Card,
CardContent,
+ CardFooter,
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
+ TableHeadSort,
TableRow,
} from 'ui'
import { TimestampInfo } from 'ui-patterns'
@@ -21,7 +35,7 @@ import { statusBadgeVariant } from './PlatformWebhooksView.utils'
interface DetailItemProps {
label: string
- children: React.ReactNode
+ children: ReactNode
ddClassName?: string
}
@@ -41,6 +55,110 @@ interface PlatformWebhooksEndpointDetailsProps {
onRetryDelivery: (deliveryId: string) => void
}
+const DELIVERIES_PAGE_SIZE = 5
+const DELIVERY_ACTIONS_COLUMN_ID = 'actions'
+const DEFAULT_DELIVERY_SORTING: SortingState = [{ id: 'attemptAt', desc: true }]
+
+const getCurrentSort = (sorting: SortingState) => {
+ if (sorting.length === 0) return ''
+
+ const [currentSort] = sorting
+ return `${currentSort.id}:${currentSort.desc ? 'desc' : 'asc'}`
+}
+
+const getAriaSort = (
+ sorting: SortingState,
+ columnId: string
+): 'ascending' | 'descending' | 'none' => {
+ const currentSort = sorting.find((sort) => sort.id === columnId)
+
+ if (!currentSort) return 'none'
+ return currentSort.desc ? 'descending' : 'ascending'
+}
+
+const DELIVERY_COLUMNS: ColumnDef<WebhookDelivery>[] = [
+ {
+ accessorKey: 'status',
+ header: 'Status',
+ cell: ({ row }) => (
+ <Badge variant={statusBadgeVariant[row.original.status]}>{row.original.status}</Badge>
+ ),
+ },
+ {
+ accessorKey: 'eventType',
+ header: 'Event type',
+ cell: ({ row }) => <code className="text-code-inline">{row.original.eventType}</code>,
+ },
+ {
+ accessorKey: 'responseCode',
+ header: 'Response',
+ sortingFn: (rowA, rowB, columnId) => {
+ const responseA = rowA.getValue<number | undefined>(columnId) ?? -1
+ const responseB = rowB.getValue<number | undefined>(columnId) ?? -1
+ return responseA - responseB
+ },
+ cell: ({ row }) =>
+ row.original.responseCode != null ? (
+ <DataTableColumnStatusCode
+ value={row.original.responseCode}
+ level={getStatusLevel(row.original.responseCode)}
+ className="text-xs"
+ />
+ ) : (
+ <span className="text-xs text-foreground-muted">–</span>
+ ),
+ },
+ {
+ accessorKey: 'attemptAt',
+ header: 'Attempted',
+ cell: ({ row }) => (
+ <TimestampInfo
+ className="text-sm text-foreground-lighter"
+ utcTimestamp={row.original.attemptAt}
+ />
+ ),
+ },
+ {
+ id: DELIVERY_ACTIONS_COLUMN_ID,
+ enableSorting: false,
+ header: () => <span className="sr-only">Actions</span>,
+ cell: ({ row, table }) => {
+ const { onRetryDelivery } = table.options.meta as {
+ onRetryDelivery: (deliveryId: string) => void
+ }
+
+ return (
+ <div className="flex h-full items-center justify-end">
+ {row.original.status !== 'success' ? (
+ <ButtonTooltip
+ type="default"
+ size="tiny"
+ className="w-7 shrink-0 hit-area-2"
+ icon={<RotateCcw />}
+ aria-label={`Retry ${row.original.id}`}
+ tooltip={{ content: { side: 'top', text: 'Retry' } }}
+ onClick={(event) => {
+ event.stopPropagation()
+ onRetryDelivery(row.original.id)
+ }}
+ onKeyDown={(event) => event.stopPropagation()}
+ />
+ ) : (
+ <Button
+ type="default"
+ size="tiny"
+ className="w-7 shrink-0 hit-area-2 invisible pointer-events-none"
+ icon={<RotateCcw />}
+ aria-hidden
+ tabIndex={-1}
+ />
+ )}
+ </div>
+ )
+ },
+ },
+]
+
export const PlatformWebhooksEndpointDetails = ({
deliverySearch,
filteredDeliveries,
@@ -52,6 +170,49 @@ export const PlatformWebhooksEndpointDetails = ({
const hasCustomHeaders = selectedEndpoint.customHeaders.length > 0
const hasName = selectedEndpoint.name.trim().length > 0
const hasDescription = selectedEndpoint.description.trim().length > 0
+ const [sorting, setSorting] = useState<SortingState>(DEFAULT_DELIVERY_SORTING)
+ const [pagination, setPagination] = useState<PaginationState>({
+ pageIndex: 0,
+ pageSize: DELIVERIES_PAGE_SIZE,
+ })
+ const currentSort = getCurrentSort(sorting)
+
+ const handleSortChange = (columnId: string) => {
+ const currentColumnSort = sorting.find((sort) => sort.id === columnId)
+
+ if (!currentColumnSort) {
+ setSorting([{ id: columnId, desc: false }])
+ return
+ }
+
+ setSorting([{ id: columnId, desc: !currentColumnSort.desc }])
+ }
+
+ const table = useReactTable({
+ data: filteredDeliveries,
+ columns: DELIVERY_COLUMNS,
+ state: { pagination, sorting },
+ meta: { onRetryDelivery },
+ getRowId: (row) => row.id,
+ onPaginationChange: setPagination,
+ onSortingChange: setSorting,
+ getCoreRowModel: getCoreRowModel(),
+ getPaginationRowModel: getPaginationRowModel(),
+ getSortedRowModel: getSortedRowModel(),
+ })
+
+ const paginatedDeliveries = table.getRowModel().rows
+ const deliveryStartIndex =
+ table.getState().pagination.pageIndex * table.getState().pagination.pageSize
+ const deliveryRangeStart = filteredDeliveries.length === 0 ? 0 : deliveryStartIndex + 1
+ const deliveryRangeEnd = Math.min(
+ deliveryStartIndex + table.getState().pagination.pageSize,
+ filteredDeliveries.length
+ )
+
+ useEffect(() => {
+ setPagination((currentPagination) => ({ ...currentPagination, pageIndex: 0 }))
+ }, [deliverySearch, selectedEndpoint.id])
return (
<div className="space-y-16">
@@ -93,7 +254,7 @@ export const PlatformWebhooksEndpointDetails = ({
className="px-2 py-2 font-mono font-medium text-xs flex items-center gap-2 flex-wrap"
>
<code className="text-code_block-4">{header.key}:</code>
- <code className="">{header.value}</code>
+ <code>{header.value}</code>
</div>
))}
</div>
@@ -121,86 +282,106 @@ export const PlatformWebhooksEndpointDetails = ({
className="w-full lg:w-52"
onChange={(event) => onDeliverySearchChange(event.target.value)}
/>
- <p className="text-sm text-foreground-muted">{filteredDeliveries.length} total</p>
</div>
<Card className="overflow-hidden">
<Table>
<TableHeader>
- <TableRow>
- <TableHead>Status</TableHead>
- <TableHead>Event type</TableHead>
- <TableHead>Response</TableHead>
- <TableHead>Attempted</TableHead>
- <TableHead className="w-1">
- <span className="sr-only">Actions</span>
- </TableHead>
- </TableRow>
+ {table.getHeaderGroups().map((headerGroup) => (
+ <TableRow key={headerGroup.id}>
+ {headerGroup.headers.map((header) => {
+ const columnId = header.column.id
+ const canSort = header.column.getCanSort()
+
+ return (
+ <TableHead
+ key={header.id}
+ aria-sort={canSort ? getAriaSort(sorting, columnId) : undefined}
+ className={columnId === DELIVERY_ACTIONS_COLUMN_ID ? 'w-1' : ''}
+ >
+ {header.isPlaceholder ? null : canSort ? (
+ <TableHeadSort
+ column={columnId}
+ currentSort={currentSort}
+ onSortChange={handleSortChange}
+ >
+ {flexRender(header.column.columnDef.header, header.getContext())}
+ </TableHeadSort>
+ ) : (
+ flexRender(header.column.columnDef.header, header.getContext())
+ )}
+ </TableHead>
+ )
+ })}
+ </TableRow>
+ ))}
</TableHeader>
<TableBody>
- {filteredDeliveries.length > 0 ? (
- filteredDeliveries.map((delivery) => (
+ {paginatedDeliveries.length > 0 ? (
+ paginatedDeliveries.map((row) => (
<TableRow
- key={delivery.id}
+ key={row.id}
className="cursor-pointer inset-focus"
- onClick={() => onOpenDelivery(delivery.id)}
+ onClick={() => onOpenDelivery(row.original.id)}
onKeyDown={(event) => {
if (event.key === 'Enter' || event.key === ' ') {
event.preventDefault()
- onOpenDelivery(delivery.id)
+ onOpenDelivery(row.original.id)
}
}}
tabIndex={0}
>
- <TableCell>
- <Badge variant={statusBadgeVariant[delivery.status]}>{delivery.status}</Badge>
- </TableCell>
- <TableCell>
- <code className="text-code-inline">{delivery.eventType}</code>
- </TableCell>
- <TableCell>
- {delivery.responseCode ? (
- <DataTableColumnStatusCode
- value={delivery.responseCode}
- level={getStatusLevel(delivery.responseCode)}
- className="text-xs"
- />
- ) : (
- <span className="text-xs text-foreground-muted">–</span>
- )}
- </TableCell>
- <TableCell>
- <TimestampInfo className="text-sm" utcTimestamp={delivery.attemptAt} />
- </TableCell>
- <TableCell className="w-1 text-right">
- <div className="flex h-full items-center justify-end">
- {delivery.status !== 'success' && (
- <ButtonTooltip
- type="default"
- className="w-7 shrink-0 hit-area-2"
- icon={<RotateCcw size={14} />}
- aria-label={`Retry ${delivery.id}`}
- tooltip={{ content: { side: 'top', text: 'Retry' } }}
- onClick={(event) => {
- event.stopPropagation()
- onRetryDelivery(delivery.id)
- }}
- onKeyDown={(event) => event.stopPropagation()}
- />
- )}
- {delivery.status === 'success' && (
- <span aria-hidden className="size-7 shrink-0" />
- )}
- </div>
- </TableCell>
+ {row.getVisibleCells().map((cell) => (
+ <TableCell
+ key={cell.id}
+ className={
+ cell.column.id === DELIVERY_ACTIONS_COLUMN_ID ? 'w-1 text-right' : ''
+ }
+ >
+ {flexRender(cell.column.columnDef.cell, cell.getContext())}
+ </TableCell>
+ ))}
</TableRow>
))
) : (
- <TableRow>
- <TableCell colSpan={5}>No deliveries found</TableCell>
+ <TableRow className="[&>td]:hover:bg-inherit">
+ <TableCell colSpan={DELIVERY_COLUMNS.length}>
+ <p className="text-sm text-foreground">No deliveries found</p>
+ <p className="text-sm text-foreground-lighter">
+ Try adjusting your search to see more webhook attempts.
+ </p>
+ </TableCell>
</TableRow>
)}
</TableBody>
</Table>
+ {filteredDeliveries.length > 0 && (
+ <CardFooter className="border-t p-4 flex items-center justify-between">
+ <p className="text-foreground-muted text-sm">
+ Showing {deliveryRangeStart} to {deliveryRangeEnd} of {filteredDeliveries.length}{' '}
+ deliveries
+ </p>
+ <div className="flex items-center gap-x-2" aria-label="Pagination">
+ <Button
+ icon={<ChevronLeft />}
+ className="w-7 hit-area-2"
+ aria-label="Previous page"
+ type="default"
+ size="tiny"
+ disabled={!table.getCanPreviousPage()}
+ onClick={() => table.previousPage()}
+ />
+ <Button
+ icon={<ChevronRight />}
+ className="w-7 hit-area-2"
+ aria-label="Next page"
+ type="default"
+ size="tiny"
+ disabled={!table.getCanNextPage()}
+ onClick={() => table.nextPage()}
+ />
+ </div>
+ </CardFooter>
+ )}
</Card>
</div>
</div>