Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export const GET = withPartnerProfile(
key: true,
shortLink: true,
url: true,
partnerLinkTitle: true,
},
});

Expand All @@ -116,6 +117,7 @@ export const GET = withPartnerProfile(
key: link.key,
shortLink: link.shortLink,
url: link.url,
partnerLinkTitle: link?.partnerLinkTitle,
};
})
.filter(Boolean);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export const GET = withPartnerProfile(
domain: link?.domain,
key: link?.key,
url: link?.url,
partnerLinkTitle: link?.partnerLinkTitle,
_count,
};
}) as any[]; // TODO: find a better fix for types
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
import { withPartnerProfile } from "@/lib/auth/partner";
import { prisma } from "@/lib/prisma";
import { NewLinkProps } from "@/lib/types";
import { PartnerProfileLinkSchema } from "@/lib/zod/schemas/partner-profile";
import { createPartnerLinkSchema } from "@/lib/zod/schemas/partners";
import {
PartnerProfileLinkSchema,
updatePartnerProfileLinkSchema,
} from "@/lib/zod/schemas/partner-profile";
import { getPrettyUrl, toCentsNumber } from "@dub/utils";
import { NextResponse } from "next/server";

// PATCH /api/partner-profile/[programId]/links/[linkId] - update a link for a partner
export const PATCH = withPartnerProfile(
async ({ partner, params, req, session }) => {
const { url, key, comments } = createPartnerLinkSchema
.pick({ url: true, key: true, comments: true })
.parse(await parseRequestBody(req));
const { url, key, partnerLinkTitle, partnerLinkComments } =
updatePartnerProfileLinkSchema.parse(await parseRequestBody(req));

const { programId, linkId } = params;

Expand Down Expand Up @@ -68,7 +69,9 @@ export const PATCH = withPartnerProfile(
});
}

const linkUrlChanged = getPrettyUrl(link.url) !== getPrettyUrl(url);
const nextUrl = url ?? link.url;
const nextKey = key ?? link.key;
const linkUrlChanged = getPrettyUrl(link.url) !== getPrettyUrl(nextUrl);

if (linkUrlChanged) {
if (link.partnerGroupDefaultLinkId) {
Expand All @@ -78,7 +81,7 @@ export const PATCH = withPartnerProfile(
"You cannot update the destination URL of your default link.",
});
} else {
validatePartnerLinkUrl({ group, url });
validatePartnerLinkUrl({ group, url: nextUrl });
}
}

