Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Add resolved/expired status tabs to risk events table (#4013)

Kiran K6cb353efa3f1
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/expired/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/expired/page.tsx
new file mode 100644
index 0000000000..de2bd8789e
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/expired/page.tsx
@@ -0,0 +1,5 @@
+import { ResolvedRiskEventsTable } from "../resolved-risk-events-table";
+
+export default function ExpiredRiskEventsPage() {
+ return <ResolvedRiskEventsTable status="expired" />;
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/layout.tsx
new file mode 100644
index 0000000000..d5830776f7
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/layout.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import useWorkspace from "@/lib/swr/use-workspace";
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { usePathname } from "next/navigation";
+import { ReactNode } from "react";
+import { RiskHistoryNav } from "./risk-history-nav";
+
+export default function RiskHistoryLayout({ children }: { children: ReactNode }) {
+ const { slug } = useWorkspace();
+ const pathname = usePathname();
+
+ const title = pathname.endsWith("/expired")
+ ? "Expired risk events"
+ : "Resolved risk events";
+
+ return (
+ <PageContent
+ title={title}
+ titleBackHref={`/${slug}/program/risks`}
+ >
+ <PageWidthWrapper>
+ <div className="border-border-subtle overflow-hidden rounded-xl border bg-neutral-100">
+ <RiskHistoryNav />
+ <div className="border-border-subtle -mx-px -mb-px rounded-xl border bg-white p-4">
+ {children}
+ </div>
+ </div>
+ </PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/resolved/resolved-risk-events-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved-risk-events-table.tsx
similarity index 78%
rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/resolved/resolved-risk-events-table.tsx
rename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved-risk-events-table.tsx
index 8f03d3bda2..38ffe497bc 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/resolved/resolved-risk-events-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved-risk-events-table.tsx
@@ -1,6 +1,9 @@
"use client";
-import { FRAUD_RULES_BY_TYPE } from "@/lib/api/fraud/constants";
+import {
+ FRAUD_GROUP_EXPIRY_DAYS,
+ FRAUD_RULES_BY_TYPE,
+} from "@/lib/api/fraud/constants";
import { useFraudGroups } from "@/lib/swr/use-fraud-groups";
import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
import { FraudGroupProps } from "@/lib/types";
@@ -21,22 +24,26 @@ import {
} from "@dub/ui";
import { cn, formatDate } from "@dub/utils";
import { Row } from "@tanstack/react-table";
+import { addDays } from "date-fns";
import { useEffect, useMemo, useState } from "react";
import { useFraudGroupFilters } from "../use-fraud-group-filters";
-export function ResolvedRiskEventsTable() {
+type StatusTab = "resolved" | "expired";
+
+export function ResolvedRiskEventsTable({ status }: { status: StatusTab }) {
const { queryParams, searchParams, searchParamsObj } = useRouterStuff();
const { pagination, setPagination } = usePagination();
- const sortBy = searchParams.get("sortBy") || "resolvedAt";
+ const defaultSortBy = status === "expired" ? "lastEventAt" : "resolvedAt";
+ const sortBy = searchParams.get("sortBy") || defaultSortBy;
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
const isFiltered = Object.keys(searchParamsObj).some(
- (key) => !["sortBy", "sortOrder", "page"].includes(key),
+ (key) => !["sortBy", "sortOrder", "page", "groupId"].includes(key),
);
const { fraudGroups, loading, error } = useFraudGroups({
query: {
- status: "resolved",
+ status,
},
exclude: ["groupId"],
});
@@ -58,16 +65,17 @@ export function ResolvedRiskEventsTable() {
const { currentFraudGroup } = useCurrentFraudGroup({
fraudGroups,
groupId: detailsSheetState.groupId,
+ status,
});
const { fraudGroupCount, error: countError } = useFraudGroupCount<number>({
query: {
- status: "resolved",
+ status,
},
});
- const columns = useMemo(
- () => [
+ const columns = useMemo(() => {
+ const baseColumns = [
{
id: "type",
header: "Event",
@@ -128,6 +136,34 @@ export function ResolvedRiskEventsTable() {
: {},
},
},
+ ];
+
+ if (status === "expired") {
+ return [
+ ...baseColumns,
+ {
+ id: "expiredAt",
+ header: "Expired on",
+ meta: {
+ headerTooltip: `Risk events are automatically expired ${FRAUD_GROUP_EXPIRY_DAYS} days after the last detection if not resolved.`,
+ },
+ cell: ({ row }: { row: Row<FraudGroupProps> }) =>
+ formatDate(
+ addDays(
+ new Date(row.original.lastEventAt),
+ FRAUD_GROUP_EXPIRY_DAYS,
+ ),
+ {
+ month: "short",
+ year: undefined,
+ },
+ ),
+ },
+ ];
+ }
+
+ return [
+ ...baseColumns,
{
id: "resolvedAt",
header: "Resolved on",
@@ -165,9 +201,8 @@ export function ResolvedRiskEventsTable() {
);
},
},
- ],
- [],
- );
+ ];
+ }, [status]);
const { table, ...tableProps } = useTable({
data: fraudGroups || [],
@@ -194,11 +229,11 @@ export function ResolvedRiskEventsTable() {
},
thClassName: "border-l-0",
tdClassName: "border-l-0",
- resourceName: (plural) => `resolved risk event${plural ? "s" : ""}`,
+ resourceName: (plural) => `${status} risk event${plural ? "s" : ""}`,
rowCount: fraudGroupCount ?? 0,
loading,
error:
- error || countError ? "Failed to load resolved risk events" : undefined,
+ error || countError ? `Failed to load ${status} risk events` : undefined,
});
const [previousGroupId, nextGroupId] = useMemo(() => {
@@ -217,8 +252,26 @@ export function ResolvedRiskEventsTable() {
];
}, [fraudGroups, detailsSheetState.groupId]);
+ let emptyState: { title: string; description: string };
+
+ if (status === "expired") {
+ emptyState = {
+ title: "No expired risk events found",
+ description: isFiltered
+ ? "No expired risk events found for the selected filters."
+ : "No risk events have expired yet.",
+ };
+ } else {
+ emptyState = {
+ title: "No resolved risk events found",
+ description: isFiltered
+ ? "No resolved risk events found for the selected filters."
+ : "No risk events have been resolved yet.",
+ };
+ }
+
return (
- <div className="flex flex-col gap-6">
+ <div className="flex flex-col gap-4">
{detailsSheetState.groupId && currentFraudGroup && (
<RiskReviewSheet
isOpen={detailsSheetState.open}
@@ -244,18 +297,15 @@ export function ResolvedRiskEventsTable() {
}
/>
)}
- <ResolvedRiskEventsFilters />
+
+ <ResolvedRiskEventsFilters status={status} />
{fraudGroups?.length !== 0 ? (
<Table {...tableProps} table={table} />
) : (
<AnimatedEmptyState
- title="No resolved risk events found"
- description={
- isFiltered
- ? "No resolved risk events found for the selected filters."
- : "No risk events have been resolved yet."
- }
+ title={emptyState.title}
+ description={emptyState.description}
cardContent={() => (
<>
<Flag className="size-4 text-neutral-700" />
@@ -268,7 +318,7 @@ export function ResolvedRiskEventsTable() {
);
}
-function ResolvedRiskEventsFilters() {
+function ResolvedRiskEventsFilters({ status }: { status: StatusTab }) {
const {
filters,
activeFilters,
@@ -278,7 +328,7 @@ function ResolvedRiskEventsFilters() {
setSearch,
setSelectedFilter,
} = useFraudGroupFilters({
- status: "resolved",
+ status,
});
return (
@@ -317,9 +367,11 @@ function ResolvedRiskEventsFilters() {
function useCurrentFraudGroup({
fraudGroups,
groupId,
+ status,
}: {
fraudGroups?: FraudGroupProps[];
groupId: string | null;
+ status: StatusTab;
}) {
let currentFraudGroup = groupId
? fraudGroups?.find((fraudGroup) => fraudGroup.id === groupId)
@@ -330,7 +382,11 @@ function useCurrentFraudGroup({
const { fraudGroups: fetchedFraudGroups, loading: isLoading } =
useFraudGroups({
- query: { groupId: groupId ?? undefined },
+ query: {
+ groupId: groupId ?? undefined,
+ status,
+ },
+ exclude: ["page"],
enabled: Boolean(shouldFetch),
});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved/page.tsx
new file mode 100644
index 0000000000..a4088a5c31
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved/page.tsx
@@ -0,0 +1,5 @@
+import { ResolvedRiskEventsTable } from "../resolved-risk-events-table";
+
+export default function ResolvedRiskEventsPage() {
+ return <ResolvedRiskEventsTable status="resolved" />;
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/risk-history-nav.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/risk-history-nav.tsx
new file mode 100644
index 0000000000..6abbdf2387
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/risk-history-nav.tsx
@@ -0,0 +1,30 @@
+"use client";
+
+import useWorkspace from "@/lib/swr/use-workspace";
+import { PageNavTabs } from "@/ui/layout/page-nav-tabs";
+import { CircleCheck, CircleHalfDottedClock } from "@dub/ui/icons";
+
+const RISK_HISTORY_TABS = [
+ {
+ id: "resolved",
+ label: "Resolved",
+ icon: CircleCheck,
+ },
+ {
+ id: "expired",
+ label: "Expired",
+ icon: CircleHalfDottedClock,
+ },
+];
+
+export function RiskHistoryNav() {
+ const { slug } = useWorkspace();
+
+ return (
+ <PageNavTabs
+ basePath={`/${slug}/program/risks`}
+ tabs={RISK_HISTORY_TABS}
+ preservedQueryParams={["type", "partnerId"]}
+ />
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/resolved/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/resolved/page.tsx
deleted file mode 100644
index ecd0c1312b..0000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/resolved/page.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { PageContent } from "@/ui/layout/page-content";
-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { ResolvedRiskEventsTable } from "./resolved-risk-events-table";
-
-export default async function ResolvedRiskEventsPage(props: {
- params: Promise<{ slug: string }>;
-}) {
- const params = await props.params;
-
- return (
- <PageContent
- title="Resolved risk events"
- titleBackHref={`/${params.slug}/program/risks`}
- >
- <PageWidthWrapper>
- <ResolvedRiskEventsTable />
- </PageWidthWrapper>
- </PageContent>
- );
-}
diff --git a/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx b/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
index dede50e1df..23ef20364f 100644
--- a/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
+++ b/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
@@ -49,6 +49,12 @@ const COMMISSION_BLOCKING_FRAUD_TYPE: FraudRuleType[] = [
FraudRuleType.paidTrafficDetected,
];
+const SHEET_TITLES: Record<FraudGroupProps["status"], string> = {
+ pending: "Risk event review",
+ resolved: "Resolved risk event",
+ expired: "Expired risk event",
+};
+
function RiskReviewSheetContent({
fraudGroup,
onPrevious,
@@ -146,9 +152,7 @@ function RiskReviewSheetContent({
>
<div className="flex h-16 shrink-0 items-center justify-between border-b border-neutral-200 px-6 py-4">
<Sheet.Title className="text-lg font-semibold">
- {fraudGroup.status === "pending"
- ? "Risk event review"
- : "Resolved risk event"}
+ {SHEET_TITLES[fraudGroup.status]}
</Sheet.Title>
<div className="flex items-center gap-2">