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.

Merge branch 'main' into partner-link-titles

Pedro Ladeira31e9e6968c20
diff --cc apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
index ef5189610a,b3eb5c4f96..3066dccab9
--- 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
@@@ -1,12 -1,11 +1,12 @@@
"use client";
- import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
- 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 {
+ usePartnerProfileEarningsCount,
+ usePartnerProfileEarningsTimeseries,
+ } from "@/lib/swr/use-partner-profile-earnings";
import { LinkIcon } from "@/ui/links/link-icon";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
@@@ -68,13 -62,10 +63,11 @@@ export function EarningsCompositeChart(
};
const { links } = usePartnerLinks();
+ const { displayProperties } = usePartnerLinksDisplay();
- const { data } = usePartnerEarningsTimeseries({
- interval,
+ const { data } = usePartnerProfileEarningsTimeseries({
+ ...filters,
groupBy,
- start: start ? startOfDay(new Date(start)) : undefined,
- end: end ? endOfDay(new Date(end)) : undefined,
});
const total = useMemo(
@@@ -263,19 -251,13 +256,21 @@@
function EarningsTableControls() {
const { queryParams, searchParamsObj } = useRouterStuff();
+ const earningsFilters = useProgramEarningsFilters();
const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
+ const { displayProperties } = usePartnerLinksDisplay();
- const { earningsCount: links } = usePartnerEarningsCount<
+ const { data: links } = usePartnerProfileEarningsCount<
- { id: string; domain: string; key: string; url: string; _count: number }[]
+ {
+ id: string;
+ domain: string;
+ key: string;
+ url: string;
+ partnerLinkTitle?: string | null;
+ _count: number;
+ }[]
>({
+ ...earningsFilters,
groupBy: "linkId",
enabled:
selectedFilter === "linkId" || searchParamsObj.linkId ? true : false,
@@@ -346,25 -327,26 +343,26 @@@
key: "status",
icon: CircleDotted,
label: "Status",
- options: statuses?.map(({ status, _count }) => {
- const Icon = CommissionStatusBadges[status].icon;
- return {
- value: status,
- label: CommissionStatusBadges[status].label,
- icon: (
- <Icon
- className={cn(
- CommissionStatusBadges[status].className,
- "size-4 bg-transparent",
- )}
- />
- ),
- right: nFormatter(_count, { full: true }),
- };
- }),
+ options:
+ statuses?.map(({ status, _count }) => {
+ const Icon = CommissionStatusBadges[status].icon;
+ return {
+ value: status,
+ label: CommissionStatusBadges[status].label,
+ icon: (
+ <Icon
+ className={cn(
+ CommissionStatusBadges[status].className,
+ "size-4 bg-transparent",
+ )}
+ />
+ ),
+ right: nFormatter(_count, { full: true }),
+ };
+ }) ?? null,
},
],
- [links, customers, statuses],
+ [links, customers, statuses, displayProperties],
);
const activeFilters = useMemo(() => {
diff --cc apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
index 871d6f6262,6f137e7e1d..f0f6dea100
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
@@@ -1,11 -1,13 +1,14 @@@
"use client";
import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
- 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 {
+ usePartnerProfileEarnings,
+ usePartnerProfileEarningsCount,
+ } from "@/lib/swr/use-partner-profile-earnings";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
- import { PartnerEarningsResponse } from "@/lib/types";
+ import { PartnerProfileEarningsResponse } from "@/lib/types";
import { CustomerRowItem } from "@/ui/customers/customer-row-item";
import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
@@@ -48,11 -49,11 +50,12 @@@ export function EarningsTablePartner({
const { programSlug } = useParams();
const { partner } = usePartnerProfile();
const { programEnrollment, showDetailedAnalytics } = useProgramEnrollment();
- const { queryParams, searchParamsObj, getQueryString } = useRouterStuff();
+ const { queryParams, searchParamsObj } = useRouterStuff();
+ const { displayProperties } = usePartnerLinksDisplay();
+ const filters = useProgramEarningsFilters();
const { sortBy = "createdAt", sortOrder = "desc" } = searchParamsObj as {
- sortBy?: "createdAt";
+ sortBy?: "createdAt" | "amount" | "earnings";
sortOrder?: "asc" | "desc";
};