Merge branch 'main' into program-marketplace-categories

Author: pepeladeira

apps/web/app/(ee)/api/partners/route.ts

@@ -3,6 +3,7 @@ import { getPartners } from "@/lib/api/partners/get-partners";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
+import { applicationEventSchema } from "@/lib/application-events/schema";
 import { withWorkspace } from "@/lib/auth";
 import { throwIfPartnersLimitExceeded } from "@/lib/partners/throw-if-partners-limit-exceeded";
 import { polyfillSocialMediaFields } from "@/lib/social-utils";
@@ -50,25 +51,22 @@ export const GET = withWorkspace(
         country: filterOverrides.country,
       }),
     };
-    const {
-      sortBy: sortByWithOldFields,
-      includePartnerPlatforms,
-      ...parsedParams
-    } = getPartnersQuerySchemaExtended
-      .extend({
-        // add old fields for backward compatibility
-        sortBy: getPartnersQuerySchemaExtended.shape.sortBy.or(
-          z.enum([
-            "clicks",
-            "leads",
-            "conversions",
-            "sales",
-            "saleAmount",
-            "totalSales",
-          ]),
-        ),
-      })
-      .parse(paramsToParse);
+    const { sortBy: sortByWithOldFields, ...parsedParams } =
+      getPartnersQuerySchemaExtended
+        .extend({
+          // add old fields for backward compatibility
+          sortBy: getPartnersQuerySchemaExtended.shape.sortBy.or(
+            z.enum([
+              "clicks",
+              "leads",
+              "conversions",
+              "sales",
+              "saleAmount",
+              "totalSales",
+            ]),
+          ),
+        })
+        .parse(paramsToParse);
 
     // get the final sortBy field (replace old fields with new fields)
     const sortBy =
@@ -104,11 +102,16 @@ export const GET = withWorkspace(
       saleAmount: z.number().default(0),
     });
 
-    const responseSchema = includePartnerPlatforms
-      ? baseSchema.extend({
-          platforms: z.array(partnerPlatformSchema),
-        })
-      : baseSchema;
+    const responseSchema =
+      parsedParams.includeApplicationEvent ||
+      parsedParams.includePartnerPlatforms
+        ? baseSchema.extend({
+            platforms: z.array(partnerPlatformSchema),
+            applicationEvent: applicationEventSchema
+              .pick({ referralSource: true })
+              .nullish(),
+          })
+        : baseSchema;
 
     return NextResponse.json(
       z.array(responseSchema).parse(

apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts

@@ -535,11 +535,13 @@ export async function checkoutSessionCompleted(
             workspaceId: workspace.id,
             programId: link.programId,
             partnerId: link.partnerId,
+            customerId: customer.id,
+            customerFirstSaleAt: customer.firstSaleAt ?? new Date(),
           },
           metrics: {
             current: {
-              saleAmount: saleData.amount,
               conversions: firstConversionFlag ? 1 : 0,
+              saleAmount: saleData.amount,
             },
           },
         }),

apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts

@@ -369,11 +369,13 @@ export async function invoicePaid(
             workspaceId: workspace.id,
             programId: link.programId,
             partnerId: link.partnerId,
+            customerId: customer.id,
+            customerFirstSaleAt: customer.firstSaleAt ?? new Date(),
           },
           metrics: {
             current: {
-              saleAmount: saleData.amount,
               conversions: firstConversionFlag ? 1 : 0,
+              saleAmount: saleData.amount,
             },
           },
         }),

apps/web/app/api/links/export/route.ts

@@ -6,7 +6,10 @@ import { getLinksForWorkspace } from "@/lib/api/links/get-links-for-workspace";
 import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { validateLinksQueryFilters } from "@/lib/api/links/validate-links-query-filters";
 import { withWorkspace } from "@/lib/auth";
-import { MEGA_WORKSPACE_LINKS_LIMIT } from "@/lib/constants/misc";
+import {
+  MEGA_WORKSPACE_LINKS_LIMIT,
+  SORTABLE_LINKS_LIMIT,
+} from "@/lib/constants/misc";
 import { qstash } from "@/lib/cron";
 import { linksExportQuerySchema } from "@/lib/zod/schemas/links";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
@@ -62,6 +65,10 @@ export const GET = withWorkspace(
         startDate,
         endDate,
       }),
+      sortBy:
+        workspace.totalLinks > SORTABLE_LINKS_LIMIT
+          ? "createdAt"
+          : filters.sortBy,
       searchMode:
         workspace.totalLinks > MEGA_WORKSPACE_LINKS_LIMIT ? "exact" : "fuzzy",
       includeDashboard: false,

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

