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 partner payout details sheet

Steven Tey5619e30aaf35
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
index ba69a73ef1..419445c7dc 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
@@ -7,6 +7,7 @@ import {
} from "@/lib/constants/payouts";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { PartnerEarningsResponse, PartnerPayoutResponse } from "@/lib/types";
+import { CLAWBACK_REASONS_MAP } from "@/lib/zod/schemas/commissions";
import { CustomerAvatar } from "@/ui/customers/customer-avatar";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
import {
@@ -178,7 +179,13 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
{
key: "Description",
- value: payout.description || "-",
+ value: payout.description ? (
+ <Tooltip content={payout.description}>
+ <span className="block truncate">{payout.description}</span>
+ </Tooltip>
+ ) : (
+ "-"
+ ),
},
{
@@ -270,11 +277,13 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
) || [],
columns: [
{
+ id: "details",
header: "Details",
+ maxSize: 280,
cell: ({ row }) => (
<div className="flex items-center gap-2">
{["click", "custom"].includes(row.original.type) ? (
- <div className="flex size-6 items-center justify-center rounded-full bg-neutral-100">
+ <div className="flex size-6 shrink-0 items-center justify-center rounded-full bg-neutral-100">
<CommissionTypeIcon
type={row.original.type}
className="size-4"
@@ -283,14 +292,22 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
) : (
<CustomerAvatar
customer={row.original.customer}
- className="size-6"
+ className="size-6 shrink-0"
/>
)}
- <div className="flex flex-col">
- <span className="text-sm text-neutral-700">
- {getCommissionTypeLabel(row.original)}
- </span>
+ <div className="flex min-w-0 flex-col">
+ {row.original.type === "custom" && row.original.description ? (
+ <Tooltip content={row.original.description}>
+ <span className="min-w-0 truncate text-sm text-neutral-700">
+ {row.original.description}
+ </span>
+ </Tooltip>
+ ) : (
+ <span className="min-w-0 truncate text-sm text-neutral-700">
+ {getCommissionTypeLabel(row.original)}
+ </span>
+ )}
<span className="text-xs text-neutral-500">
{formatDateTime(row.original.createdAt)}
</span>
@@ -301,7 +318,41 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
{
id: "earnings",
header: "Earnings",
- cell: ({ row }) => currencyFormatter(row.original.earnings),
+ maxSize: 100,
+ cell: ({ row }) => {
+ const commission = row.original;
+ const earnings = currencyFormatter(commission.earnings);
+
+ if (commission.description) {
+ const reason =
+ CLAWBACK_REASONS_MAP[commission.description]?.description ??
+ commission.description;
+
+ return (
+ <Tooltip content={reason}>
+ <span
+ className={cn(
+ "cursor-help truncate underline decoration-dotted underline-offset-2",
+ commission.earnings < 0 && "text-red-600",
+ )}
+ >
+ {earnings}
+ </span>
+ </Tooltip>
+ );
+ }
+
+ return (
+ <span
+ className={cn(
+ commission.earnings < 0 && "text-red-600",
+ "truncate",
+ )}
+ >
+ {earnings}
+ </span>
+ );
+ },
},
{
id: "type",
@@ -346,7 +397,7 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
<div className="text-base font-medium text-neutral-900">
Invoice details
</div>
- <div className="grid grid-cols-2 gap-3 text-sm">
+ <div className="grid grid-cols-[minmax(0,auto)_minmax(0,1fr)] gap-3 text-sm">
{invoiceData.map(({ key, value, tooltip }) => (
<Fragment key={key}>
<DynamicTooltipWrapper
@@ -364,7 +415,7 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
{key}
</div>
</DynamicTooltipWrapper>
- <div className="text-neutral-800">{value}</div>
+ <div className="min-w-0 overflow-hidden text-neutral-800">{value}</div>
</Fragment>
))}
</div>
@@ -375,8 +426,8 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
<LoadingSpinner />
</div>
) : earnings?.length ? (
- <div className="p-6 pt-2">
- <Table {...table} />
+ <div className="min-w-0 overflow-hidden p-6 pt-2">
+ <Table {...table} containerClassName="min-w-0" />
</div>
) : null}
</div>
@@ -384,7 +435,7 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
<div className="sticky bottom-0 z-10 border-t border-neutral-200 bg-white">
<div className="flex items-center justify-between gap-2 p-5">
<Link
- href={`/programs/${payout.program.slug}/earnings?payoutId=${payout.id}&start=${payout.periodStart}&end=${payout.periodEnd}`}
+ href={`/programs/${payout.program.slug}/earnings?payoutId=${payout.id}&interval=all`}
target="_blank"
className="w-full"
>
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
index 26b7fc6ec0..c9efeb8583 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
@@ -12,7 +12,7 @@ import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
import { Filter, LoadingSpinner, ToggleGroup, useRouterStuff } from "@dub/ui";
import { Areas, TimeSeriesChart, XAxis, YAxis } from "@dub/ui/charts";
-import { CircleDotted, Hyperlink, Sliders, User } from "@dub/ui/icons";
+import { CircleDotted, Hyperlink, MoneyBill2, Sliders, User } from "@dub/ui/icons";
import {
capitalize,
cn,
@@ -346,12 +346,13 @@ function EarningsTableControls() {
);
const activeFilters = useMemo(() => {
- const { type, linkId, customerId, status } = searchParamsObj;
+ const { type, linkId, customerId, status, payoutId } = searchParamsObj;
return [
...(type ? [{ key: "type", value: type }] : []),
...(linkId ? [{ key: "linkId", value: linkId }] : []),
...(customerId ? [{ key: "customerId", value: customerId }] : []),
...(status ? [{ key: "status", value: status }] : []),
+ ...(payoutId ? [{ key: "payoutId", value: payoutId }] : []),
];
}, [searchParamsObj]);
@@ -370,7 +371,7 @@ function EarningsTableControls() {
const onRemoveAll = () =>
queryParams({
- del: ["linkId", "customerId", "status", "page"],
+ del: ["linkId", "customerId", "status", "payoutId", "page"],
});
return (
@@ -393,7 +394,15 @@ function EarningsTableControls() {
)}
/>
<Filter.List
- filters={filters}
+ filters={[
+ ...filters,
+ {
+ key: "payoutId",
+ icon: MoneyBill2,
+ label: "Payout",
+ options: [],
+ },
+ ]}
activeFilters={activeFilters}
onSelect={onSelect}
onRemove={onRemove}
diff --git a/apps/web/lib/swr/use-partner-earnings-count.ts b/apps/web/lib/swr/use-partner-earnings-count.ts
index 7c4f241986..23c1b6f261 100644
--- a/apps/web/lib/swr/use-partner-earnings-count.ts
+++ b/apps/web/lib/swr/use-partner-earnings-count.ts
@@ -28,6 +28,7 @@ export default function usePartnerEarningsCount<T>(opts?: {
"linkId",
"customerId",
"status",
+ "payoutId",
"interval",
"start",
"end",