The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
improve webhook logs: fix timezone, toggle-able sheet, highlight toggled row
Steven Teyf8480f03aff7
diff --git a/apps/web/app/api/webhooks/[webhookId]/events/route.ts b/apps/web/app/api/webhooks/[webhookId]/events/route.tsindex e4d8272f2c..f2fc15e2bf 100644--- a/apps/web/app/api/webhooks/[webhookId]/events/route.ts+++ b/apps/web/app/api/webhooks/[webhookId]/events/route.ts@@ -21,6 +21,7 @@ export const GET = withWorkspace(const parsedEvents = events.data.map((event) => ({...event,+ timestamp: new Date(event.timestamp + "Z"), // timestamp is always in UTCrequest_body: JSON.parse(event.request_body),}));diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/[webhookId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/[webhookId]/page-client.tsxindex 831be196c0..fe7a9f3c65 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/[webhookId]/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/[webhookId]/page-client.tsx@@ -6,10 +6,11 @@ import { WebhookEventProps } from "@/lib/types";import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";import { WebhookEventListSkeleton } from "@/ui/webhooks/loading-events-skelton";import { NoEventsPlaceholder } from "@/ui/webhooks/no-events-placeholder";-import { useWebhookEventDetailsSheet } from "@/ui/webhooks/webhook-event-details-sheet";+import { WebhookEventDetailsSheet } from "@/ui/webhooks/webhook-event-details-sheet";import { WebhookEventList } from "@/ui/webhooks/webhook-event-list";import { fetcher } from "@dub/utils";import { redirect } from "next/navigation";+import { useMemo, useState } from "react";import useSWR from "swr";export default function WebhookLogsPageClient({@@ -37,18 +38,74 @@ export default function WebhookLogsPageClient({},);- const { webhookEventDetailsSheet, openWithEvent } =- useWebhookEventDetailsSheet();+ const [detailsSheetState, setDetailsSheetState] = useState<+ | { open: false; eventId: string | null }+ | { open: true; eventId: string }+ >({ open: false, eventId: null });++ const currentEvent = useMemo(+ () =>+ detailsSheetState.eventId+ ? events?.find(({ event_id }) => event_id === detailsSheetState.eventId)+ : null,+ [events, detailsSheetState.eventId],+ );++ const [previousEventId, nextEventId] = useMemo(() => {+ if (!events || !detailsSheetState.eventId) return [null, null];++ const currentIndex = events.findIndex(+ ({ event_id }) => event_id === detailsSheetState.eventId,+ );+ if (currentIndex === -1) return [null, null];++ return [+ currentIndex > 0 ? events[currentIndex - 1].event_id : null,+ currentIndex < events.length - 1 ? events[currentIndex + 1].event_id : null,+ ];+ }, [events, detailsSheetState.eventId]);return (<PageWidthWrapper className="grid max-w-screen-lg gap-8 pb-10">- {webhookEventDetailsSheet}+ {detailsSheetState.eventId && currentEvent && (+ <WebhookEventDetailsSheet+ isOpen={detailsSheetState.open}+ setIsOpen={(open) =>+ setDetailsSheetState((state) => ({ ...state, open }) as any)+ }+ event={currentEvent}+ onPrevious={+ previousEventId+ ? () =>+ setDetailsSheetState({+ open: true,+ eventId: previousEventId,+ })+ : undefined+ }+ onNext={+ nextEventId+ ? () =>+ setDetailsSheetState({+ open: true,+ eventId: nextEventId,+ })+ : undefined+ }+ />+ )}{isLoading ? (<WebhookEventListSkeleton />) : events && events.length === 0 ? (<NoEventsPlaceholder />) : (- <WebhookEventList events={events || []} onEventClick={openWithEvent} />+ <WebhookEventList+ events={events || []}+ selectedEventId={detailsSheetState.eventId}+ onEventClick={(event) =>+ setDetailsSheetState({ open: true, eventId: event.event_id })+ }+ />)}</PageWidthWrapper>);diff --git a/apps/web/ui/webhooks/webhook-event-details-sheet.tsx b/apps/web/ui/webhooks/webhook-event-details-sheet.tsxindex 41f42086ad..56a491eeae 100644--- a/apps/web/ui/webhooks/webhook-event-details-sheet.tsx+++ b/apps/web/ui/webhooks/webhook-event-details-sheet.tsx@@ -1,26 +1,57 @@"use client";import { WebhookEventProps } from "@/lib/types";-import { Button, ButtonTooltip, Sheet, useCopyToClipboard } from "@dub/ui";-import { Copy } from "@dub/ui/icons";+import {+ Button,+ ChevronLeft,+ ChevronRight,+ CopyText,+ Sheet,+ useKeyboardShortcut,+} from "@dub/ui";import { Dispatch, SetStateAction, useEffect, useState } from "react";import type { HighlighterCore } from "shiki";-import { toast } from "sonner";import { X } from "../shared/icons";interface WebhookEventDetailsSheetProps {isOpen: boolean;setIsOpen: Dispatch<SetStateAction<boolean>>;event: WebhookEventProps | null;+ onNext?: () => void;+ onPrevious?: () => void;}function WebhookEventDetailsSheetContent({event,+ onPrevious,+ onNext,}: Omit<WebhookEventDetailsSheetProps, "isOpen" | "setIsOpen">) {const [highlighter, setHighlighter] = useState<HighlighterCore | null>(null);const [responseBody, setResponseBody] = useState("");const [requestBody, setRequestBody] = useState("");+ // right arrow key onNext+ useKeyboardShortcut(+ "ArrowRight",+ () => {+ if (onNext) {+ onNext();+ }+ },+ { sheet: true },+ );++ // left arrow key onPrevious+ useKeyboardShortcut(+ "ArrowLeft",+ () => {+ if (onPrevious) {+ onPrevious();+ }+ },+ { sheet: true },+ );+useEffect(() => {import("shiki").then(({ createHighlighter }) => {createHighlighter({@@ -52,17 +83,39 @@ function WebhookEventDetailsSheetContent({setRequestBody(toHighlightedJson(event.request_body));}, [highlighter, event]);- const [, copyToClipboard] = useCopyToClipboard();-if (!event) return null;return (<div className="flex size-full flex-col">- <div className="p-6">- <div className="flex items-start justify-between">- <Sheet.Title className="text-lg font-semibold">- {event.event}- </Sheet.Title>+ <div className="flex shrink-0 items-center justify-between border-b border-neutral-200 px-6 py-4">+ <Sheet.Title className="flex flex-col">+ <p className="text-lg font-semibold">{event.event}</p>+ <CopyText+ value={event.event_id}+ className="truncate font-mono text-xs text-neutral-400 transition-colors hover:text-neutral-600"+ >+ {event.event_id}+ </CopyText>+ </Sheet.Title>+ <div className="flex items-center gap-4">+ <div className="flex items-center">+ <Button+ type="button"+ disabled={!onPrevious}+ onClick={onPrevious}+ variant="secondary"+ className="size-9 rounded-l-lg rounded-r-none p-0"+ icon={<ChevronLeft className="size-3.5" />}+ />+ <Button+ type="button"+ disabled={!onNext}+ onClick={onNext}+ variant="secondary"+ className="-ml-px size-9 rounded-l-none rounded-r-lg p-0"+ icon={<ChevronRight className="size-3.5" />}+ />+ </div><Sheet.Close asChild><Buttonvariant="outline"@@ -71,24 +124,9 @@ function WebhookEventDetailsSheetContent({/></Sheet.Close></div>- <div className="group flex items-center gap-2">- <p className="font-mono text-sm text-neutral-500">{event.event_id}</p>- <ButtonTooltip- tooltipProps={{- content: "Copy event ID",- }}- onClick={() =>- toast.promise(copyToClipboard(event.event_id), {- success: "Copied to clipboard",- })- }- >- <Copy className="size-4 opacity-0 transition-opacity group-hover:opacity-100" />- </ButtonTooltip>- </div></div><div className="scrollbar-hide flex min-h-0 flex-1 flex-col overflow-y-auto">- <div className="grid gap-4 border-t border-neutral-200 bg-white p-6">+ <div className="grid gap-4 bg-white p-6"><h4 className="font-semibold">Response</h4><div className="flex items-center gap-8"><p className="text-sm text-neutral-500">HTTP status code</p>@@ -115,6 +153,8 @@ export function WebhookEventDetailsSheet({isOpen,setIsOpen,event,+ onNext,+ onPrevious,}: WebhookEventDetailsSheetProps) {return (<Sheet@@ -122,28 +162,11 @@ export function WebhookEventDetailsSheet({onOpenChange={setIsOpen}contentProps={{ className: "md:w-[650px]" }}>- <WebhookEventDetailsSheetContent event={event} />- </Sheet>- );-}--export function useWebhookEventDetailsSheet() {- const [isOpen, setIsOpen] = useState(false);- const [event, setEvent] = useState<WebhookEventProps | null>(null);-- const openWithEvent = (e: WebhookEventProps) => {- setEvent(e);- setIsOpen(true);- };-- return {- webhookEventDetailsSheet: event ? (- <WebhookEventDetailsSheet+ <WebhookEventDetailsSheetContentevent={event}- isOpen={isOpen}- setIsOpen={setIsOpen}+ onNext={onNext}+ onPrevious={onPrevious}/>- ) : null,- openWithEvent,- };+ </Sheet>+ );}diff --git a/apps/web/ui/webhooks/webhook-event-list.tsx b/apps/web/ui/webhooks/webhook-event-list.tsxindex 5dd7de02e3..8c5caf4743 100644--- a/apps/web/ui/webhooks/webhook-event-list.tsx+++ b/apps/web/ui/webhooks/webhook-event-list.tsx@@ -9,14 +9,17 @@ import { PropsWithChildren } from "react";export type WebhookEventListProps = PropsWithChildren<{events: WebhookEventProps[];onEventClick: (event: WebhookEventProps) => void;+ selectedEventId?: string | null;}>;const WebhookEventRow = ({event,onClick,+ isSelected,}: {event: WebhookEventProps;onClick: () => void;+ isSelected?: boolean;}) => {const isSuccess = event.http_status >= 200 && event.http_status < 300;@@ -24,7 +27,9 @@ const WebhookEventRow = ({<buttontype="button"onClick={onClick}- className="flex items-center justify-between gap-5 px-3.5 py-3 hover:bg-neutral-50 focus:outline-none"+ className={`flex items-center justify-between gap-5 px-3.5 py-3 focus:outline-none ${+ isSelected ? "bg-neutral-50" : "hover:bg-neutral-50"+ }`}><div className="flex items-center gap-5"><div className="flex items-center gap-2.5">@@ -64,6 +69,7 @@ const WebhookEventRow = ({export const WebhookEventList = ({events,onEventClick,+ selectedEventId,}: WebhookEventListProps) => {return (<div className="overflow-hidden rounded-md border border-neutral-200">@@ -73,6 +79,7 @@ export const WebhookEventList = ({key={event.event_id}event={event}onClick={() => onEventClick(event)}+ isSelected={selectedEventId === event.event_id}/>))}</div>