@@ -4,7 +4,10 @@ import { throwIfLinksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { validateLinksQueryFilters } from "@/lib/api/links/validate-links-query-filters";
 import { parseRequestBody } from "@/lib/api/utils";
 import { withWorkspace } from "@/lib/auth";
-import { MEGA_WORKSPACE_LINKS_LIMIT } from "@/lib/constants/misc";
+import {
+  MEGA_WORKSPACE_LINKS_LIMIT,
+  SORTABLE_LINKS_LIMIT,
+} from "@/lib/constants/misc";
 import { ratelimit } from "@/lib/upstash";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import {
@@ -31,6 +34,10 @@ export const GET = withWorkspace(
       ...filters,
       workspaceId: workspace.id,
       folderIds,
+      sortBy:
+        workspace.totalLinks > SORTABLE_LINKS_LIMIT
+          ? "createdAt"
+          : filters.sortBy,
       searchMode:
         workspace.totalLinks > MEGA_WORKSPACE_LINKS_LIMIT ? "exact" : "fuzzy",
     });

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-logic.tsx

@@ -13,6 +13,11 @@ import { Controller } from "react-hook-form";
 import { BountyAmountInput } from "./bounty-amount-input";
 import { useBountyFormContext } from "./bounty-form-context";
 
+const PERFORMANCE_SCOPE_DESCRIPTIONS = {
+  new: "Only net-new stats after the bounty start date will be counted",
+  lifetime: "Include the partner's historical stats in your program",
+} as const;
+
 export function BountyLogic({ className }: { className?: string }) {
   const { control, watch } = useBountyFormContext();
 
@@ -33,13 +38,25 @@ export function BountyLogic({ className }: { className?: string }) {
             control={control}
             name="performanceScope"
             render={({ field }) => (
-              <InlineBadgePopover text={field.value} invalid={!field.value}>
+              <InlineBadgePopover
+                text={field.value}
+                invalid={!field.value}
+                align="center"
+              >
                 <InlineBadgePopoverMenu
                   selectedValue={field.value}
                   onSelect={field.onChange}
                   items={[
-                    { text: "new", value: "new" },
-                    { text: "lifetime", value: "lifetime" },
+                    {
+                      text: "new",
+                      value: "new",
+                      description: PERFORMANCE_SCOPE_DESCRIPTIONS.new,
+                    },
+                    {
+                      text: "lifetime",
+                      value: "lifetime",
+                      description: PERFORMANCE_SCOPE_DESCRIPTIONS.lifetime,
+                    },
                   ]}
                 />
               </InlineBadgePopover>
@@ -58,6 +75,7 @@ export function BountyLogic({ className }: { className?: string }) {
                     : "activity"
                 }
                 invalid={!field.value}
+                align="center"
               >
                 <InlineBadgePopoverMenu
                   selectedValue={field.value}

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx

@@ -79,7 +79,7 @@ export function useCommissionFilters() {
           customers?.map((customer) => {
             return {
               value: customer.id,
-              label: customer.email ?? customer.name,
+              label: customer.email ?? customer.name ?? customer.id,
               icon: <CustomerAvatar customer={customer} className="size-4" />,
             };
           }) ?? null,

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx

@@ -47,6 +47,8 @@ const applicationsColumns = {
   all: [
     "partner",
     "createdAt",
+    "source",
+    "group",
     "location",
     "website",
     "youtube",
@@ -58,6 +60,7 @@ const applicationsColumns = {
   defaultVisible: [
     "partner",
     "createdAt",
+    "source",
     "location",
     "website",
     "youtube",
@@ -88,6 +91,7 @@ export function ProgramPartnersApplicationsPageClient() {
     status: "pending",
   });
 
+  // TODO: refactor to use `/partners/applications` endpoint
   const {
     data: partners,
     error,
@@ -99,6 +103,7 @@ export function ProgramPartnersApplicationsPageClient() {
         status: "pending",
         sortBy,
         sortOrder,
+        includeApplicationEvent: true,
         includePartnerPlatforms: true,
       },
       { exclude: ["partnerId"] },
@@ -163,7 +168,7 @@ export function ProgramPartnersApplicationsPageClient() {
     });
 
   const { columnVisibility, setColumnVisibility } = useColumnVisibility(
-    "applications-table-columns",
+    "applications-table-columns-v2",
     applicationsColumns,
   );
 
@@ -191,10 +196,20 @@ export function ProgramPartnersApplicationsPageClient() {
         header: "Applied",
         accessorFn: (d) => formatDate(d.createdAt, { month: "short" }),
       },
+      // TODO: add source column back once we fix application source display
+      // {
+      //   id: "source",
+      //   header: "Source",
+      //   minSize: 170,
+      //   cell: ({ row }) => (
+      //     <PartnerApplicationSource
+      //       referralSource={row.original.applicationEvent?.referralSource}
+      //     />
+      //   ),
+      // },
       {
         id: "group",
         header: "Group",
-        enableHiding: false,
         minSize: 150,
         cell: ({ row }) => {
           if (!groups || !row.original.groupId) {

apps/web/lib/api/conversions/track-sale.ts

@@ -506,11 +506,13 @@ const _trackSale = async ({
               workspaceId: workspace.id,
               programId: link.programId,
               partnerId: link.partnerId,
+              customerId: customer.id,
+              customerFirstSaleAt: customer.firstSaleAt ?? new Date(),
             },
             metrics: {
               current: {
-                saleAmount: saleData.amount,
                 conversions: firstConversionFlag ? 1 : 0,
+                saleAmount: saleData.amount,
               },
             },
           }),

apps/web/lib/api/links/get-links-for-workspace.ts

@@ -24,7 +24,6 @@ export async function getLinksForWorkspace(filters: GetLinksForWorkspaceProps) {
     tagNames,
     search,
     searchMode,
-    sort,
     userId,
     showArchived,
     withTags,
@@ -40,12 +39,10 @@ export async function getLinksForWorkspace(filters: GetLinksForWorkspaceProps) {
     endDate,
   } = filters;
 
-  // Support legacy sort param
-  if (sort && sort !== "createdAt") {
-    filters = { ...filters, sortBy: sort };
-  }
-
-  const paginationQuery = buildPaginationQuery(filters);
+  const paginationQuery = buildPaginationQuery({
+    ...filters,
+    sortOrder: "desc",
+  });
 
   // Validate the provided cursor ID
   const cursorId = filters.startingAfter || filters.endingBefore;