[pull] main from dubinc:main

apps/web/app/api/partner-profile/programs/[programId]/analytics/route.ts

@@ -1,7 +1,7 @@
 import { getAnalytics } from "@/lib/analytics/get-analytics";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { withPartnerProfile } from "@/lib/auth/partner";
-import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { partnerProfileAnalyticsQuerySchema } from "@/lib/zod/schemas/partner-profile";
 import { prisma } from "@dub/prisma";
 import { NextResponse } from "next/server";
 
@@ -13,15 +13,8 @@ export const GET = withPartnerProfile(
       programId: params.programId,
     });
 
-    const parsedParams = analyticsQuerySchema
-      .omit({
-        workspaceId: true,
-        externalId: true,
-        tenantId: true,
-      })
-      .parse(searchParams);
-
-    let { linkId, domain, key, ...rest } = parsedParams;
+    let { linkId, domain, key, ...rest } =
+      partnerProfileAnalyticsQuerySchema.parse(searchParams);
 
     if (!linkId && domain && key) {
       const link = await prisma.link.findUnique({
@@ -41,10 +34,10 @@ export const GET = withPartnerProfile(
     }
 
     const response = await getAnalytics({
+      ...rest,
+      linkId,
       programId: program.id,
       partnerId: partner.id,
-      linkId,
-      ...rest,
       dataAvailableFrom: program.createdAt,
     });
 

apps/web/app/api/partner-profile/programs/[programId]/events/route.ts

@@ -0,0 +1,71 @@
+import { getEvents } from "@/lib/analytics/get-events";
+import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import { withPartnerProfile } from "@/lib/auth/partner";
+import {
+  PartnerProfileLinkSchema,
+  partnerProfileEventsQuerySchema,
+} from "@/lib/zod/schemas/partner-profile";
+
+import { prisma } from "@dub/prisma";
+import { NextResponse } from "next/server";
+import { z } from "zod";
+
+const CustomerSchema = z.object({
+  id: z.string(),
+  email: z
+    .string()
+    .transform((email) => email.replace(/(?<=^.).+(?=.@)/, "****")),
+});
+
+// GET /api/partner-profile/programs/[programId]/events – get events for a program enrollment link
+export const GET = withPartnerProfile(
+  async ({ partner, params, searchParams }) => {
+    const { program } = await getProgramEnrollmentOrThrow({
+      partnerId: partner.id,
+      programId: params.programId,
+    });
+
+    let { linkId, domain, key, ...rest } =
+      partnerProfileEventsQuerySchema.parse(searchParams);
+
+    if (!linkId && domain && key) {
+      const link = await prisma.link.findUnique({
+        where: {
+          domain_key: {
+            domain,
+            key,
+          },
+        },
+      });
+
+      if (!link || link.partnerId !== partner.id) {
+        return NextResponse.json({ error: "Link not found" }, { status: 404 });
+      }
+
+      linkId = link.id;
+    }
+
+    const events = await getEvents({
+      ...rest,
+      linkId,
+      programId: program.id,
+      partnerId: partner.id,
+      dataAvailableFrom: program.createdAt,
+    });
+
+    const response = events.map((event) => {
+      return {
+        ...event,
+        link: event?.link ? PartnerProfileLinkSchema.parse(event.link) : null,
+        // @ts-expect-error - customer is not always present
+        ...(event?.customer && {
+          customer: CustomerSchema
+            // @ts-expect-error - customer is not always present
+            .parse(event.customer),
+        }),
+      };
+    });
+
+    return NextResponse.json(response);
+  },
+);

apps/web/app/app.dub.co/(dashboard)/[slug]/customers/[customerId]/page-client.tsx

@@ -14,7 +14,7 @@ import { CustomerDetailsColumn } from "@/ui/customers/customer-details-column";
 import { CustomerPartnerEarningsTable } from "@/ui/customers/customer-partner-earnings-table";
 import { CustomerSalesTable } from "@/ui/customers/customer-sales-table";
 import { BackLink } from "@/ui/shared/back-link";
-import { ArrowUpRight, CopyButton } from "@dub/ui";
+import { ArrowUpRight, Button, CopyButton } from "@dub/ui";
 import { OG_AVATAR_URL, fetcher } from "@dub/utils";
 import Link from "next/link";
 import { notFound, useParams } from "next/navigation";
@@ -135,9 +135,20 @@ export function CustomerPageClient() {
           )}
 
           <section className="flex flex-col">
-            <h2 className="py-3 text-lg font-semibold text-neutral-900">
-              Activity
-            </h2>
+            <div className="flex items-center justify-between">
+              <h2 className="py-3 text-lg font-semibold text-neutral-900">
+                Activity
+              </h2>
+              <Link
+                href={`/${slug}/events?interval=all&customerId=${customerId}`}
+              >
+                <Button
+                  variant="secondary"
+                  text="View all"
+                  className="h-7 px-2"
+                />
+              </Link>
+            </div>
             <CustomerActivityList
               activity={customerActivity}
               isLoading={!customer || isCustomerActivityLoading}

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

@@ -1,18 +1,17 @@
 "use client";
 
 import { CUSTOMER_PAGE_EVENTS_LIMIT } from "@/lib/partners/constants";
+import usePartnerCustomer from "@/lib/swr/use-partner-customer";
 import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import {
-  PartnerEarningsResponse,
-  PartnerProfileCustomerProps,
-} from "@/lib/types";
+import { PartnerEarningsResponse } from "@/lib/types";
 import { CustomerActivityList } from "@/ui/customers/customer-activity-list";
 import { CustomerDetailsColumn } from "@/ui/customers/customer-details-column";
 import { CustomerSalesTable } from "@/ui/customers/customer-sales-table";
 import { ProgramRewardList } from "@/ui/partners/program-reward-list";
 import { BackLink } from "@/ui/shared/back-link";
-import { MoneyBill2, Tooltip } from "@dub/ui";
+import { Button, MoneyBill2, Tooltip } from "@dub/ui";
 import { fetcher, OG_AVATAR_URL } from "@dub/utils";
+import Link from "next/link";
 import { notFound, useParams } from "next/navigation";
 import { memo } from "react";
 import useSWR from "swr";
@@ -24,10 +23,9 @@ export function ProgramCustomerPageClient() {
     customerId: string;
   }>();
 
-  const { data: customer, isLoading } = useSWR<PartnerProfileCustomerProps>(
-    `/api/partner-profile/programs/${programSlug}/customers/${customerId}`,
-    fetcher,
-  );
+  const { data: customer, isLoading } = usePartnerCustomer({
+    customerId,
+  });
 
   if (!customer && !isLoading) notFound();
 
@@ -86,9 +84,20 @@ export function ProgramCustomerPageClient() {
           </section>
 
           <section className="flex flex-col">
-            <h2 className="py-3 text-lg font-semibold text-neutral-900">
-              Activity
-            </h2>
+            <div className="flex items-center justify-between">
+              <h2 className="py-3 text-lg font-semibold text-neutral-900">
+                Activity
+              </h2>
+              <Link
+                href={`/programs/${programSlug}/events?interval=all&customerId=${customerId}`}
+              >
+                <Button
+                  variant="secondary"
+                  text="View all"
+                  className="h-7 px-2"
+                />
+              </Link>
+            </div>
             <CustomerActivityList
               activity={customer?.activity}
               isLoading={!customer}

apps/web/app/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/events/page.tsx

@@ -0,0 +1,10 @@
+import Events from "@/ui/analytics/events";
+import { PageContent } from "@/ui/layout/page-content";
+
+export default function ProgramEvents() {
+  return (
+    <PageContent title="Events" hideReferButton>
+      <Events />
+    </PageContent>
+  );
+}

apps/web/lib/swr/use-customer.ts

@@ -21,7 +21,7 @@ export default function useCustomer<
   const { id: workspaceId } = useWorkspace();
 
   const { data, error, isLoading } = useSWR<T>(
-    customerId && workspaceId
+    workspaceId && customerId
       ? `/api/customers/${customerId}?${new URLSearchParams({
           workspaceId: workspaceId,
           ...query,

apps/web/lib/swr/use-customers-count.ts

@@ -6,7 +6,7 @@ export default function useCustomersCount() {
   const { id: workspaceId } = useWorkspace();
 
   const { data, error } = useSWR<number>(
-    `/api/customers/count?workspaceId=${workspaceId}`,
+    workspaceId && `/api/customers/count?workspaceId=${workspaceId}`,
     fetcher,
   );
 

apps/web/lib/swr/use-partner-customer.ts

@@ -0,0 +1,23 @@
+import { fetcher } from "@dub/utils";
+import { useParams } from "next/navigation";
+import useSWR from "swr";
+import { PartnerProfileCustomerProps } from "../types";
+
+export default function usePartnerCustomer({
+  customerId,
+}: {
+  customerId: string;
+}) {
+  const { programSlug } = useParams<{ programSlug: string }>();
+
+  const { data, isLoading } = useSWR<PartnerProfileCustomerProps>(
+    programSlug &&
+      `/api/partner-profile/programs/${programSlug}/customers/${customerId}`,
+    fetcher,
+  );
+
+  return {
+    data,
+    isLoading,
+  };
+}

apps/web/lib/zod/schemas/partner-profile.ts

@@ -3,6 +3,7 @@ import {
   DUB_PARTNERS_ANALYTICS_INTERVAL,
 } from "@/lib/analytics/constants";
 import { z } from "zod";
+import { analyticsQuerySchema, eventsQuerySchema } from "./analytics";
 import {
   CommissionSchema,
   getCommissionsCountQuerySchema,
@@ -93,3 +94,25 @@ export const PartnerProfileCustomerSchema = CustomerEnrichedSchema.pick({
     .transform((email) => email.replace(/(?<=^.).+(?=.@)/, "****")),
   activity: customerActivityResponseSchema,
 });
+
+export const partnerProfileAnalyticsQuerySchema = analyticsQuerySchema.omit({
+  workspaceId: true,
+  externalId: true,
+  tenantId: true,
+  programId: true,
+  partnerId: true,
+  tagId: true,
+  tagIds: true,
+  folderId: true,
+});
+
+export const partnerProfileEventsQuerySchema = eventsQuerySchema.omit({
+  workspaceId: true,
+  externalId: true,
+  tenantId: true,
+  programId: true,
+  partnerId: true,
+  tagId: true,
+  tagIds: true,
+  folderId: true,
+});

apps/web/ui/analytics/analytics-provider.tsx

@@ -94,7 +94,7 @@ export default function AnalyticsProvider({
 }>) {
   const searchParams = useSearchParams();
   const pathname = usePathname();
-  const { id: workspaceId, slug, domains } = useWorkspace();
+  const { id: workspaceId, slug } = useWorkspace();
 
   const [requiresUpgrade, setRequiresUpgrade] = useState(false);