Expand All @@ -92,7 +95,7 @@ export const PATCH = withPartnerProfile(
: null;

// if domain and key are the same, we don't need to check if the key exists
const skipKeyChecks = link.key.toLowerCase() === key?.toLowerCase();
const skipKeyChecks = link.key.toLowerCase() === nextKey.toLowerCase();

const {
link: processedLink,
Expand All @@ -118,10 +121,16 @@ export const PATCH = withPartnerProfile(
? link.testStartedAt.toISOString()
: link.testStartedAt,

// merge in new props
key: key || undefined,
url: url || program.url,
comments,
key: nextKey,
url: nextUrl,
partnerLinkTitle:
partnerLinkTitle !== undefined
? partnerLinkTitle
: link.partnerLinkTitle,
partnerLinkComments:
partnerLinkComments !== undefined
? partnerLinkComments
: link.partnerLinkComments,
},
workspace: {
id: program.workspaceId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { parseRequestBody } from "@/lib/api/utils";
import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
import { withPartnerProfile } from "@/lib/auth/partner";
import { prisma } from "@/lib/prisma";
import { PartnerProfileLinkSchema } from "@/lib/zod/schemas/partner-profile";
import {
createPartnerLinkSchema,
INACTIVE_ENROLLMENT_STATUSES,
} from "@/lib/zod/schemas/partners";
createPartnerProfileLinkSchema,
PartnerProfileLinkSchema,
} from "@/lib/zod/schemas/partner-profile";
import { INACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
import { getUTMParamsFromURL } from "@dub/utils";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
Expand Down Expand Up @@ -47,9 +47,8 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
// POST /api/partner-profile/[programId]/links - create a link for a partner
export const POST = withPartnerProfile(
async ({ partner, params, req, session }) => {
const { url, key, comments } = createPartnerLinkSchema
.pick({ url: true, key: true, comments: true })
.parse(await parseRequestBody(req));
const { url, key, partnerLinkTitle, partnerLinkComments } =
createPartnerProfileLinkSchema.parse(await parseRequestBody(req));

const {
program,
Expand Down Expand Up @@ -125,7 +124,8 @@ export const POST = withPartnerProfile(
tenantId,
partnerId: partner.id,
folderId: program.defaultFolderId,
comments,
partnerLinkTitle,
partnerLinkComments,
trackConversion: true,
},
workspace: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { PARTNER_CUSTOMERS_MAX_PAGE_SIZE } from "@/lib/constants/partner-profile";
import usePartnerCustomers from "@/lib/swr/use-partner-customers";
import usePartnerCustomersCount from "@/lib/swr/use-partner-customers-count";
import { usePartnerLinksDisplay } from "@/lib/swr/use-partner-links-display";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { CustomerRowItem } from "@/ui/customers/customer-row-item";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
Expand Down Expand Up @@ -32,6 +33,7 @@ export default function PartnerProgramCustomersPage() {

const { programSlug } = useParams<{ programSlug: string }>();
const { programEnrollment } = useProgramEnrollment();
const { displayProperties } = usePartnerLinksDisplay();

const { data: customersCount, error: countError } =
usePartnerCustomersCount();
Expand Down Expand Up @@ -126,9 +128,17 @@ export default function PartnerProgramCustomersPage() {
/>
<span
className="truncate"
title={row.original.activity.link.shortLink}
title={
displayProperties.includes("title") &&
row.original.activity.link.partnerLinkTitle
? row.original.activity.link.partnerLinkTitle
: row.original.activity.link.shortLink
}
>
{getPrettyUrl(row.original.activity.link.shortLink)}
{displayProperties.includes("title") &&
row.original.activity.link.partnerLinkTitle
? row.original.activity.link.partnerLinkTitle
: getPrettyUrl(row.original.activity.link.shortLink)}
</span>
</a>
) : (
Expand Down Expand Up @@ -209,7 +219,7 @@ export default function PartnerProgramCustomersPage() {
header: () => <EditColumnsButton table={table} />,
},
].filter((c) => c.id === "menu" || customersColumns.all.includes(c.id)),
[programSlug],
[programSlug, displayProperties],
);

const { table, ...tableProps } = useTable({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import usePartnerCustomersCount from "@/lib/swr/use-partner-customers-count";
import { usePartnerLinksDisplay } from "@/lib/swr/use-partner-links-display";
import { CountryFlag } from "@/ui/shared/country-flag";
import { useRouterStuff } from "@dub/ui";
import { Globe, Hyperlink } from "@dub/ui/icons";
Expand All @@ -8,6 +9,7 @@ import { useCallback, useMemo, useState } from "react";
export function usePartnerCustomerFilters() {
const { searchParamsObj, queryParams } = useRouterStuff();
const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
const { displayProperties } = usePartnerLinksDisplay();

const { data: countriesCount } = usePartnerCustomersCount<
| {
Expand All @@ -28,6 +30,7 @@ export function usePartnerCustomerFilters() {
domain: string;
key: string;
shortLink: string;
partnerLinkTitle?: string | null;
_count: number;
}[]
| undefined
Expand Down Expand Up @@ -55,15 +58,20 @@ export function usePartnerCustomerFilters() {
icon: Hyperlink,
label: "Link",
options:
linksCount?.map(({ linkId, domain, key, shortLink, _count }) => ({
value: linkId,
label: linkConstructor({ domain, key, pretty: true }),
data: { shortLink },
right: nFormatter(_count, { full: true }),
})) ?? null,
linksCount?.map(
({ linkId, domain, key, shortLink, partnerLinkTitle, _count }) => ({
value: linkId,
label:
displayProperties.includes("title") && partnerLinkTitle
? partnerLinkTitle
: linkConstructor({ domain, key, pretty: true }),
data: { shortLink },
right: nFormatter(_count, { full: true }),
}),
) ?? null,
},
],
[countriesCount, linksCount],
[countriesCount, linksCount, displayProperties],
);

const activeFilters = useMemo(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { IntervalOptions } from "@/lib/analytics/types";
import usePartnerEarningsCount from "@/lib/swr/use-partner-earnings-count";
import { usePartnerEarningsTimeseries } from "@/lib/swr/use-partner-earnings-timeseries";
import usePartnerLinks from "@/lib/swr/use-partner-links";
import { usePartnerLinksDisplay } from "@/lib/swr/use-partner-links-display";
import { LinkIcon } from "@/ui/links/link-icon";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
Expand Down Expand Up @@ -61,6 +62,7 @@ export function EarningsCompositeChart() {
};

const { links } = usePartnerLinks();
const { displayProperties } = usePartnerLinksDisplay();

const { data } = usePartnerEarningsTimeseries({
interval,
Expand Down Expand Up @@ -208,9 +210,12 @@ export function EarningsCompositeChart() {
)}
/>
<span className="min-w-0 truncate font-medium text-neutral-700">
{link?.shortLink
? getPrettyUrl(link.shortLink)
: capitalize(id)}
{displayProperties.includes("title") &&
link?.partnerLinkTitle
? link.partnerLinkTitle
: link?.shortLink
? getPrettyUrl(link.shortLink)
: capitalize(id)}
</span>
</div>
<p className="text-right text-neutral-500">
Expand Down Expand Up @@ -253,9 +258,17 @@ export function EarningsCompositeChart() {
function EarningsTableControls() {
const { queryParams, searchParamsObj } = useRouterStuff();
const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
const { displayProperties } = usePartnerLinksDisplay();

const { earningsCount: links } = usePartnerEarningsCount<
{ id: string; domain: string; key: string; url: string; _count: number }[]
{
id: string;
domain: string;
key: string;
url: string;
partnerLinkTitle?: string | null;
_count: number;
}[]
>({
groupBy: "linkId",
enabled:
Expand Down Expand Up @@ -300,13 +313,16 @@ function EarningsTableControls() {
return <LinkIcon url={props.option?.data?.url} />;
},
options:
links?.map(({ id, domain, key, url }) => ({
links?.map(({ id, domain, key, url, partnerLinkTitle }) => ({
value: id,
label: linkConstructor({
domain,
key,
pretty: true,
}),
label:
displayProperties.includes("title") && partnerLinkTitle
? partnerLinkTitle
: linkConstructor({
domain,
key,
pretty: true,
}),
data: { url },
})) ?? null,
},
Expand Down Expand Up @@ -342,7 +358,7 @@ function EarningsTableControls() {
}),
},
],
[links, customers, statuses],
[links, customers, statuses, displayProperties],
);

const activeFilters = useMemo(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use client";

import usePartnerEarningsCount from "@/lib/swr/use-partner-earnings-count";
import { usePartnerLinksDisplay } from "@/lib/swr/use-partner-links-display";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { PartnerEarningsResponse } from "@/lib/types";
Expand Down Expand Up @@ -48,6 +49,7 @@ export function EarningsTablePartner({ limit }: { limit?: number }) {
const { partner } = usePartnerProfile();
const { programEnrollment, showDetailedAnalytics } = useProgramEnrollment();
const { queryParams, searchParamsObj, getQueryString } = useRouterStuff();
const { displayProperties } = usePartnerLinksDisplay();

const { sortBy = "createdAt", sortOrder = "desc" } = searchParamsObj as {
sortBy?: "createdAt";
Expand Down Expand Up @@ -113,15 +115,23 @@ export function EarningsTablePartner({ limit }: { limit?: number }) {
row.original.link ? { linkId: row.original.link.id } : null,
},
cell: ({ row }) => {
const referralLink = row.original.link
const link = row.original.link;
const referralLink = link
? {
apexDomain: getApexDomain(row.original.link.url),
shortLink: row.original.link.shortLink,
apexDomain: getApexDomain(link.url),
shortLink: link.shortLink,
label:
displayProperties.includes("title") && link.partnerLinkTitle
? link.partnerLinkTitle
: getPrettyUrl(link.shortLink),
}
: row.original.type === CommissionType.referral && partner?.username
? {
apexDomain: "dub.co",
shortLink: `https://partners.dub.co/${programSlug}/apply?via=${partner.username}`,
label: getPrettyUrl(
`https://partners.dub.co/${programSlug}/apply?via=${partner.username}`,
),
}
: null;

Expand All @@ -138,8 +148,8 @@ export function EarningsTablePartner({ limit }: { limit?: number }) {
successMessage="Copied link to clipboard!"
className="truncate"
>
<span className="truncate" title={referralLink.shortLink}>
{getPrettyUrl(referralLink.shortLink)}
<span className="truncate" title={referralLink.label}>
{referralLink.label}
</span>
</CopyText>
</div>
Expand Down
Loading
Loading