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.

fix usePayoutsCount to use ignoreParams

Steven Teyb978241f69bd
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
index 292f6f0f66..311c67aa64 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
@@ -1,6 +1,6 @@
import { usePartnerMessagesCount } from "@/lib/swr/use-partner-messages-count";
import usePartnersCount from "@/lib/swr/use-partners-count";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { ProgramOverviewCard } from "@/ui/partners/overview/program-overview-card";
import { MoneyBills2, Msgs, UserCheck } from "@dub/ui";
@@ -21,6 +21,7 @@ export function OverviewTasks() {
} = usePayoutsCount<number | undefined>({
eligibility: "eligible",
status: "pending",
+ ignoreParams: true,
});
const { count: unreadMessagesCount, isLoading: unreadMessagesLoading } =
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
index c83022cdee..a698a75062 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
@@ -1,7 +1,7 @@
"use client";
import { clientAccessCheck } from "@/lib/client-access-check";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { PayoutsCount } from "@/lib/types";
import { ConfirmPayoutsSheet } from "@/ui/partners/confirm-payouts-sheet";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
index 264c977307..9c6adc9b5a 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
@@ -2,7 +2,7 @@
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { FraudGroupCountByPartner, PayoutResponse } from "@/lib/types";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx
index cd5776ccaa..3700cb185f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx
@@ -1,5 +1,5 @@
import usePartners from "@/lib/swr/use-partners";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import { EnrolledPartnerProps, PayoutsCount } from "@/lib/types";
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
import { useRouterStuff } from "@dub/ui";
diff --git a/apps/web/lib/swr/use-partners-count.ts b/apps/web/lib/swr/use-partners-count.ts
index d286d7fc62..37e9af8935 100644
--- a/apps/web/lib/swr/use-partners-count.ts
+++ b/apps/web/lib/swr/use-partners-count.ts
@@ -11,7 +11,6 @@ export default function usePartnersCount<T>({
enabled,
...params
}: z.infer<typeof partnersCountQuerySchema> & {
- programId?: string;
ignoreParams?: boolean;
enabled?: boolean;
} = {}) {
diff --git a/apps/web/lib/swr/use-payouts-count.ts b/apps/web/lib/swr/use-payouts-count.ts
index bd8088d18c..e5f3f2a902 100644
--- a/apps/web/lib/swr/use-payouts-count.ts
+++ b/apps/web/lib/swr/use-payouts-count.ts
@@ -6,10 +6,14 @@ import { PayoutsCount } from "../types";
import { payoutsCountQuerySchema } from "../zod/schemas/payouts";
import useWorkspace from "./use-workspace";
-export default function usePayoutsCount<T>({
+export function usePayoutsCount<T>({
+ ignoreParams,
enabled = true,
...query
-}: z.input<typeof payoutsCountQuerySchema> & { enabled?: boolean } = {}) {
+}: z.input<typeof payoutsCountQuerySchema> & {
+ ignoreParams?: boolean;
+ enabled?: boolean;
+} = {}) {
const { id: workspaceId, defaultProgramId } = useWorkspace();
const { getQueryString } = useRouterStuff();
@@ -23,7 +27,7 @@ export default function usePayoutsCount<T>({
workspaceId,
},
{
- include: ["status", "partnerId", "invoiceId"],
+ include: ignoreParams ? [] : ["status", "partnerId", "invoiceId"],
},
)}`,
fetcher,
diff --git a/apps/web/scripts/fix-broken-partner-users.ts b/apps/web/scripts/fix-broken-partner-users.ts
index 9d088a9e17..874cf88271 100644
--- a/apps/web/scripts/fix-broken-partner-users.ts
+++ b/apps/web/scripts/fix-broken-partner-users.ts
@@ -1,40 +1,52 @@
import { prisma } from "@dub/prisma";
+import { chunk } from "@dub/utils";
import "dotenv-flow/config";
async function main() {
- let batch = 0;
- while (true) {
- const partnerUserIds = await prisma.partnerUser.findMany({
- select: {
- userId: true,
+ const users = await prisma.user.findMany({
+ where: {
+ defaultPartnerId: null,
+ partners: {
+ some: {},
},
- take: 50000,
- skip: batch * 50000,
- });
- if (partnerUserIds.length === 0) {
- break;
- }
- const users = await prisma.user.findMany({
- where: {
- id: {
- in: partnerUserIds.map((partnerUser) => partnerUser.userId),
+ },
+ include: {
+ partners: {
+ select: {
+ partner: {
+ select: {
+ id: true,
+ email: true,
+ },
+ },
},
},
- });
- const usersThatDontExist = partnerUserIds.filter(
- (partnerUser) => !users.some((user) => user.id === partnerUser.userId),
- );
- console.log(usersThatDontExist);
+ },
+ });
- const deletedPartnerUsers = await prisma.partnerUser.deleteMany({
- where: {
- userId: {
- in: usersThatDontExist.map((partnerUser) => partnerUser.userId),
- },
- },
- });
- console.log(`Deleted ${deletedPartnerUsers.count} partner users`);
- batch++;
+ console.log(`Found ${users.length} users with no default partner id`);
+ console.table(
+ users.map((user) => ({
+ id: user.id,
+ email: user.email,
+ name: user.name,
+ partnerId: user.partners[0]?.partner.id,
+ partnerEmail: user.partners[0]?.partner.email,
+ matchingPartnerEmail:
+ user.partners[0]?.partner.email === user.email ? "Yes" : "No",
+ })),
+ );
+
+ const chunks = chunk(users, 20);
+ for (const chunk of chunks) {
+ await Promise.all(
+ chunk.map((user) =>
+ prisma.user.update({
+ where: { id: user.id },
+ data: { defaultPartnerId: user.partners[0]?.partner.id },
+ }),
+ ),
+ );
}
}
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index 6bc6c92c52..e642847779 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -7,7 +7,7 @@ import {
} from "@/lib/swr/use-bounty-submissions-count";
import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
import { usePartnerMessagesCount } from "@/lib/swr/use-partner-messages-count";
-import usePayoutsCount from "@/lib/swr/use-payouts-count";
+import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
import { useProgramReferralsCount } from "@/lib/swr/use-program-referrals-count";
import useWorkspace from "@/lib/swr/use-workspace";
@@ -568,6 +568,7 @@ export function AppSidebarNav({
>({
eligibility: "eligible",
status: "pending",
+ ignoreParams: true,
enabled: Boolean(currentArea === "program" && defaultProgramId),
});