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.

Pass SWR options as the second argument to useDiscounts.

Kiran K1b17f2453b13
diff --git a/apps/web/lib/actions/partners/update-partner-enrollment.ts b/apps/web/lib/actions/partners/update-partner-enrollment.ts
index 91c4559b77..5085c2974d 100644
--- a/apps/web/lib/actions/partners/update-partner-enrollment.ts
+++ b/apps/web/lib/actions/partners/update-partner-enrollment.ts
@@ -10,7 +10,10 @@ import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-
import { throwIfExistingTenantEnrollmentExists } from "@/lib/api/partners/throw-if-existing-tenant-id-exists";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
-import { hasRewardAssignment } from "@/lib/api/rewards/reward-overrides";
+import {
+ hasRewardAssignment,
+ hasRewardIdsInput,
+} from "@/lib/api/rewards/reward-overrides";
import { throwIfInvalidRewards } from "@/lib/api/rewards/throw-if-invalid-rewards";
import { remapDiscountCodesForPartnerJob } from "@/lib/jobs/handlers/remap-discount-codes-for-partner-job";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
@@ -203,7 +206,7 @@ export const updatePartnerEnrollmentAction = authActionClient
? [recordLink(programEnrollment.links)]
: []),
- ...(hasRewardAssignment(rewardIds)
+ ...(hasRewardIdsInput(rewardIds)
? [linkCache.expireMany(programEnrollment.links)]
: []),
diff --git a/apps/web/lib/swr/use-discounts.ts b/apps/web/lib/swr/use-discounts.ts
index 8fa66c65e9..904470ed8d 100644
--- a/apps/web/lib/swr/use-discounts.ts
+++ b/apps/web/lib/swr/use-discounts.ts
@@ -10,12 +10,11 @@ export type DiscountListItem = DiscountProps & {
partnersCount?: number;
};
-export function useDiscounts({
- groupId,
- swrOpts,
-}: z.infer<typeof getDiscountsQuerySchema> & {
- swrOpts?: SWRConfiguration;
-} = {}) {
+export function useDiscounts(
+ opts: z.infer<typeof getDiscountsQuerySchema> = {},
+ swrOpts: SWRConfiguration = {},
+) {
+ const { groupId } = opts;
const { id: workspaceId, defaultProgramId } = useWorkspace();
const searchParams = new URLSearchParams({
@@ -23,11 +22,16 @@ export function useDiscounts({
...(groupId && { groupId }),
});
+ const requiresGroup = "groupId" in opts;
+ const canFetch =
+ workspaceId && defaultProgramId && (!requiresGroup || groupId);
+
const { data: discounts, error } = useSWR<DiscountListItem[]>(
- workspaceId && defaultProgramId && `/api/discounts?${searchParams}`,
+ canFetch ? `/api/discounts?${searchParams}` : null,
fetcher,
{
dedupingInterval: 60000,
+ keepPreviousData: !groupId,
...swrOpts,
},
);
diff --git a/apps/web/ui/modals/edit-partner-discount-modal.tsx b/apps/web/ui/modals/edit-partner-discount-modal.tsx
index dbabca66d5..abd8a13ae3 100644
--- a/apps/web/ui/modals/edit-partner-discount-modal.tsx
+++ b/apps/web/ui/modals/edit-partner-discount-modal.tsx
@@ -81,12 +81,14 @@ function EditPartnerDiscountModal({
const { group } = useGroup({
groupIdOrSlug: partner.groupId ?? undefined,
});
- const { discounts, loading: discountsLoading } = useDiscounts({
- groupId: partner.groupId,
- swrOpts: {
+ const { discounts, loading: discountsLoading } = useDiscounts(
+ {
+ groupId: partner.groupId,
+ },
+ {
revalidateOnFocus: true,
},
- });
+ );
const { executeAsync: updateEnrollment, isPending: isUpdatingEnrollment } =
useAction(updatePartnerEnrollmentAction, {