The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Improve Google Ads integration settings
Steven Tey46a63b13ab64
diff --git a/apps/web/lib/integrations/appsflyer/ui/settings.tsx b/apps/web/lib/integrations/appsflyer/ui/settings.tsxindex d8691908ac..dc362b61b4 100644--- a/apps/web/lib/integrations/appsflyer/ui/settings.tsx+++ b/apps/web/lib/integrations/appsflyer/ui/settings.tsx@@ -202,7 +202,7 @@ export const AppsFlyerSettings = ({}return (- <form className="mt-4 space-y-4" onSubmit={onSubmit}>+ <form className="space-y-4" onSubmit={onSubmit}>{/* App IDs */}<div className="rounded-lg border border-neutral-200 bg-white"><div className="border-b border-neutral-200 px-4 py-4">diff --git a/apps/web/lib/integrations/google-ads/constants.ts b/apps/web/lib/integrations/google-ads/constants.tsindex 483f1ec860..f6dceb4cac 100644--- a/apps/web/lib/integrations/google-ads/constants.ts+++ b/apps/web/lib/integrations/google-ads/constants.ts@@ -1,5 +1,8 @@import { DUB_WORKSPACE_ID } from "@dub/utils";+export const GOOGLE_ADS_LOGO =+ "https://dubassets.com/integrations/int_1M096GK5Q66FJ78WQAH82SD7V_5icvkj4";+export const GOOGLE_ADS_DEFAULT_SETTINGS = {customers: [],customerId: null,diff --git a/apps/web/lib/integrations/google-ads/schema.ts b/apps/web/lib/integrations/google-ads/schema.tsindex d1cff261e9..ecc0fc305b 100644--- a/apps/web/lib/integrations/google-ads/schema.ts+++ b/apps/web/lib/integrations/google-ads/schema.ts@@ -1,4 +1,5 @@import * as z from "zod/v4";+import { getGoogleAdsEventMappingsError } from "./utils";export const googleAdsAuthTokenSchema = z.object({access_token: z.string(),@@ -20,17 +21,31 @@ export const googleAdsCustomerSchema = z.object({export const googleAdsEventMappingSchema = z.object({conversionAction: z.string().min(1),- // Empty means this mapping matches all event names of that type+ // Empty means this mapping matches unmatched event names of that typeeventNames: z.array(z.string().trim().min(1).max(255)).max(50).default([]),});+const googleAdsEventMappingsSchema = z+ .array(googleAdsEventMappingSchema)+ .max(50)+ .superRefine((mappings, ctx) => {+ const error = getGoogleAdsEventMappingsError(mappings);+ if (error) {+ ctx.addIssue({+ code: "custom",+ message: error,+ });+ }+ })+ .default([]);+export const googleAdsSettingsSchema = z.object({customers: z.array(googleAdsCustomerSchema).default([]),customerId: z.string().nullish(),loginCustomerId: z.string().nullish(),customerName: z.string().nullish(),- leadMappings: z.array(googleAdsEventMappingSchema).max(50).default([]),- saleMappings: z.array(googleAdsEventMappingSchema).max(50).default([]),+ leadMappings: googleAdsEventMappingsSchema,+ saleMappings: googleAdsEventMappingsSchema,});export const googleAdsConversionActionSchema = z.object({diff --git a/apps/web/lib/integrations/google-ads/ui/settings.tsx b/apps/web/lib/integrations/google-ads/ui/settings.tsxindex 1fd0c08435..b858e74d44 100644--- a/apps/web/lib/integrations/google-ads/ui/settings.tsx+++ b/apps/web/lib/integrations/google-ads/ui/settings.tsx@@ -2,23 +2,26 @@import useWorkspace from "@/lib/swr/use-workspace";import { InstalledIntegrationInfoProps } from "@/lib/types";-import { Button, Combobox, ComboboxOption } from "@dub/ui";-import { fetcher, nFormatter } from "@dub/utils";+import { BlurImage, Button, Combobox, ComboboxOption } from "@dub/ui";+import { Plus, Xmark } from "@dub/ui/icons";+import { DUB_LOGO, fetcher, nFormatter } from "@dub/utils";+import { cn } from "@dub/utils/src";import { ChevronDown } from "lucide-react";import { useAction } from "next-safe-action/hooks";import { useEffect, useMemo } from "react";import type { Control } from "react-hook-form";-import { Controller, useForm } from "react-hook-form";+import { Controller, useFieldArray, useForm, useWatch } from "react-hook-form";import { toast } from "sonner";import useSWR from "swr";import * as z from "zod/v4";-import { GOOGLE_ADS_DEFAULT_SETTINGS } from "../constants";+import { GOOGLE_ADS_DEFAULT_SETTINGS, GOOGLE_ADS_LOGO } from "../constants";import {googleAdsConversionActionSchema,googleAdsEventMappingSchema,googleAdsSettingsSchema,} from "../schema";import { updateGoogleAdsSettingsAction } from "../update-google-ads-settings";+import { getGoogleAdsEventMappingsError } from "../utils";type GoogleAdsCustomerOption = ComboboxOption<{descriptiveName: string;@@ -50,6 +53,8 @@ type EventNameRow = {sales: number;};+const MAX_MAPPINGS = 50;+const createEmptyMapping = (): EventMapping => ({conversionAction: "",eventNames: [],@@ -75,7 +80,7 @@ export const GoogleAdsSettings = ({...(settings as any),});- const { control, handleSubmit, watch, setValue } = useForm<FormData>({+ const { control, handleSubmit, setValue } = useForm<FormData>({defaultValues: {customerId: googleAdsSettings.customerId ?? "",loginCustomerId: googleAdsSettings.loginCustomerId ?? "",@@ -85,13 +90,7 @@ export const GoogleAdsSettings = ({},});- const customerId = watch("customerId");- const leadMappings = watch("leadMappings");- const saleMappings = watch("saleMappings");- const leadConversionAction = leadMappings[0]?.conversionAction ?? "";- const saleConversionAction = saleMappings[0]?.conversionAction ?? "";- const leadEventNames = leadMappings[0]?.eventNames ?? [];- const saleEventNames = saleMappings[0]?.eventNames ?? [];+ const customerId = useWatch({ control, name: "customerId" });const customerOptions = useMemo<GoogleAdsCustomerOption[]>(() =>@@ -122,7 +121,7 @@ export const GoogleAdsSettings = ({isLoading: isLoadingLeadEventNames,error: leadEventNamesError,} = useSWR<EventNameRow[]>(- workspaceId && installed && leadConversionAction+ workspaceId && installed && customerId? `/api/analytics?event=leads&groupBy=event_names&interval=90d&workspaceId=${workspaceId}`: null,fetcher,@@ -133,7 +132,7 @@ export const GoogleAdsSettings = ({isLoading: isLoadingSaleEventNames,error: saleEventNamesError,} = useSWR<EventNameRow[]>(- workspaceId && installed && saleConversionAction+ workspaceId && installed && customerId? `/api/analytics?event=sales&groupBy=event_names&interval=90d&workspaceId=${workspaceId}`: null,fetcher,@@ -181,26 +180,6 @@ export const GoogleAdsSettings = ({[conversionActionsData?.conversionActions],);- const leadEventNameOptions = useMemo(- () =>- buildEventNameOptions({- rows: leadEventNamesData,- selected: leadEventNames,- countKey: "leads",- }),- [leadEventNamesData, leadEventNames],- );-- const saleEventNameOptions = useMemo(- () =>- buildEventNameOptions({- rows: saleEventNamesData,- selected: saleEventNames,- countKey: "sales",- }),- [saleEventNamesData, saleEventNames],- );-const { executeAsync: saveSettings, isPending: isSaving } = useAction(updateGoogleAdsSettingsAction,{@@ -220,34 +199,33 @@ export const GoogleAdsSettings = ({[customerOptions, customerId],);- const selectedLeadAction = useMemo(- () =>- conversionActionOptions.find(- (option) => option.value === leadConversionAction,- ) ?? null,- [conversionActionOptions, leadConversionAction],- );-- const selectedSaleAction = useMemo(- () =>- conversionActionOptions.find(- (option) => option.value === saleConversionAction,- ) ?? null,- [conversionActionOptions, saleConversionAction],- );-const onSubmit = async (data: FormData) => {if (!workspaceId) {return;}+ const leadMappings = sanitizeMappings(data.leadMappings);+ const saleMappings = sanitizeMappings(data.saleMappings);++ const leadMappingsError = getGoogleAdsEventMappingsError(leadMappings);+ if (leadMappingsError) {+ toast.error(`Lead events: ${leadMappingsError}`);+ return;+ }++ const saleMappingsError = getGoogleAdsEventMappingsError(saleMappings);+ if (saleMappingsError) {+ toast.error(`Sale events: ${saleMappingsError}`);+ return;+ }+await saveSettings({workspaceId,customerId: data.customerId || null,loginCustomerId: data.loginCustomerId || null,customerName: data.customerName || null,- leadMappings: sanitizeMappings(data.leadMappings),- saleMappings: sanitizeMappings(data.saleMappings),+ leadMappings,+ saleMappings,});};@@ -256,7 +234,7 @@ export const GoogleAdsSettings = ({}return (- <form className="mt-4 space-y-4" onSubmit={handleSubmit(onSubmit)}>+ <form className="space-y-4" onSubmit={handleSubmit(onSubmit)}><div className="rounded-lg border border-neutral-200 bg-white"><div className="flex items-center gap-x-2 border-b border-neutral-200 px-4 py-4"><p className="text-sm font-medium text-neutral-700">@@ -306,77 +284,175 @@ export const GoogleAdsSettings = ({{customerId && (<>- <div>- <p className="mb-2 text-sm font-medium text-neutral-700">- Lead conversion action- </p>- <p className="mb-4 text-sm leading-normal text-neutral-600">- Map Dub lead events to an existing Google Ads conversion- action.- </p>- <Controller- name="leadMappings.0.conversionAction"+ <EventMappingsSection+ name="leadMappings"+ control={control}+ title="Lead events"+ description="Map Dub lead events to Google Ads conversion actions. Each event name can only be assigned to one conversion action."+ conversionActionPlaceholder={+ isLoadingOptions+ ? "Loading conversion actions..."+ : "Select lead conversion action"+ }+ eventNamesPlaceholder="All unmatched lead events"+ eventNamesEmptyState="No lead events in the last 90 days. Type a name to add one."+ conversionActionOptions={conversionActionOptions}+ eventNameRows={leadEventNamesData}+ eventCountKey="leads"+ isLoadingConversionActions={isLoadingOptions}+ isLoadingEventNames={isLoadingLeadEventNames}+ />++ <div className="border-t border-neutral-200 pt-6">+ <EventMappingsSection+ name="saleMappings"control={control}- render={({ field }) => (- <Combobox- options={conversionActionOptions}- selected={selectedLeadAction}- setSelected={(option) => {- if (option) {- field.onChange(option.value);- }- }}- placeholder={- isLoadingOptions- ? "Loading conversion actions..."- : "Select lead conversion action"- }- matchTriggerWidth- caret={comboboxCaret}- buttonProps={comboboxButtonProps}- />- )}+ title="Sale events"+ description="Map Dub sale events to Google Ads conversion actions. Each event name can only be assigned to one conversion action."+ conversionActionPlaceholder={+ isLoadingOptions+ ? "Loading conversion actions..."+ : "Select sale conversion action"+ }+ eventNamesPlaceholder="All unmatched sale events"+ eventNamesEmptyState="No sale events in the last 90 days. Type a name to add one."+ conversionActionOptions={conversionActionOptions}+ eventNameRows={saleEventNamesData}+ eventCountKey="sales"+ isLoadingConversionActions={isLoadingOptions}+ isLoadingEventNames={isLoadingSaleEventNames}/>-- {leadConversionAction && (- <EventNamesField- name="leadMappings.0.eventNames"- control={control}- options={leadEventNameOptions}- isLoading={isLoadingLeadEventNames}- label="Lead event names"- description="Choose which Dub lead event names to upload as this conversion. If none are selected, all lead events will be sent. Options are based on your top lead events from the last 90 days."- placeholder="All lead events"- emptyState="No lead events in the last 90 days. Type a name to add one."- />- )}</div>+ </>+ )}+ </div>- <div>- <p className="mb-2 text-sm font-medium text-neutral-700">- Sale conversion action- </p>- <p className="mb-4 text-sm leading-normal text-neutral-600">- Map Dub sale events to an existing Google Ads conversion- action.- </p>+ <div className="flex items-center justify-end rounded-b-lg border-t border-neutral-200 bg-neutral-50 px-4 py-3">+ <Button+ type="submit"+ variant="primary"+ text="Save changes"+ className="h-8 w-fit"+ loading={isSaving}+ disabled={!customerId || isLoadingOptions}+ />+ </div>+ </div>+ </form>+ );+};++function EventMappingsSection({+ name,+ control,+ title,+ description,+ conversionActionPlaceholder,+ eventNamesPlaceholder,+ eventNamesEmptyState,+ conversionActionOptions,+ eventNameRows,+ eventCountKey,+ isLoadingConversionActions,+ isLoadingEventNames,+}: {+ name: "leadMappings" | "saleMappings";+ control: Control<FormData>;+ title: string;+ description: string;+ conversionActionPlaceholder: string;+ eventNamesPlaceholder: string;+ eventNamesEmptyState: string;+ conversionActionOptions: ComboboxOption[];+ eventNameRows: EventNameRow[] | undefined;+ eventCountKey: "leads" | "sales";+ isLoadingConversionActions: boolean;+ isLoadingEventNames: boolean;+}) {+ const mappings = useWatch({ control, name }) ?? [];+ const { fields, append, remove } = useFieldArray({+ control,+ name,+ });++ const conversionActionLabelByValue = useMemo(() => {+ return new Map(+ conversionActionOptions.map((option) => [option.value, option.label]),+ );+ }, [conversionActionOptions]);++ const canAddMapping =+ mappings.length > 0 &&+ mappings.every((mapping) => mapping.conversionAction) &&+ mappings.length < MAX_MAPPINGS &&+ mappings.length < conversionActionOptions.length;++ return (+ <div>+ <p className="mb-1 text-sm font-medium text-neutral-700">{title}</p>+ <p className="mb-4 text-sm text-neutral-500">{description}</p>++ <div className="space-y-2">+ <div className="flex items-center gap-2">+ <div className="grid flex-1 grid-cols-2 gap-2">+ <FieldLabel src={GOOGLE_ADS_LOGO} alt="Google Ads">+ Conversion action+ </FieldLabel>+ <FieldLabel src={DUB_LOGO} alt="Dub">+ Event names+ </FieldLabel>+ </div>+ {fields.length > 1 && <div className="size-4 shrink-0" />}+ </div>++ {fields.map((field, index) => {+ const mapping = mappings[index] ?? createEmptyMapping();+ const selectedConversionAction =+ conversionActionOptions.find(+ (option) => option.value === mapping.conversionAction,+ ) ?? null;+ const usedConversionActions = new Set(+ mappings+ .filter((_, mappingIndex) => mappingIndex !== index)+ .map((item) => item.conversionAction)+ .filter(Boolean),+ );+ const usedEventNames = new Map<string, string>();+ mappings.forEach((item, mappingIndex) => {+ if (mappingIndex === index) {+ return;+ }++ const actionLabel =+ conversionActionLabelByValue.get(item.conversionAction) ??+ "another conversion action";++ for (const eventName of item.eventNames) {+ usedEventNames.set(eventName, String(actionLabel));+ }+ });++ return (+ <div key={field.id} className="flex items-center gap-2">+ <div className="grid min-w-0 flex-1 grid-cols-2 gap-2"><Controller- name="saleMappings.0.conversionAction"+ name={`${name}.${index}.conversionAction`}control={control}- render={({ field }) => (+ render={({ field: conversionActionField }) => (<Combobox- options={conversionActionOptions}- selected={selectedSaleAction}+ options={conversionActionOptions.map((option) => ({+ ...option,+ disabledTooltip: usedConversionActions.has(option.value)+ ? "Already used by another mapping"+ : undefined,+ }))}+ selected={selectedConversionAction}setSelected={(option) => {if (option) {- field.onChange(option.value);+ conversionActionField.onChange(option.value);}}}- placeholder={- isLoadingOptions- ? "Loading conversion actions..."- : "Select sale conversion action"- }+ placeholder={conversionActionPlaceholder}matchTriggerWidthcaret={comboboxCaret}buttonProps={comboboxButtonProps}@@ -384,33 +460,56 @@ export const GoogleAdsSettings = ({)}/>- {saleConversionAction && (- <EventNamesField- name="saleMappings.0.eventNames"- control={control}- options={saleEventNameOptions}- isLoading={isLoadingSaleEventNames}- label="Sale event names"- description="Choose which Dub sale event names to upload as this conversion. If none are selected, all sale events will be sent. Options are based on your top sale events from the last 90 days."- placeholder="All sale events"- emptyState="No sale events in the last 90 days. Type a name to add one."- />- )}+ <EventNamesField+ name={`${name}.${index}.eventNames`}+ control={control}+ options={buildEventNameOptions({+ rows: eventNameRows,+ selected: mapping.eventNames,+ usedByOthers: usedEventNames,+ countKey: eventCountKey,+ })}+ usedByOthers={usedEventNames}+ isLoading={isLoadingEventNames}+ disabled={!mapping.conversionAction}+ placeholder={+ !mapping.conversionAction+ ? "Select a conversion action first"+ : mappings.filter((item) => item.conversionAction)+ .length > 1+ ? eventNamesPlaceholder+ : eventNamesPlaceholder.replace("unmatched ", "")+ }+ emptyState={eventNamesEmptyState}+ /></div>- </>- )}-- <Button- type="submit"- text="Save settings"- loading={isSaving}- disabled={!customerId || isLoadingOptions}- />- </div>+ {fields.length > 1 && (+ <button+ type="button"+ onClick={() => remove(index)}+ className="text-neutral-400 transition-colors hover:text-red-500"+ aria-label={`Remove mapping ${index + 1}`}+ >+ <Xmark className="size-4" aria-hidden />+ </button>+ )}+ </div>+ );+ })}++ <Button+ type="button"+ variant="secondary"+ onClick={() => append(createEmptyMapping())}+ icon={<Plus className="size-3.5" />}+ text="Add mapping"+ className="h-7 w-fit px-2 text-xs"+ disabled={!canAddMapping || isLoadingConversionActions}+ /></div>- </form>+ </div>);-};+}function toFormMappings(mappings: EventMapping[]): EventMapping[] {if (mappings.length === 0) {@@ -435,10 +534,12 @@ function sanitizeMappings(mappings: EventMapping[]) {function buildEventNameOptions({rows,selected,+ usedByOthers,countKey,}: {rows: EventNameRow[] | undefined;selected: string[];+ usedByOthers: Map<string, string>;countKey: "leads" | "sales";}): EventNameOption[] {const fromAnalytics = (rows ?? [])@@ -447,88 +548,132 @@ function buildEventNameOptions({value: row.eventName,label: row.eventName,meta: { count: row[countKey] },+ disabledTooltip: usedByOthers.has(row.eventName)+ ? `Already mapped to ${usedByOthers.get(row.eventName)}`+ : undefined,}));const fromAnalyticsSet = new Set(fromAnalytics.map((option) => option.value));const extras = selected- .filter((name) => !fromAnalyticsSet.has(name))- .map((name) => ({- value: name,- label: name,+ .filter((eventName) => !fromAnalyticsSet.has(eventName))+ .map((eventName) => ({+ value: eventName,+ label: eventName,}));return [...extras, ...fromAnalytics];}+function FieldLabel({+ src,+ alt,+ children,+}: {+ src: string;+ alt: string;+ children: string;+}) {+ return (+ <div className="flex items-center gap-1.5">+ <BlurImage+ src={src}+ alt={alt}+ width={16}+ height={16}+ className={cn(+ "size-4 shrink-0 object-contain",+ src === DUB_LOGO ? "size-3.5 rounded-sm" : "",+ )}+ />+ <span className="text-sm font-medium text-neutral-700">{children}</span>+ </div>+ );+}+function EventNamesField({name,control,options,+ usedByOthers,isLoading,- label,- description,+ disabled,placeholder,emptyState,}: {- name: "leadMappings.0.eventNames" | "saleMappings.0.eventNames";+ name:+ | `leadMappings.${number}.eventNames`+ | `saleMappings.${number}.eventNames`;control: Control<FormData>;options: EventNameOption[];+ usedByOthers: Map<string, string>;isLoading: boolean;- label: string;- description: string;+ disabled: boolean;placeholder: string;emptyState: string;}) {return (- <div className="mt-6">- <p className="mb-2 text-sm font-medium text-neutral-700">{label}</p>- <p className="mb-4 text-sm leading-normal text-neutral-600">- {description}- </p>- <Controller- name={name}- control={control}- render={({ field }) => (- <Combobox- multiple- options={isLoading ? undefined : options}- selected={(field.value ?? []).map(- (eventName) =>- options.find((option) => option.value === eventName) ?? {- value: eventName,- label: eventName,- },- )}- setSelected={(selected) => {- field.onChange(selected.map((option) => option.value));- }}- onCreate={async (search) => {- const eventName = search.trim();- if (!eventName) {- return false;- }- const current = field.value ?? [];- if (!current.includes(eventName)) {- field.onChange([...current, eventName]);- }- return true;- }}- createLabel={(search) => `Add "${search.trim()}"`}- placeholder={isLoading ? "Loading event names..." : placeholder}- searchPlaceholder="Search or add event names..."- emptyState={emptyState}- optionRight={(option) =>- option.meta?.count != null ? (- <span className="text-xs text-neutral-500">- {nFormatter(option.meta.count, { full: true })}- </span>- ) : undefined+ <Controller+ name={name}+ control={control}+ render={({ field }) => (+ <Combobox+ multiple+ options={isLoading || disabled ? undefined : options}+ selected={(field.value ?? []).map(+ (eventName) =>+ options.find((option) => option.value === eventName) ?? {+ value: eventName,+ label: eventName,+ },+ )}+ setSelected={(selected) => {+ if (disabled) {+ return;}- matchTriggerWidth- caret={comboboxCaret}- buttonProps={comboboxButtonProps}- />- )}- />- </div>+ field.onChange(selected.map((option) => option.value));+ }}+ onCreate={async (search) => {+ if (disabled) {+ return false;+ }++ const eventName = search.trim();+ if (!eventName) {+ return false;+ }++ const usedBy = usedByOthers.get(eventName);+ if (usedBy) {+ toast.error(`Already mapped to ${usedBy}`);+ return false;+ }++ const current = field.value ?? [];+ if (!current.includes(eventName)) {+ field.onChange([...current, eventName]);+ }+ return true;+ }}+ createLabel={(search) => `Add "${search.trim()}"`}+ placeholder={+ isLoading && !disabled ? "Loading event names..." : placeholder+ }+ searchPlaceholder="Search or add event names..."+ emptyState={emptyState}+ optionRight={(option) =>+ option.meta?.count != null ? (+ <span className="text-xs text-neutral-500">+ {nFormatter(option.meta.count, { full: true })}+ </span>+ ) : undefined+ }+ matchTriggerWidth+ caret={comboboxCaret}+ buttonProps={{+ ...comboboxButtonProps,+ disabled,+ }}+ />+ )}+ />);}diff --git a/apps/web/lib/integrations/google-ads/update-google-ads-settings.ts b/apps/web/lib/integrations/google-ads/update-google-ads-settings.tsindex 5678f3c48f..20efcfac22 100644--- a/apps/web/lib/integrations/google-ads/update-google-ads-settings.ts+++ b/apps/web/lib/integrations/google-ads/update-google-ads-settings.ts@@ -9,6 +9,7 @@ import { revalidatePath } from "next/cache";import * as z from "zod/v4";import { inferLoginCustomerId } from "./api";import { googleAdsSettingsSchema } from "./schema";+import { getGoogleAdsEventMappingsError } from "./utils";const schema = googleAdsSettingsSchema.omit({ customers: true }).extend({workspaceId: z.string(),@@ -110,6 +111,16 @@ export const updateGoogleAdsSettingsAction = authActionClient}}+ const leadMappingsError = getGoogleAdsEventMappingsError(leadMappings);+ if (leadMappingsError) {+ throw new Error(`Lead events: ${leadMappingsError}`);+ }++ const saleMappingsError = getGoogleAdsEventMappingsError(saleMappings);+ if (saleMappingsError) {+ throw new Error(`Sale events: ${saleMappingsError}`);+ }+await prisma.installedIntegration.update({where: {id: installedIntegration.id,diff --git a/apps/web/lib/integrations/google-ads/utils.ts b/apps/web/lib/integrations/google-ads/utils.tsindex 0ccdc11304..2ba34fe948 100644--- a/apps/web/lib/integrations/google-ads/utils.ts+++ b/apps/web/lib/integrations/google-ads/utils.ts@@ -9,6 +9,49 @@ type GoogleAdsEventMapping = {eventNames: string[];};+export const findDuplicateMappingEventNames = (+ mappings: Pick<GoogleAdsEventMapping, "eventNames">[],+) => {+ const seen = new Set<string>();+ const duplicates = new Set<string>();++ for (const mapping of mappings) {+ for (const eventName of mapping.eventNames) {+ if (seen.has(eventName)) {+ duplicates.add(eventName);+ }+ seen.add(eventName);+ }+ }++ return [...duplicates];+};++export const getGoogleAdsEventMappingsError = (+ mappings: GoogleAdsEventMapping[],+) => {+ const duplicateEventNames = findDuplicateMappingEventNames(mappings);+ if (duplicateEventNames.length > 0) {+ return `Each event name can only be mapped to one conversion action: ${duplicateEventNames.join(", ")}`;+ }++ const conversionActions = mappings+ .map((mapping) => mapping.conversionAction)+ .filter(Boolean);+ if (new Set(conversionActions).size !== conversionActions.length) {+ return "Each conversion action can only be used once.";+ }++ const catchAllCount = mappings.filter(+ (mapping) => mapping.conversionAction && mapping.eventNames.length === 0,+ ).length;+ if (catchAllCount > 1) {+ return "Only one conversion action can receive unmatched events.";+ }++ return null;+};+// Prefer a mapping whose eventNames includes the event, then a catch-all// mapping with an empty eventNames list. Returns null when nothing matches.export const resolveGoogleAdsConversionMapping = ({diff --git a/apps/web/lib/integrations/hubspot/ui/settings.tsx b/apps/web/lib/integrations/hubspot/ui/settings.tsxindex b03995a354..34d42348dd 100644--- a/apps/web/lib/integrations/hubspot/ui/settings.tsx+++ b/apps/web/lib/integrations/hubspot/ui/settings.tsx@@ -66,7 +66,7 @@ export const HubSpotSettings = ({}return (- <form className="mt-4 space-y-4" onSubmit={onSubmit}>+ <form className="space-y-4" onSubmit={onSubmit}><div className="rounded-lg border border-neutral-200 bg-white"><div className="flex items-center gap-x-2 border-b border-neutral-200 px-4 py-4"><p className="text-sm font-medium text-neutral-700">diff --git a/apps/web/lib/integrations/segment/ui/set-write-key.tsx b/apps/web/lib/integrations/segment/ui/set-write-key.tsxindex bfd22d07e6..c6c5f8ddd3 100644--- a/apps/web/lib/integrations/segment/ui/set-write-key.tsx+++ b/apps/web/lib/integrations/segment/ui/set-write-key.tsx@@ -55,7 +55,7 @@ export function SetWriteKey({);return (- <form className="mt-4 flex items-end gap-2" onSubmit={onSubmit}>+ <form className="flex items-end gap-2" onSubmit={onSubmit}><div className="w-full rounded-lg border border-neutral-200 bg-white"><div className="flex items-center gap-x-2 border-b border-neutral-200 px-6 py-4"><Lock className="size-4" />diff --git a/apps/web/lib/integrations/stripe/ui/settings.tsx b/apps/web/lib/integrations/stripe/ui/settings.tsxindex 6454ad76f7..6ca2882fe5 100644--- a/apps/web/lib/integrations/stripe/ui/settings.tsx+++ b/apps/web/lib/integrations/stripe/ui/settings.tsx@@ -111,7 +111,7 @@ export const StripeIntegrationSettings = ({}return (- <form className="mt-4 space-y-4" onSubmit={onSubmit}>+ <form className="space-y-4" onSubmit={onSubmit}><div className="rounded-lg border border-neutral-200 bg-white"><div className="flex items-center gap-x-2 border-b border-neutral-200 px-4 py-4"><p className="text-sm font-medium text-neutral-700">diff --git a/apps/web/tests/misc/google-ads-lead-event-filter.test.ts b/apps/web/tests/misc/google-ads-lead-event-filter.test.tsindex 5b527a8e1f..71bb7e9596 100644--- a/apps/web/tests/misc/google-ads-lead-event-filter.test.ts+++ b/apps/web/tests/misc/google-ads-lead-event-filter.test.ts@@ -1,4 +1,7 @@-import { resolveGoogleAdsConversionMapping } from "@/lib/integrations/google-ads/utils";+import {+ getGoogleAdsEventMappingsError,+ resolveGoogleAdsConversionMapping,+} from "@/lib/integrations/google-ads/utils";import { describe, expect, it } from "vitest";const signUpAction = "customers/1/conversionActions/signup";@@ -79,3 +82,41 @@ describe("resolveGoogleAdsConversionMapping", () => {).toEqual({ conversionAction: signUpAction, eventNames: [] });});});++describe("getGoogleAdsEventMappingsError", () => {+ it("returns null when event names are unique", () => {+ expect(+ getGoogleAdsEventMappingsError([+ { conversionAction: signUpAction, eventNames: ["Sign Up"] },+ { conversionAction: trialAction, eventNames: ["Started Trial"] },+ ]),+ ).toBeNull();+ });++ it("rejects the same event name on multiple conversion actions", () => {+ expect(+ getGoogleAdsEventMappingsError([+ { conversionAction: signUpAction, eventNames: ["Sign Up"] },+ { conversionAction: trialAction, eventNames: ["Sign Up"] },+ ]),+ ).toContain("Sign Up");+ });++ it("rejects the same conversion action more than once", () => {+ expect(+ getGoogleAdsEventMappingsError([+ { conversionAction: signUpAction, eventNames: ["Sign Up"] },+ { conversionAction: signUpAction, eventNames: ["Started Trial"] },+ ]),+ ).toBe("Each conversion action can only be used once.");+ });++ it("rejects more than one catch-all mapping", () => {+ expect(+ getGoogleAdsEventMappingsError([+ { conversionAction: signUpAction, eventNames: [] },+ { conversionAction: trialAction, eventNames: [] },+ ]),+ ).toBe("Only one conversion action can receive unmatched events.");+ });+});