Merge branch 'main' into group-move

Author: devkiran

apps/web/app/(ee)/api/customers/[id]/activity/route.ts

@@ -46,22 +46,9 @@ export const GET = withWorkspace(async ({ workspace, params }) => {
     link = decodeLinkIfCaseSensitive(link);
   }
 
-  // Find the time to lead of the customer
-  const timeToLead =
-    customer.clickedAt && customer.createdAt
-      ? customer.createdAt.getTime() - customer.clickedAt.getTime()
-      : null;
-
-  const timeToSale =
-    customer.firstSaleAt && customer.createdAt
-      ? customer.firstSaleAt.getTime() - customer.createdAt.getTime()
-      : null;
-
   return NextResponse.json(
     customerActivityResponseSchema.parse({
       ...customer,
-      timeToLead,
-      timeToSale,
       events,
       link,
     }),

apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/[customerId]/route.ts

@@ -10,6 +10,7 @@ import {
 import { generateRandomName } from "@/lib/names";
 import { PartnerProfileCustomerSchema } from "@/lib/zod/schemas/partner-profile";
 import { prisma } from "@dub/prisma";
+import { CommissionType } from "@dub/prisma/client";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
@@ -41,6 +42,19 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
     where: {
       id: customerId,
     },
+    include: {
+      // find the first sale commission for this customer and partner
+      commissions: {
+        where: {
+          partnerId: partner.id,
+          type: CommissionType.sale,
+        },
+        take: 1,
+        orderBy: {
+          createdAt: "asc",
+        },
+      },
+    },
   });
 
   if (!customer || customer?.projectId !== program.workspaceId) {
@@ -65,23 +79,16 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
   // get the first partner link that this customer interacted with
   const firstLinkId = events[events.length - 1].link_id;
   const link = links.find((link) => link.id === firstLinkId);
-
-  const timeToLead =
-    customer.clickedAt && customer.createdAt
-      ? customer.createdAt.getTime() - customer.clickedAt.getTime()
-      : null;
-
-  const timeToSale =
-    customer.firstSaleAt && customer.createdAt
-      ? customer.firstSaleAt.getTime() - customer.createdAt.getTime()
-      : null;
+  const firstSaleAt =
+    customer.commissions[0]?.createdAt ?? customer.firstSaleAt;
 
   return NextResponse.json(
     PartnerProfileCustomerSchema.extend({
       ...(customerDataSharingEnabledAt && { name: z.string().nullish() }),
     }).parse({
       ...transformCustomer({
         ...customer,
+        firstSaleAt,
         email: customer.email
           ? customerDataSharingEnabledAt
             ? customer.email
@@ -90,8 +97,6 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
       }),
       activity: {
         ...customer,
-        timeToLead,
-        timeToSale,
         events,
         link,
       },

apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.ts

@@ -12,6 +12,7 @@ import {
   getPartnerCustomersQuerySchema,
 } from "@/lib/zod/schemas/partner-profile";
 import { prisma, sanitizeFullTextSearch } from "@dub/prisma";
+import { CommissionType } from "@dub/prisma/client";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
@@ -61,6 +62,16 @@ export const GET = withPartnerProfile(
       },
       include: {
         link: true,
+        commissions: {
+          where: {
+            partnerId: partner.id,
+            type: CommissionType.sale,
+          },
+          take: 1,
+          orderBy: {
+            createdAt: "asc",
+          },
+        },
       },
       orderBy: {
         [sortBy]: sortOrder,
@@ -71,16 +82,15 @@ export const GET = withPartnerProfile(
 
     // Map customers with their data
     const customersWithData = customers.map((customer) => {
-      const timeToLead =
-        customer.clickedAt && customer.createdAt
-          ? customer.createdAt.getTime() - customer.clickedAt.getTime()
-          : null;
+      const firstSaleAt =
+        customer.commissions[0]?.createdAt ?? customer.firstSaleAt;
 
       return PartnerProfileCustomerSchema.extend({
         ...(customerDataSharingEnabledAt && { name: z.string().nullish() }),
       }).parse({
         ...transformCustomer({
           ...customer,
+          firstSaleAt,
           email: customer.email
             ? customerDataSharingEnabledAt
               ? customer.email
@@ -89,8 +99,6 @@ export const GET = withPartnerProfile(
         }),
         activity: {
           ...customer,
-          timeToLead,
-          timeToSale: null,
           events: [],
           link: customer.link,
         },

apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts

@@ -32,7 +32,7 @@ export const GET = withWorkspace(
     });
 
     // approved and archived statuses
-    const trustedPrograms = programEnrollments
+    const activePrograms = programEnrollments
       .filter((enrollment) =>
         ACTIVE_ENROLLMENT_STATUSES.includes(enrollment.status),
       )
@@ -45,8 +45,8 @@ export const GET = withWorkspace(
 
     return NextResponse.json(
       partnerCrossProgramSummarySchema.parse({
-        totalPrograms: trustedPrograms + bannedPrograms,
-        trustedPrograms,
+        totalPrograms: activePrograms + bannedPrograms,
+        activePrograms,
         bannedPrograms,
       }),
     );

apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page-client.tsx

@@ -278,12 +278,7 @@ export function ProgramCustomersPageClient() {
     onPaginationChange: setPagination,
     columnVisibility,
     onColumnVisibilityChange: setColumnVisibility,
-    sortableColumns: [
-      "saleAmount",
-      "createdAt",
-      "firstSaleAt",
-      "subscriptionCanceledAt",
-    ],
+    sortableColumns: ["saleAmount", "createdAt"],
     sortBy,
     sortOrder,
     onSortChange: ({ sortBy, sortOrder }) =>

apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx

@@ -10,10 +10,11 @@ import { CustomerSalesTable } from "@/ui/customers/customer-sales-table";
 import { PageContent } from "@/ui/layout/page-content";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 import { ProgramRewardList } from "@/ui/partners/program-reward-list";
-import { ChevronRight, MoneyBill2, Tooltip, UserCheck } from "@dub/ui";
+import { ChevronRight, MoneyBill2, Tooltip, User } from "@dub/ui";
 import { cn, fetcher, formatDate } from "@dub/utils";
 import { addMonths, isBefore } from "date-fns";
 import { AlertCircle } from "lucide-react";
+import Link from "next/link";
 import { redirect, useParams } from "next/navigation";
 import { memo, useMemo } from "react";
 import useSWR from "swr";
@@ -30,8 +31,7 @@ export function ProgramCustomerPageClient() {
   });
 
   const rewardPeriodEndDate = useMemo(() => {
-    if (!programEnrollment?.rewards || !customer?.activity?.firstSaleAt)
-      return null;
+    if (!programEnrollment?.rewards || !customer?.firstSaleAt) return null;
     const saleReward = programEnrollment?.rewards.find(
       (r) => r.event === "sale",
     );
@@ -42,7 +42,7 @@ export function ProgramCustomerPageClient() {
       return null;
 
     // add the max duration to the first sale date
-    return addMonths(customer.activity.firstSaleAt, saleReward.maxDuration);
+    return addMonths(customer.firstSaleAt, saleReward.maxDuration);
   }, [programEnrollment, customer]);
 
   if ((!customer && !isLoading) || !showDetailedAnalytics) {
@@ -53,17 +53,17 @@ export function ProgramCustomerPageClient() {
     <PageContent
       title={
         <div className="flex items-center gap-1.5">
-          <div
-            // href={`/programs/${programSlug}/customers`}
-            // aria-label="Back to customers"
-            // title="Back to customers"
+          <Link
+            href={`/programs/${programSlug}/customers`}
+            aria-label="Back to customers"
+            title="Back to customers"
             className={cn(
               "bg-bg-subtle flex size-8 shrink-0 items-center justify-center rounded-lg",
-              // "hover:bg-bg-emphasis transition-[transform,background-color] duration-150 active:scale-95",
+              "hover:bg-bg-emphasis transition-[transform,background-color] duration-150 active:scale-95",
             )}
           >
-            <UserCheck className="size-4" />
-          </div>
+            <User className="size-4" />
+          </Link>
           <ChevronRight className="text-content-muted size-2.5 shrink-0 [&_*]:stroke-2" />
           <div>
             {customer ? (

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/layout.tsx

@@ -11,7 +11,7 @@ import { CustomerTabs } from "@/ui/customers/customer-tabs";
 import { PageContent } from "@/ui/layout/page-content";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 import { Button } from "@dub/ui";
-import { ChevronRight, UserCheck } from "@dub/ui/icons";
+import { ChevronRight, User } from "@dub/ui/icons";
 import Link from "next/link";
 import { redirect, useParams } from "next/navigation";
 import { ReactNode } from "react";
@@ -43,7 +43,7 @@ export default function CustomerLayout({ children }: { children: ReactNode }) {
             title="Back to customers"
             className="bg-bg-subtle hover:bg-bg-emphasis flex size-8 shrink-0 items-center justify-center rounded-lg transition-[transform,background-color] duration-150 active:scale-95"
           >
-            <UserCheck className="size-4" />
+            <User className="size-4" />
           </Link>
           <ChevronRight className="text-content-muted size-2.5 shrink-0 [&_*]:stroke-2" />
           <div>

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-help-and-support.tsx

@@ -52,6 +52,7 @@ export function ProgramHelpAndSupportContent({
     control,
     register,
     handleSubmit,
+    getValues,
     formState: { isDirty, isValid, isSubmitting },
   } = useForm<FormData>({
     mode: "onBlur",
@@ -67,6 +68,15 @@ export function ProgramHelpAndSupportContent({
     onSuccess: async () => {
       toast.success("Communication settings updated successfully.");
       await mutate(`/api/programs/${program?.id}?workspaceId=${workspaceId}`);
+
+      // Notify other tabs (e.g., the application builder) that program data changed
+      try {
+        const channel = new BroadcastChannel("program-terms-updated");
+        channel.postMessage({ termsUrl: getValues("termsUrl") || null });
+        channel.close();
+      } catch {
+        // BroadcastChannel not supported, fall back to revalidateOnFocus
+      }
     },
     onError: ({ error }) => {
       toast.error(

apps/web/lib/zod/schemas/customer-activity.ts

@@ -2,11 +2,6 @@ import * as z from "zod/v4";
 import { LinkSchema } from "./links";
 
 export const customerActivityResponseSchema = z.object({
-  saleAmount: z.number(),
-  timeToLead: z.number().nullable(),
-  timeToSale: z.number().nullable(),
-  firstSaleAt: z.date().nullable(),
-  subscriptionCanceledAt: z.date().nullable(),
   events: z.array(z.any()), // we've already parsed the events in get-customer-events.ts
   link: LinkSchema.pick({
     id: true,

apps/web/lib/zod/schemas/partners.ts

@@ -852,6 +852,6 @@ export const partnerPayoutSettingsSchema = z.object({
 
 export const partnerCrossProgramSummarySchema = z.object({
   totalPrograms: z.number(),
-  trustedPrograms: z.number(),
+  activePrograms: z.number(),
   bannedPrograms: z.number(),
 });