[pull] main from dubinc:main

apps/web/app/api/cron/program-application-reminder/route.ts

@@ -55,7 +55,7 @@ export async function POST(req: Request) {
     await qstash.publishJSON({
       url: `${APP_DOMAIN_WITH_NGROK}/api/cron/program-application-reminder`,
       // repeat every 24 hours, but it'll be cancelled if the application is more than 3 days old or is associated with a partner
-      delay: 24 * 60 * 60 * 1000,
+      delay: 24 * 60 * 60,
       body: {
         applicationId: application.id,
       },

apps/web/app/api/customers/count/route.ts

@@ -1,30 +1,94 @@
 import { withWorkspace } from "@/lib/auth";
 import { getCustomersCountQuerySchema } from "@/lib/zod/schemas/customers";
 import { prisma } from "@dub/prisma";
+import { Prisma } from "@dub/prisma/client";
 import { NextResponse } from "next/server";
 
 // GET /api/customers/count
 export const GET = withWorkspace(async ({ workspace, searchParams }) => {
-  const { email, externalId, search } =
+  const { email, externalId, search, country, linkId, groupBy } =
     getCustomersCountQuerySchema.parse(searchParams);
 
+  const commonWhere: Prisma.CustomerWhereInput = {
+    projectId: workspace.id,
+    ...(email
+      ? { email }
+      : externalId
+        ? { externalId }
+        : {
+            ...(search && {
+              OR: [
+                { email: { startsWith: search } },
+                { externalId: { startsWith: search } },
+                { name: { startsWith: search } },
+              ],
+            }),
+            ...(country && {
+              country,
+            }),
+            ...(linkId && {
+              linkId,
+            }),
+          }),
+  };
+
+  // Get customer count by country
+  if (groupBy === "country") {
+    const data = await prisma.customer.groupBy({
+      by: ["country"],
+      where: commonWhere,
+      _count: true,
+      orderBy: {
+        _count: {
+          country: "desc",
+        },
+      },
+    });
+
+    return NextResponse.json(data);
+  }
+
+  // Get customer count by linkId
+  if (groupBy === "linkId") {
+    const data = await prisma.customer.groupBy({
+      by: ["linkId"],
+      where: { ...commonWhere, linkId: { not: null } },
+      _count: true,
+      orderBy: {
+        _count: {
+          linkId: "desc",
+        },
+      },
+    });
+
+    const links = await prisma.link.findMany({
+      where: {
+        id: { in: data.map(({ linkId }) => linkId!) },
+      },
+      select: {
+        id: true,
+        shortLink: true,
+        url: true,
+      },
+    });
+
+    const enrichedData = data
+      .map((d) => {
+        const link = links.find(({ id }) => id === d.linkId);
+        if (!link) return null;
+        return {
+          ...d,
+          shortLink: link?.shortLink,
+          url: link?.url,
+        };
+      })
+      .filter(Boolean);
+
+    return NextResponse.json(enrichedData);
+  }
+
   const count = await prisma.customer.count({
-    where: {
-      projectId: workspace.id,
-      ...(email
-        ? { email }
-        : externalId
-          ? { externalId }
-          : search
-            ? {
-                OR: [
-                  { email: { startsWith: search } },
-                  { externalId: { startsWith: search } },
-                  { name: { startsWith: search } },
-                ],
-              }
-            : {}),
-    },
+    where: commonWhere,
   });
 
   return NextResponse.json(count);

apps/web/app/api/customers/route.ts

@@ -46,10 +46,14 @@ export const GET = withWorkspace(
       email,
       externalId,
       search,
+      country,
+      linkId,
       includeExpandedFields,
       page,
       pageSize,
       customerIds,
+      sortBy,
+      sortOrder,
     } = getCustomersQuerySchemaExtended.parse(searchParams);
 
     const customers = (await prisma.customer.findMany({
@@ -64,18 +68,24 @@ export const GET = withWorkspace(
           ? { email }
           : externalId
             ? { externalId }
-            : search
-              ? {
+            : {
+                ...(search && {
                   OR: [
                     { email: { startsWith: search } },
                     { externalId: { startsWith: search } },
                     { name: { startsWith: search } },
                   ],
-                }
-              : {}),
+                }),
+                ...(country && {
+                  country,
+                }),
+                ...(linkId && {
+                  linkId,
+                }),
+              }),
       },
       orderBy: {
-        createdAt: "desc",
+        [sortBy]: sortOrder,
       },
       skip: (page - 1) * pageSize,
       take: pageSize,

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

@@ -0,0 +1,9 @@
+import { CustomerTable } from "@/ui/customers/customer-table/customer-table";
+
+export function CustomersPageClient() {
+  return (
+    <div className="mt-3">
+      <CustomerTable />
+    </div>
+  );
+}

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

@@ -0,0 +1,13 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { MaxWidthWrapper } from "@dub/ui";
+import { CustomersPageClient } from "./page-client";
+
+export default function CustomersPage() {
+  return (
+    <PageContent title="Customers">
+      <MaxWidthWrapper>
+        <CustomersPageClient />
+      </MaxWidthWrapper>
+    </PageContent>
+  );
+}

apps/web/app/app.dub.co/(dashboard)/[slug]/programs/[programId]/commissions/commission-table.tsx

@@ -3,13 +3,13 @@
 import useCommissionsCount from "@/lib/swr/use-commissions-count";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { CommissionResponse } from "@/lib/types";
-import FilterButton from "@/ui/analytics/events/filter-button";
 import { CustomerRowItem } from "@/ui/customers/customer-row-item";
 import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";
 import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
 import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
 import { PartnerRowItem } from "@/ui/partners/partner-row-item";
 import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
+import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";
 import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
 import {
   AnimatedSizeContainer,
@@ -188,7 +188,9 @@ const CommissionTableInner = memo(
 
         return (
           !limit &&
-          meta?.filterParams && <FilterButton set={meta.filterParams(cell)} />
+          meta?.filterParams && (
+            <FilterButtonTableRow set={meta.filterParams(cell)} />
+          )
         );
       },
       ...(!limit && {

apps/web/app/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx

@@ -3,11 +3,11 @@
 import usePartnerEarningsCount from "@/lib/swr/use-partner-earnings-count";
 import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
 import { PartnerEarningsResponse } from "@/lib/types";
-import FilterButton from "@/ui/analytics/events/filter-button";
 import { CustomerRowItem } from "@/ui/customers/customer-row-item";
 import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
 import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
 import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
+import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";
 import {
   CopyText,
   LinkLogo,
@@ -191,7 +191,9 @@ export function EarningsTablePartner({ limit }: { limit?: number }) {
     cellRight: (cell) => {
       const meta = cell.column.columnDef.meta as ColumnMeta | undefined;
       return (
-        meta?.filterParams && <FilterButton set={meta.filterParams(cell)} />
+        meta?.filterParams && (
+          <FilterButtonTableRow set={meta.filterParams(cell)} />
+        )
       );
     },
     ...(!limit && {

apps/web/lib/middleware/app.ts

@@ -86,6 +86,7 @@ export default async function AppMiddleware(req: NextRequest) {
         "/links",
         "/analytics",
         "/events",
+        "/customers",
         "/programs",
         "/settings",
         "/upgrade",

apps/web/lib/middleware/utils/app-redirect.ts

@@ -21,11 +21,6 @@ export const appRedirect = (path: string) => {
   if (upgradeRegex.test(path))
     return path.replace(upgradeRegex, "/$1/settings/billing/upgrade");
 
-  // Redirect "/[slug]/customers" to "/[slug]/events?event=leads" for now
-  const customersRegex = /^\/([^\/]+)\/customers$/;
-  if (customersRegex.test(path))
-    return path.replace(customersRegex, "/$1/events?event=leads");
-
   // Redirect "programs/[programId]/settings" to "programs/[programId]/settings/rewards" (first tab)
   const programSettingsRegex = /\/programs\/([^\/]+)\/settings$/;
   if (programSettingsRegex.test(path))

apps/web/lib/plan-capabilities.ts

@@ -5,8 +5,8 @@ export const getPlanCapabilities = (
   plan: WorkspaceProps["plan"] | undefined | string,
 ) => {
   return {
-    canAddFolder: plan && !["free"].includes(plan),
-    canManageFolderPermissions: plan && !["free", "pro"].includes(plan), // default access level is write
-    canManageCustomers: plan && !["free", "pro"].includes(plan),
+    canAddFolder: !!plan && !["free"].includes(plan),
+    canManageFolderPermissions: !!plan && !["free", "pro"].includes(plan), // default access level is write
+    canManageCustomers: !!plan && !["free", "pro"].includes(plan),
   };
 };

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

@@ -1,12 +1,22 @@
 import { fetcher } from "@dub/utils";
 import useSWR from "swr";
+import { z } from "zod";
+import { getCustomersCountQuerySchema } from "../zod/schemas/customers";
 import useWorkspace from "./use-workspace";
 
-export default function useCustomersCount() {
+export default function useCustomersCount<T = number>({
+  query,
+  enabled = true,
+}: {
+  query?: z.infer<typeof getCustomersCountQuerySchema>;
+  enabled?: boolean;
+} = {}) {
   const { id: workspaceId } = useWorkspace();
 
-  const { data, error } = useSWR<number>(
-    workspaceId && `/api/customers/count?workspaceId=${workspaceId}`,
+  const { data, error } = useSWR<T>(
+    enabled &&
+      workspaceId &&
+      `/api/customers/count?${new URLSearchParams({ workspaceId, ...query })}`,
     fetcher,
   );
 

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

@@ -26,11 +26,36 @@ export const getCustomersQuerySchema = z
       .describe(
         "A search query to filter customers by email, externalId, or name. If `email` or `externalId` is provided, this will be ignored.",
       ),
+    country: z
+      .string()
+      .optional()
+      .describe(
+        "A filter on the list based on the customer's `country` field.",
+      ),
+    linkId: z
+      .string()
+      .optional()
+      .describe(
+        "A filter on the list based on the customer's `linkId` field (the referral link ID).",
+      ),
     includeExpandedFields: booleanQuerySchema
       .optional()
       .describe(
         "Whether to include expanded fields on the customer (`link`, `partner`, `discount`).",
       ),
+
+    sortBy: z
+      .enum(["createdAt", "saleAmount"])
+      .optional()
+      .default("createdAt")
+      .describe(
+        "The field to sort the customers by. The default is `createdAt`.",
+      ),
+    sortOrder: z
+      .enum(["asc", "desc"])
+      .optional()
+      .default("desc")
+      .describe("The sort order. The default is `desc`."),
   })
   .merge(getPaginationQuerySchema({ pageSize: CUSTOMERS_MAX_PAGE_SIZE }));
 
@@ -44,11 +69,15 @@ export const getCustomersQuerySchemaExtended = getCustomersQuerySchema.merge(
   }),
 );
 
-export const getCustomersCountQuerySchema = getCustomersQuerySchema.omit({
-  includeExpandedFields: true,
-  page: true,
-  pageSize: true,
-});
+export const getCustomersCountQuerySchema = getCustomersQuerySchema
+  .omit({
+    includeExpandedFields: true,
+    page: true,
+    pageSize: true,
+    sortBy: true,
+    sortOrder: true,
+  })
+  .extend({ groupBy: z.enum(["country", "linkId"]).optional() });
 
 export const createCustomerBodySchema = z.object({
   email: z
@@ -87,6 +116,14 @@ export const CustomerSchema = z.object({
   email: z.string().nullish().describe("Email of the customer."),
   avatar: z.string().nullish().describe("Avatar URL of the customer."),
   country: z.string().nullish().describe("Country of the customer."),
+  sales: z
+    .number()
+    .nullish()
+    .describe("Total number of sales for the customer."),
+  saleAmount: z
+    .number()
+    .nullish()
+    .describe("Total amount of sales for the customer."),
   createdAt: z.date().describe("The date the customer was created."),
 });
 
@@ -97,6 +134,7 @@ export const CustomerEnrichedSchema = CustomerSchema.extend({
     domain: true,
     key: true,
     shortLink: true,
+    url: true,
     programId: true,
   }).nullish(),
   programId: z.string().nullish(),