The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
address CR feedback, show marketplace icon in admin
Steven Teya851b7d8613e
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsxindex 7a109508cb..57b2e8809d 100644--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx@@ -1,6 +1,7 @@"use client";import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";+import { adminCommissionsDataSchema } from "@/lib/zod/schemas/admin";import { AnalyticsLoadingSpinner } from "@/ui/analytics/analytics-loading-spinner";import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";@@ -8,12 +9,13 @@ import {CrownSmall,Filter,Table,+ Tooltip,usePagination,useRouterStuff,useTable,} from "@dub/ui";import { Areas, TimeSeriesChart, XAxis, YAxis } from "@dub/ui/charts";-import { GridIcon } from "@dub/ui/icons";+import { GridIcon, Shop } from "@dub/ui/icons";import {cn,currencyFormatter,@@ -25,6 +27,7 @@ import {import NumberFlow from "@number-flow/react";import { Fragment, Suspense, useCallback, useMemo } from "react";import useSWR from "swr";+import * as z from "zod/v4";export default function CommissionsPage() {return (@@ -34,32 +37,22 @@ export default function CommissionsPage() {);}+type AdminCommissionsData = z.infer<typeof adminCommissionsDataSchema>;+function CommissionsPageClient() {const { queryParams, getQueryString, searchParamsObj } = useRouterStuff();const { interval, start, end, programId } = searchParamsObj;- const { data: { programs, timeseries } = {}, isLoading } = useSWR<{- programs: {- id: string;- name: string;- url: string;- logo: string;- commissions: number;- fees: number;- }[];- timeseries: {- start: Date;- commissions: number;- }[];- }>(- `/api/admin/commissions${getQueryString({- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,- })}`,- fetcher,- {- keepPreviousData: true,- },- );+ const { data: { programs, timeseries } = {}, isLoading } =+ useSWR<AdminCommissionsData>(+ `/api/admin/commissions${getQueryString({+ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,+ })}`,+ fetcher,+ {+ keepPreviousData: true,+ },+ );// Filter configurationconst filters = useMemo(@@ -206,6 +199,38 @@ function CommissionsPageClient() {>{getDomainWithoutWWW(row.original.url)}</a>+ {row.original.addedToMarketplaceAt && (+ <Tooltip+ content={+ <div className="max-w-[220px] px-3 py-2.5 text-center">+ <p className="text-sm font-medium text-neutral-900">+ Dub Marketplace+ </p>+ <p className="mt-1 text-xs leading-snug text-neutral-500">+ Listed since{" "}+ {new Intl.DateTimeFormat("en-US", {+ month: "short",+ day: "numeric",+ year: "numeric",+ }).format(new Date(row.original.addedToMarketplaceAt))}+ </p>+ </div>+ }+ >+ <span+ className={cn(+ "ml-1 inline-flex size-6 shrink-0 cursor-default items-center justify-center rounded-md",+ "border border-teal-200/90 bg-gradient-to-br from-white to-teal-50/90",+ "text-teal-700 shadow-sm ring-1 ring-inset ring-white",+ "transition-shadow duration-150 hover:shadow-md",+ "outline-none focus-visible:ring-2 focus-visible:ring-teal-400/35 focus-visible:ring-offset-2 focus-visible:ring-offset-white",+ )}+ aria-label="Listed on Dub Marketplace"+ >+ <Shop className="size-3.5 shrink-0" aria-hidden />+ </span>+ </Tooltip>+ )}</div>),meta: {diff --git a/apps/web/app/(ee)/api/admin/commissions/route.ts b/apps/web/app/(ee)/api/admin/commissions/route.tsindex c1bdf61978..df5fea83c1 100644--- a/apps/web/app/(ee)/api/admin/commissions/route.ts+++ b/apps/web/app/(ee)/api/admin/commissions/route.ts@@ -1,5 +1,6 @@import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";import { withAdmin } from "@/lib/auth";+import { adminCommissionsDataSchema } from "@/lib/zod/schemas/admin";import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";import { DUB_FOUNDING_DATE } from "@dub/utils";import { endOfDay, startOfDay } from "date-fns";@@ -45,8 +46,10 @@ export const GET = withAdmin(async ({ searchParams }) => {}),]);- return NextResponse.json({- programs,- timeseries,- });+ return NextResponse.json(+ adminCommissionsDataSchema.parse({+ programs,+ timeseries,+ }),+ );});diff --git a/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.tsindex acd6c08752..b12dab2cc5 100644--- a/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts+++ b/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts@@ -147,7 +147,8 @@ export async function checkoutSessionCompleted(reactivateProgram(updatedWorkspace.defaultProgramId),// If no programOnboarding data (Links trial), send TrialStartedEmail// For program trial we send it in create-program.ts- !updatedWorkspace.store?.["programOnboarding"] &&+ subscription.status === "trialing" &&+ !updatedWorkspace.store?.["programOnboarding"] &&sendBatchEmail(users.map((user) => ({to: user.email as string,diff --git a/apps/web/lib/zod/schemas/admin.ts b/apps/web/lib/zod/schemas/admin.tsindex 1b59ff46d6..8ddba03c54 100644--- a/apps/web/lib/zod/schemas/admin.ts+++ b/apps/web/lib/zod/schemas/admin.ts@@ -13,30 +13,26 @@ import {} from "./partners";import { ProgramSchema } from "./programs";import { UserSchema } from "./users";-import { centsSchema } from "./utils";+import { centsSchema, parseDateSchema } from "./utils";-export const adminFraudAlertSchema = z.object({- id: z.string(),- reason: z.string(),- status: z.enum(FraudAlertStatus),- reviewedAt: z.date().nullable(),- reviewNote: z.string().nullable(),- createdAt: z.date(),- partner: PartnerSchema.pick({- id: true,- name: true,- email: true,- image: true,- }),- program: ProgramSchema.pick({- id: true,- name: true,- logo: true,- }),- reviewedBy: UserSchema.pick({- id: true,- name: true,- }).nullable(),+export const adminCommissionsDataSchema = z.object({+ programs: z.array(+ z.object({+ id: z.string(),+ name: z.string(),+ url: z.string(),+ logo: z.string(),+ addedToMarketplaceAt: z.date().nullable(),+ commissions: z.number(),+ fees: z.number(),+ }),+ ),+ timeseries: z.array(+ z.object({+ start: parseDateSchema,+ commissions: z.number(),+ }),+ ),});export const adminNetworkPartnerSchema = EnrolledPartnerSchemaExtended.pick({@@ -95,3 +91,27 @@ export const adminNetworkPartnerQuerySchema = zsortOrder: z.enum(["asc", "desc"]).optional().default("desc"),}).extend(getPaginationQuerySchema({ pageSize: 100 }));++export const adminFraudAlertSchema = z.object({+ id: z.string(),+ reason: z.string(),+ status: z.enum(FraudAlertStatus),+ reviewedAt: z.date().nullable(),+ reviewNote: z.string().nullable(),+ createdAt: z.date(),+ partner: PartnerSchema.pick({+ id: true,+ name: true,+ email: true,+ image: true,+ }),+ program: ProgramSchema.pick({+ id: true,+ name: true,+ logo: true,+ }),+ reviewedBy: UserSchema.pick({+ id: true,+ name: true,+ }).nullable(),+});