Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Improve referring partner attribution and partner selector

Kiran K159e4342e263
diff --git a/apps/web/lib/partner-referrals/attribute-referring-partner.ts b/apps/web/lib/partner-referrals/attribute-referring-partner.ts
index a1ba2bc9fb..a5eedad9ea 100644
--- a/apps/web/lib/partner-referrals/attribute-referring-partner.ts
+++ b/apps/web/lib/partner-referrals/attribute-referring-partner.ts
@@ -72,14 +72,6 @@ export const attributeReferringPartnerAction = authActionClient
}),
]);
- if (programEnrollment.status !== "approved") {
- throw new DubApiError({
- code: "bad_request",
- message:
- "Only approved partners can be attributed a referring partner.",
- });
- }
-
if (referringProgramEnrollment.status !== "approved") {
throw new DubApiError({
code: "bad_request",
@@ -105,30 +97,41 @@ export const attributeReferringPartnerAction = authActionClient
const baseDate =
programEnrollment.application?.createdAt ?? programEnrollment.createdAt;
- await prisma.programApplicationEvent.upsert({
- where: {
- programId_partnerId: {
+ try {
+ await prisma.programApplicationEvent.upsert({
+ where: {
+ programId_partnerId: {
+ programId,
+ partnerId,
+ },
+ referredByPartnerId: null,
+ },
+ update: {
+ referredByPartnerId,
+ },
+ create: {
+ id: createId({ prefix: "pga_evt_" }),
programId,
partnerId,
+ referredByPartnerId,
+ referralSource: "manual",
+ country: referringProgramEnrollment.partner.country,
+ visitedAt: subMinutes(baseDate, 30),
+ startedAt: subMinutes(baseDate, 5),
+ submittedAt: subMinutes(baseDate, 1),
+ approvedAt: programEnrollment.createdAt,
},
- referredByPartnerId: null,
- },
- update: {
- referredByPartnerId,
- },
- create: {
- id: createId({ prefix: "pga_evt_" }),
- programId,
- partnerId,
- referredByPartnerId,
- referralSource: "manual",
- country: referringProgramEnrollment.partner.country,
- visitedAt: subMinutes(baseDate, 30),
- startedAt: subMinutes(baseDate, 5),
- submittedAt: subMinutes(baseDate, 1),
- approvedAt: programEnrollment.createdAt,
- },
- });
+ });
+ } catch (error) {
+ if (error.code === "P2002") {
+ throw new DubApiError({
+ code: "conflict",
+ message: "This partner already has a referring partner.",
+ });
+ }
+
+ throw error;
+ }
if (
createCommissionsForPastEvents &&
@@ -153,7 +156,6 @@ export const attributeReferringPartnerAction = authActionClient
correlation: {
programId,
partnerId,
- referredByPartnerId,
},
});
diff --git a/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx b/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx
index b5c9f62786..932c1cce76 100644
--- a/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx
+++ b/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx
@@ -5,9 +5,13 @@ import { mutatePrefix } from "@/lib/swr/mutate";
import useWorkspace from "@/lib/swr/use-workspace";
import { EnrolledPartnerProps } from "@/lib/types";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { PartnerSelector } from "@/ui/partners/partner-selector";
+import {
+ PartnerSelector,
+ SelectedPartner,
+} from "@/ui/partners/partner-selector";
import { Markdown } from "@/ui/shared/markdown";
import { Button, Modal, Switch } from "@dub/ui";
+import { currencyFormatter } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
import {
Dispatch,
@@ -28,13 +32,14 @@ function AttributeReferringPartnerModal({
setShowModal: Dispatch<SetStateAction<boolean>>;
partner: Pick<
EnrolledPartnerProps,
- "id" | "name" | "email" | "image" | "groupId"
+ "id" | "name" | "email" | "image" | "groupId" | "totalCommissions"
>;
}) {
const { id: workspaceId } = useWorkspace();
- const [referredByPartnerId, setReferredByPartnerId] = useState<string | null>(
- null,
- );
+
+ const [referredByPartner, setReferredByPartner] =
+ useState<SelectedPartner | null>(null);
+
const [createCommissionsForPastEvents, setCreateCommissionsForPastEvents] =
useState(false);
@@ -53,19 +58,19 @@ function AttributeReferringPartnerModal({
);
const onSubmit = useCallback(async () => {
- if (!workspaceId || !referredByPartnerId) return;
+ if (!workspaceId || !referredByPartner?.id) return;
await executeAsync({
workspaceId,
partnerId: partner.id,
- referredByPartnerId,
+ referredByPartnerId: referredByPartner?.id,
createCommissionsForPastEvents,
});
}, [
executeAsync,
workspaceId,
partner.id,
- referredByPartnerId,
+ referredByPartner?.id,
createCommissionsForPastEvents,
]);
@@ -104,22 +109,49 @@ function AttributeReferringPartnerModal({
</label>
<div className="mt-1.5">
<PartnerSelector
- selectedPartnerId={referredByPartnerId}
- setSelectedPartnerId={setReferredByPartnerId}
+ selectedPartnerId={referredByPartner?.id || null}
+ setSelectedPartnerId={() => {}}
+ onSelectedPartner={setReferredByPartner}
/>
</div>
</div>
<div>
- <div className="flex items-center gap-3">
+ <div className="flex items-start gap-3">
<Switch
checked={createCommissionsForPastEvents}
fn={setCreateCommissionsForPastEvents}
+ disabled={
+ !referredByPartner?.id ||
+ partner.id === referredByPartner?.id ||
+ partner.totalCommissions === 0
+ }
/>
- <span className="text-sm font-medium text-neutral-800">
- Create commissions for eligible past events
- </span>
+ <div className="-mt-0.5 space-y-1">
+ <p className="text-sm font-medium text-neutral-800">
+ Create commissions for eligible past events
+ </p>
+
+ {createCommissionsForPastEvents && (
+ <p className="text-content-subtle text-sm">
+ This will generate partner referral commissions for{" "}
+ <span className="font-semibold text-neutral-900">
+ {referredByPartner?.name}
+ </span>{" "}
+ based on all of{" "}
+ <span className="font-semibold text-neutral-900">
+ {partner.name}
+ </span>
+ 's historical commissions (
+ <span className="font-semibold text-neutral-900">
+ Total:
+ {currencyFormatter(partner.totalCommissions)}
+ </span>
+ )
+ </p>
+ )}
+ </div>
</div>
</div>
</div>
@@ -136,7 +168,12 @@ function AttributeReferringPartnerModal({
onClick={onSubmit}
variant="primary"
text="Attribute partner"
- disabled={!workspaceId || !referredByPartnerId || isPending}
+ disabled={
+ !workspaceId ||
+ !referredByPartner?.id ||
+ isPending ||
+ partner.id === referredByPartner?.id
+ }
loading={isPending}
className="h-8 w-fit px-3"
/>
@@ -150,7 +187,7 @@ export function useAttributeReferringPartnerModal({
}: {
partner: Pick<
EnrolledPartnerProps,
- "id" | "name" | "email" | "image" | "groupId"
+ "id" | "name" | "email" | "image" | "groupId" | "totalCommissions"
>;
}) {
const [showModal, setShowModal] = useState(false);
diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsx
index b82d229e05..8d05e40c7a 100644
--- a/apps/web/ui/partners/partner-info-cards.tsx
+++ b/apps/web/ui/partners/partner-info-cards.tsx
@@ -504,7 +504,7 @@ function ReferredByPartner({
}) {
const { slug } = useWorkspace();
- const { referral, loading } = usePartnerReferral({
+ const { referral, loading, error } = usePartnerReferral({
partnerId: partner?.id,
});
@@ -513,6 +513,10 @@ function ReferredByPartner({
setShowAttributeReferringPartnerModal,
} = useAttributeReferringPartnerModal({ partner });
+ if (error) {
+ return null;
+ }
+
if (loading) {
return (
<span className="flex min-w-0 items-center gap-1">
diff --git a/apps/web/ui/partners/partner-selector.tsx b/apps/web/ui/partners/partner-selector.tsx
index 09f95ca77f..517fc46793 100644
--- a/apps/web/ui/partners/partner-selector.tsx
+++ b/apps/web/ui/partners/partner-selector.tsx
@@ -7,11 +7,18 @@ import { useEffect, useMemo, useState } from "react";
import { useDebounce } from "use-debounce";
import { PartnerAvatar } from "./partner-avatar";
-export type Partner = Pick<PartnerProps, "id" | "name">;
+export type SelectedPartner = Pick<
+ PartnerProps,
+ "id" | "name" | "email" | "image"
+>;
+
+// TODO:
+// Make this return the full partner object instead of just the id by default
type PartnerSelectorProps = {
selectedPartnerId: string | null;
setSelectedPartnerId: (partnerId: string) => void;
+ onSelectedPartner?: (selectedPartner: SelectedPartner) => void;
disabled?: boolean;
variant?: "default" | "header";
} & Partial<ComboboxProps<false, any>>;
@@ -19,6 +26,7 @@ type PartnerSelectorProps = {
export function PartnerSelector({
selectedPartnerId,
setSelectedPartnerId,
+ onSelectedPartner,
disabled,
variant = "default",
...rest
@@ -75,6 +83,13 @@ export function PartnerSelector({
setSelected={(option) => {
if (!option) return;
setSelectedPartnerId(option.value);
+ const partner = [...(partners || []), ...(selectedPartners || [])].find(
+ (p) => p.id === option.value,
+ );
+
+ if (partner) {
+ onSelectedPartner?.(partner);
+ }
}}
selected={selectedOption}
icon={