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.

more partners.dub.co improvements

Steven Teyb5434412bfe3
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx
index cb6b069ff5..30af568d8d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx
@@ -9,6 +9,7 @@ import { PartnerPayoutResponse } from "@/lib/types";
import { PayoutRowMenu } from "@/ui/partners/payout-row-menu";
import { PayoutStatusBadgePartner } from "@/ui/partners/payout-status-badge-partner";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
+import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";
import {
AnimatedSizeContainer,
Filter,
@@ -33,19 +34,26 @@ import {
formatPeriod,
} from "@dub/utils";
import { PayoutStatus } from "@prisma/client";
+import { Cell } from "@tanstack/react-table";
import { addBusinessDays } from "date-fns";
import Link from "next/link";
import { useEffect, useState } from "react";
import { PayoutDetailsSheet } from "./partner-payout-details-sheet";
import { usePayoutFilters } from "./use-payout-filters";
+type ColumnMeta = {
+ filterParams?: (
+ args: Pick<Cell<PartnerPayoutResponse, any>, "row">,
+ ) => Record<string, any>;
+};
+
export function PayoutTable() {
const { queryParams, searchParams } = useRouterStuff();
const sortBy = searchParams.get("sortBy") || "initiatedAt";
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
- const { payouts, error, loading } = usePartnerPayouts();
+ const { payouts, error, isLoading } = usePartnerPayouts();
const { payoutsCount } = usePartnerPayoutsCount();
const [detailsSheetState, setDetailsSheetState] = useState<
@@ -67,8 +75,6 @@ export function PayoutTable() {
const table = useTable({
data: payouts || [],
- loading,
- error: error ? "Failed to load payouts" : undefined,
columns: [
{
id: "periodEnd",
@@ -76,6 +82,7 @@ export function PayoutTable() {
accessorFn: (d) => formatPeriod(d),
},
{
+ id: "program",
header: "Program",
cell: ({ row }) => (
<div className="flex items-center gap-2">
@@ -91,8 +98,14 @@ export function PayoutTable() {
<TestPayoutBadge environment={row.original.program.environment} />
</div>
),
+ meta: {
+ filterParams: ({ row }) => ({
+ programId: row.original.program.id,
+ }),
+ },
},
{
+ id: "status",
header: "Status",
cell: ({ row }) => (
<PayoutStatusBadgePartner
@@ -100,6 +113,11 @@ export function PayoutTable() {
program={row.original.program}
/>
),
+ meta: {
+ filterParams: ({ row }) => ({
+ status: row.original.status,
+ }),
+ },
},
{
id: "initiatedAt",
@@ -216,8 +234,19 @@ export function PayoutTable() {
},
thClassName: "border-l-0",
tdClassName: "border-l-0",
+ cellRight: (cell) => {
+ const meta = cell.column.columnDef.meta as ColumnMeta | undefined;
+
+ return (
+ meta?.filterParams && (
+ <FilterButtonTableRow set={meta.filterParams(cell)} />
+ )
+ );
+ },
resourceName: (p) => `payout${p ? "s" : ""}`,
rowCount: payoutsCount?.[0]?.count ?? 0,
+ loading: isLoading,
+ error: error ? "Failed to load payouts" : undefined,
});
return (
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/programs-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/programs-table.tsx
index 072479ed48..5830a6b47c 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/programs-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/programs-table.tsx
@@ -137,7 +137,7 @@ function getColumns(tab: ProgramTab): ProgramColumn[] {
},
{
id: "activity",
- header: "Activity (last 12 months)",
+ header: "Earnings (last 12 months)",
size: 180,
cell: ({ row }) => (
<ProgramActivity programEnrollment={row.original} />
diff --git a/apps/web/lib/swr/use-partner-payouts.ts b/apps/web/lib/swr/use-partner-payouts.ts
index 4efdad5638..9daa357748 100644
--- a/apps/web/lib/swr/use-partner-payouts.ts
+++ b/apps/web/lib/swr/use-partner-payouts.ts
@@ -9,7 +9,11 @@ export default function usePartnerPayouts(opts?: Record<string, string>) {
const partnerId = session?.user?.["defaultPartnerId"];
const { getQueryString } = useRouterStuff();
- const { data: payouts, error } = useSWR<PartnerPayoutResponse[]>(
+ const {
+ data: payouts,
+ error,
+ isLoading,
+ } = useSWR<PartnerPayoutResponse[]>(
partnerId
? `/api/partner-profile/payouts${getQueryString(opts, {
include: [
@@ -31,6 +35,6 @@ export default function usePartnerPayouts(opts?: Record<string, string>) {
return {
payouts,
error,
- loading: !payouts && !error,
+ isLoading,
};
}
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index f3299a9485..436618c215 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -5,6 +5,7 @@ import { getGroupSubmittedLeadForm } from "@/lib/submitted-leads/get-group-submi
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { usePartnerProgramBounties } from "@/lib/swr/use-partner-program-bounties";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
+import useProgramEnrollmentsCount from "@/lib/swr/use-program-enrollments-count";
import { MarketplaceSidebarFilters } from "@/ui/program-marketplace/marketplace-sidebar-filters";
import { ProgramMarketplaceCard } from "@/ui/program-marketplace/program-marketplace-card";
import { isMarketplaceFilterSidebarPath } from "@/ui/program-marketplace/utils/urls";
@@ -53,6 +54,7 @@ type SidebarNavData = {
isMobile?: boolean;
programSlug?: string;
isUnapproved: boolean;
+ invitationsCount?: number;
unreadMessagesCount?: number;
programBountiesCount?: number;
showDetailedAnalytics?: boolean;
@@ -103,7 +105,11 @@ const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
},
];
-const PROGRAMS_CONTENT = (): { items: NavItemType[] }[] => [
+const PROGRAMS_CONTENT = ({
+ invitationsCount,
+}: {
+ invitationsCount?: number;
+}): { items: NavItemType[] }[] => [
{
items: [
{
@@ -115,6 +121,7 @@ const PROGRAMS_CONTENT = (): { items: NavItemType[] }[] => [
name: "Programs",
icon: GridIcon,
href: "/programs",
+ badge: invitationsCount || undefined,
},
{
name: "Marketplace",
@@ -129,15 +136,17 @@ const PROGRAMS_CONTENT = (): { items: NavItemType[] }[] => [
const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
// Top-level
- programs: () => ({
+ programs: ({ invitationsCount }) => ({
title: <PartnerProgramDropdown />,
- content: PROGRAMS_CONTENT(),
+ content: PROGRAMS_CONTENT({ invitationsCount }),
direction: "left",
}),
- marketplace: ({ isMobile }) => ({
+ marketplace: ({ isMobile, invitationsCount }) => ({
title: <PartnerProgramDropdown />,
- content: isMobile ? PROGRAMS_CONTENT() : <MarketplaceSidebarFilters />,
+ content: isMobile
+ ? PROGRAMS_CONTENT({ invitationsCount })
+ : <MarketplaceSidebarFilters />,
direction: "right",
}),
@@ -377,6 +386,10 @@ export function PartnersSidebarNav({
: false,
});
+ const { count: invitationsCount } = useProgramEnrollmentsCount({
+ status: "invited",
+ });
+
const { count: unreadMessagesCount } = useProgramMessagesCount({
enabled: true,
query: {
@@ -425,6 +438,7 @@ export function PartnersSidebarNav({
isMobile,
programSlug: programSlug || "",
isUnapproved,
+ invitationsCount,
unreadMessagesCount,
programBountiesCount: bountiesCount.active,
showDetailedAnalytics,