The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Standardize UserRowItem
Steven Teya5143666cbd5
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-event-groups-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-event-groups-table.tsxindex e770fea562..1b0ec89753 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-event-groups-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-event-groups-table.tsx@@ -4,7 +4,7 @@ import { FRAUD_RULES_BY_TYPE } from "@/lib/api/fraud/constants";import { mutatePrefix } from "@/lib/swr/mutate";import { useFraudEventGroups } from "@/lib/swr/use-fraud-event-groups";import { useFraudEventsCount } from "@/lib/swr/use-fraud-events-count";-import { fraudEventGroupProps } from "@/lib/types";+import { FraudEventGroupProps } from "@/lib/types";import { useBanPartnerModal } from "@/ui/modals/ban-partner-modal";import { useBulkBanPartnersModal } from "@/ui/modals/bulk-ban-partners-modal";import { FraudReviewSheet } from "@/ui/partners/fraud-risks/fraud-review-sheet";@@ -84,11 +84,11 @@ export function FraudEventGroupsTable() {});const [pendingBanPartners, setPendingBanPartners] = useState<- Array<NonNullable<fraudEventGroupProps["partner"]>>+ Array<NonNullable<FraudEventGroupProps["partner"]>>>([]);const tableRef = useRef<- ReturnType<typeof useTable<fraudEventGroupProps>>["table"] | null+ ReturnType<typeof useTable<FraudEventGroupProps>>["table"] | null>(null);const { BulkBanPartnersModal, setShowBulkBanPartnersModal } =@@ -100,7 +100,7 @@ export function FraudEventGroupsTable() {},});- const { table, ...tableProps } = useTable<fraudEventGroupProps>({+ const { table, ...tableProps } = useTable<FraudEventGroupProps>({data: fraudEvents || [],columns: [{@@ -369,7 +369,7 @@ export function FraudEventGroupsTable() {);}-function RowMenuButton({ row }: { row: Row<fraudEventGroupProps> }) {+function RowMenuButton({ row }: { row: Row<FraudEventGroupProps> }) {const fraudEvent = row.original;const [isOpen, setIsOpen] = useState(false);@@ -465,7 +465,7 @@ function useCurrentFraudEventGroup({fraudEventGroups,groupKey,}: {- fraudEventGroups?: fraudEventGroupProps[];+ fraudEventGroups?: FraudEventGroupProps[];groupKey: string | null;}) {let currentFraudEventGroup = groupKeydiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-events-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-events-modal.tsxindex 7be5f49bf8..f502f79433 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-events-modal.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-events-modal.tsx@@ -4,7 +4,7 @@ import { resolveFraudEventsAction } from "@/lib/actions/fraud/resolve-fraud-evenimport { parseActionError } from "@/lib/actions/parse-action-errors";import { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";-import { fraudEventGroupProps } from "@/lib/types";+import { FraudEventGroupProps } from "@/lib/types";import {MAX_RESOLUTION_REASON_LENGTH,resolveFraudEventsSchema,@@ -34,7 +34,7 @@ function ResolveFraudEventsModal({}: {showResolveFraudEventModal: boolean;setShowResolveFraudEventModal: Dispatch<SetStateAction<boolean>>;- fraudEventGroup: fraudEventGroupProps;+ fraudEventGroup: FraudEventGroupProps;onConfirm?: () => void;}) {const { id: workspaceId } = useWorkspace();@@ -169,7 +169,7 @@ export function useResolveFraudEventsModal({fraudEventGroup,onConfirm,}: {- fraudEventGroup: fraudEventGroupProps;+ fraudEventGroup: FraudEventGroupProps;onConfirm?: () => void;}) {const [showResolveFraudEventModal, setShowResolveFraudEventModal] =diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-event-groups-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-event-groups-table.tsxindex fdab6cdce9..d5bf079a89 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-event-groups-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-event-groups-table.tsx@@ -3,7 +3,7 @@import { FRAUD_RULES_BY_TYPE } from "@/lib/api/fraud/constants";import { useFraudEventGroups } from "@/lib/swr/use-fraud-event-groups";import { useFraudEventsCount } from "@/lib/swr/use-fraud-events-count";-import { fraudEventGroupProps } from "@/lib/types";+import { FraudEventGroupProps } from "@/lib/types";import { FraudReviewSheet } from "@/ui/partners/fraud-risks/fraud-review-sheet";import { PartnerRowItem } from "@/ui/partners/partner-row-item";import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";@@ -83,7 +83,7 @@ export function ResolvedFraudEventGroupsTable() {header: "Event",minSize: 100,maxSize: 400,- cell: ({ row }: { row: Row<fraudEventGroupProps> }) => {+ cell: ({ row }: { row: Row<FraudEventGroupProps> }) => {const reason = FRAUD_RULES_BY_TYPE[row.original.type];const count = row.original.count ?? 1;@@ -121,7 +121,7 @@ export function ResolvedFraudEventGroupsTable() {{id: "resolvedAt",header: "Resolved on",- cell: ({ row }: { row: Row<fraudEventGroupProps> }) => {+ cell: ({ row }: { row: Row<FraudEventGroupProps> }) => {const user = row.original.user;const resolvedAt = row.original.resolvedAt;@@ -135,7 +135,7 @@ export function ResolvedFraudEventGroupsTable() {{id: "partner",header: "Partner",- cell: ({ row }: { row: Row<fraudEventGroupProps> }) => {+ cell: ({ row }: { row: Row<FraudEventGroupProps> }) => {const partner = row.original.partner;if (!partner) return "-";@@ -150,7 +150,7 @@ export function ResolvedFraudEventGroupsTable() {);},meta: {- filterParams: ({ row }: { row: Row<fraudEventGroupProps> }) =>+ filterParams: ({ row }: { row: Row<FraudEventGroupProps> }) =>row.original.partner? {partnerId: row.original.partner.id,@@ -297,7 +297,7 @@ function useCurrentFraudEventGroup({fraudEventGroups,groupKey,}: {- fraudEventGroups?: fraudEventGroupProps[];+ fraudEventGroups?: FraudEventGroupProps[];groupKey: string | null;}) {let currentFraudEventGroup = groupKeydiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsxindex 938932f9ca..bb8cde0ad9 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell.tsx@@ -5,6 +5,7 @@ import { formatDate, formatDateTime, OG_AVATAR_URL } from "@dub/utils";type PayoutPaidCellUser = {id?: string;name?: string | null;+ email?: string | null;image?: string | null;} | null;@@ -33,11 +34,13 @@ export function PayoutPaidCell({{user && (<div className="flex flex-col gap-2"><img- src={user.image || `${OG_AVATAR_URL}${user.name}`}- alt={user.name ?? user.id}+ src={user.image || `${OG_AVATAR_URL}${user.id}`}+ alt={user.name ?? user.email ?? user.id}className="size-6 shrink-0 rounded-full"/>- <p className="text-sm font-medium">{user.name}</p>+ <p className="text-sm font-medium">+ {user.name ?? user.email ?? user.id}+ </p></div>)}<div className="flex items-center gap-1.5 text-xs text-neutral-500">@@ -78,8 +81,8 @@ export function PayoutPaidCell({<div className="flex items-center gap-2">{user && (<img- src={user.image || `${OG_AVATAR_URL}${user.name}`}- alt={user.name ?? user.id}+ src={user.image || `${OG_AVATAR_URL}${user.id}`}+ alt={user.name ?? user.email ?? user.id}className="size-5 shrink-0 rounded-full"/>)}diff --git a/apps/web/lib/api/fraud/get-grouped-fraud-events.ts b/apps/web/lib/api/fraud/get-grouped-fraud-events.tsindex f24b0ccf43..0796bb6503 100644--- a/apps/web/lib/api/fraud/get-grouped-fraud-events.ts+++ b/apps/web/lib/api/fraud/get-grouped-fraud-events.ts@@ -26,6 +26,7 @@ interface QueryResult {partnerImage: string | null;userId: string | null;userName: string | null;+ userEmail: string | null;userImage: string | null;}@@ -80,6 +81,7 @@ export async function getGroupedFraudEvents({p.email AS partnerEmail,p.image AS partnerImage,u.name AS userName,+ u.email AS userEmail,u.image AS userImageFROM (SELECT@@ -122,6 +124,7 @@ export async function getGroupedFraudEvents({? {id: event.userId,name: event.userName,+ email: event.userEmail,image: event.userImage,}: null,diff --git a/apps/web/lib/swr/use-fraud-event-groups.ts b/apps/web/lib/swr/use-fraud-event-groups.tsindex 5ab22359b4..db569266d3 100644--- a/apps/web/lib/swr/use-fraud-event-groups.ts+++ b/apps/web/lib/swr/use-fraud-event-groups.ts@@ -2,7 +2,7 @@ import { useRouterStuff } from "@dub/ui";import { fetcher } from "@dub/utils";import useSWR from "swr";import { z } from "zod";-import { fraudEventGroupProps } from "../types";+import { FraudEventGroupProps } from "../types";import { groupedFraudEventsQuerySchema } from "../zod/schemas/fraud";import useWorkspace from "./use-workspace";@@ -26,7 +26,7 @@ export function useFraudEventGroups({{ exclude },);- const { data, error } = useSWR<fraudEventGroupProps[]>(+ const { data, error } = useSWR<FraudEventGroupProps[]>(enabled && defaultProgramId ? `/api/fraud/events${queryString}` : undefined,fetcher,{diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.tsindex 9a6479d401..795f90cc04 100644--- a/apps/web/lib/types.ts+++ b/apps/web/lib/types.ts@@ -59,8 +59,8 @@ import { DiscountCodeSchema, DiscountSchema } from "./zod/schemas/discount";import { EmailDomainSchema } from "./zod/schemas/email-domains";import { FolderSchema } from "./zod/schemas/folders";import {- groupedFraudEventSchema,fraudRuleSchema,+ groupedFraudEventSchema,updateFraudRuleSettingsSchema,} from "./zod/schemas/fraud";import { GroupWithProgramSchema } from "./zod/schemas/group-with-program";@@ -673,7 +673,7 @@ export type WorkflowAttribute = (typeof WORKFLOW_ATTRIBUTES)[number];export type EmailDomainProps = z.infer<typeof EmailDomainSchema>;-export type fraudEventGroupProps = z.infer<typeof groupedFraudEventSchema>;+export type FraudEventGroupProps = z.infer<typeof groupedFraudEventSchema>;export type ExtendedFraudRuleType =| FraudRuleTypediff --git a/apps/web/lib/zod/schemas/fraud.ts b/apps/web/lib/zod/schemas/fraud.tsindex 788573a22e..362ca328d7 100644--- a/apps/web/lib/zod/schemas/fraud.ts+++ b/apps/web/lib/zod/schemas/fraud.ts@@ -24,11 +24,7 @@ export const groupedFraudEventSchema = z.object({email: true,image: true,}),- user: UserSchema.pick({- id: true,- name: true,- image: true,- }).nullable(),+ user: UserSchema.nullable(),});export const groupedFraudEventsQuerySchema = zdiff --git a/apps/web/lib/zod/schemas/payouts.ts b/apps/web/lib/zod/schemas/payouts.tsindex efa494ea3f..171502ab98 100644--- a/apps/web/lib/zod/schemas/payouts.ts+++ b/apps/web/lib/zod/schemas/payouts.ts@@ -5,6 +5,7 @@ import { z } from "zod";import { getPaginationQuerySchema } from "./misc";import { EnrolledPartnerSchema, PartnerSchema } from "./partners";import { ProgramSchema } from "./programs";+import { UserSchema } from "./users";export const createManualPayoutSchema = z.object({workspaceId: z.string(),@@ -72,13 +73,7 @@ export const PayoutResponseSchema = PayoutSchema.merge(tenantId: z.string().nullable(),}),),- user: z- .object({- id: z.string(),- name: z.string().nullable(),- image: z.string().nullable(),- })- .nullish(),+ user: UserSchema.nullish(),}),);diff --git a/apps/web/lib/zod/schemas/users.ts b/apps/web/lib/zod/schemas/users.tsindex 4d95728491..d4c89a4b39 100644--- a/apps/web/lib/zod/schemas/users.ts+++ b/apps/web/lib/zod/schemas/users.ts@@ -3,5 +3,6 @@ import { z } from "zod";export const UserSchema = z.object({id: z.string(),name: z.string().nullable(),+ email: z.string().nullable(),image: z.string().nullable(),});diff --git a/apps/web/tests/fraud/index.test.ts b/apps/web/tests/fraud/index.test.tsindex 53b5aa38d4..b654e04ab1 100644--- a/apps/web/tests/fraud/index.test.ts+++ b/apps/web/tests/fraud/index.test.ts@@ -1,4 +1,4 @@-import { Customer, fraudEventGroupProps, TrackLeadResponse } from "@/lib/types";+import { Customer, FraudEventGroupProps, TrackLeadResponse } from "@/lib/types";import { FraudRuleType } from "@prisma/client";import { randomCustomer, retry } from "tests/utils/helpers";import { HttpClient } from "tests/utils/http";@@ -234,7 +234,7 @@ async function waitForFraudEvent({}) {return await retry(async () => {- const { data } = await http.get<fraudEventGroupProps[]>({+ const { data } = await http.get<FraudEventGroupProps[]>({path: "/fraud/events",query: {partnerId,diff --git a/apps/web/ui/partners/fraud-risks/commissions-on-hold-table.tsx b/apps/web/ui/partners/fraud-risks/commissions-on-hold-table.tsxindex 85f0e85c3f..f6c2f3ac78 100644--- a/apps/web/ui/partners/fraud-risks/commissions-on-hold-table.tsx+++ b/apps/web/ui/partners/fraud-risks/commissions-on-hold-table.tsx@@ -1,5 +1,5 @@import useWorkspace from "@/lib/swr/use-workspace";-import { CommissionResponse, fraudEventGroupProps } from "@/lib/types";+import { CommissionResponse, FraudEventGroupProps } from "@/lib/types";import { COMMISSIONS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/commissions";import { CustomerRowItem } from "@/ui/customers/customer-row-item";import {@@ -23,7 +23,7 @@ import { CommissionTypeBadge } from "../commission-type-badge";export function CommissionsOnHoldTable({fraudEventGroup,}: {- fraudEventGroup: fraudEventGroupProps;+ fraudEventGroup: FraudEventGroupProps;}) {const workspace = useWorkspace();const { id: workspaceId, slug } = workspace;diff --git a/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsx b/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsxindex 07d40db82f..e2934b9e7d 100644--- a/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsx+++ b/apps/web/ui/partners/fraud-risks/fraud-events-tables/index.tsx@@ -1,4 +1,4 @@-import { fraudEventGroupProps } from "@/lib/types";+import { FraudEventGroupProps } from "@/lib/types";import { FraudRuleType } from "@dub/prisma/client";import React from "react";import { FraudCrossProgramBanTable } from "./fraud-cross-program-ban-table";@@ -21,7 +21,7 @@ const FRAUD_EVENTS_TABLES: Partial<Record<FraudRuleType, React.ComponentType>> =export function FraudEventsTableWrapper({fraudEventGroup,}: {- fraudEventGroup: fraudEventGroupProps;+ fraudEventGroup: FraudEventGroupProps;}) {const TableComponent = FRAUD_EVENTS_TABLES[fraudEventGroup.type];diff --git a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsxindex aa3ee49e58..6ecc461d6d 100644--- a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx+++ b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx@@ -1,7 +1,7 @@"use client";import { FRAUD_RULES_BY_TYPE } from "@/lib/api/fraud/constants";-import { fraudEventGroupProps } from "@/lib/types";+import { FraudEventGroupProps } from "@/lib/types";import { useBanPartnerModal } from "@/ui/modals/ban-partner-modal";import { X } from "@/ui/shared/icons";import {@@ -25,7 +25,7 @@ import { CommissionsOnHoldTable } from "./commissions-on-hold-table";import { FraudEventsTableWrapper } from "./fraud-events-tables";interface FraudReviewSheetProps {- fraudEventGroup: fraudEventGroupProps;+ fraudEventGroup: FraudEventGroupProps;setIsOpen: Dispatch<SetStateAction<boolean>>;onNext?: () => void;onPrevious?: () => void;@@ -199,8 +199,8 @@ function FraudReviewSheetContent({{user && (<div className="flex flex-col gap-2"><img- src={user.image || `${OG_AVATAR_URL}${user.name}`}- alt={user.name || user.id}+ src={user.image || `${OG_AVATAR_URL}${user.id}`}+ alt={user.name ?? user.email ?? user.id}className="size-6 shrink-0 rounded-full"/><p className="text-sm font-medium">{user.name}</p>@@ -220,8 +220,8 @@ function FraudReviewSheetContent({>{user && (<img- src={user.image || `${OG_AVATAR_URL}${user.name}`}- alt={user.name || user.id}+ src={user.image || `${OG_AVATAR_URL}${user.id}`}+ alt={user.name ?? user.email ?? user.id}className="size-5 shrink-0 rounded-full"/>)}diff --git a/apps/web/ui/users/user-row-item.tsx b/apps/web/ui/users/user-row-item.tsxindex 6e742f0a28..7e4f7b623b 100644--- a/apps/web/ui/users/user-row-item.tsx+++ b/apps/web/ui/users/user-row-item.tsx@@ -10,12 +10,12 @@ export function UserRowItem({date,label,}: {- user: Pick<UserProps, "id" | "name" | "image">;+ user: UserProps;date: Date;label: string;}) {- const image = user.image || `${OG_AVATAR_URL}${user.name}`;- const name = user.name ?? user.id;+ const image = user.image || `${OG_AVATAR_URL}${user.id}`;+ const name = user.name ?? user.email ?? user.id;return (<Tooltip