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 sheet from reopening

Marcus Farrell3a3d25b62907
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
index 9820c744e7..1e83a67d7a 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
@@ -392,9 +392,10 @@ export function ApplicationsTable({
{detailsSheetState.applicationId && currentApplication && (
<ProgramApplicationReviewSheet
isOpen={detailsSheetState.open}
- setIsOpen={(open) =>
- setDetailsSheetState((s) => ({ ...s, open }) as any)
- }
+ setIsOpen={(open) => {
+ setDetailsSheetState((s) => ({ ...s, open }) as any);
+ if (!open) queryParams({ del: ["applicationId", "partnerId"] });
+ }}
partner={currentApplication}
onPrevious={onPreviousApplication}
onNext={onNextApplication}
@@ -567,17 +568,20 @@ function useApplicationSheet({
| { open: true; applicationId: string }
>({ open: false, applicationId: null });
+ // Only reacts to URL changes, so a refetch of `partners` can't reopen the
+ // sheet while the navigation that removes `?applicationId=` is pending
useEffect(() => {
const applicationId = searchParams.get("applicationId");
if (applicationId) {
setDetailsSheetState({ open: true, applicationId });
- return;
}
+ }, [searchParams]);
+ useEffect(() => {
const partnerId = searchParams.get("partnerId");
- if (!partnerId || !partners) {
+ if (searchParams.get("applicationId") || !partnerId || !partners) {
return;
}
diff --git a/apps/web/ui/partners/program-application-review-sheet.tsx b/apps/web/ui/partners/program-application-review-sheet.tsx
index d3ac0f109a..948a548685 100644
--- a/apps/web/ui/partners/program-application-review-sheet.tsx
+++ b/apps/web/ui/partners/program-application-review-sheet.tsx
@@ -17,7 +17,6 @@ import {
Sheet,
TooltipContent,
useKeyboardShortcut,
- useRouterStuff,
} from "@dub/ui";
import { isWorkspaceBillingTrialActive } from "@dub/utils";
import Link from "next/link";
@@ -219,12 +218,10 @@ export function ProgramApplicationReviewSheet({
isOpen: boolean;
nested?: boolean;
}) {
- const { queryParams } = useRouterStuff();
return (
<Sheet
open={isOpen}
onOpenChange={rest.setIsOpen}
- onClose={() => queryParams({ del: ["applicationId", "partnerId"] })}
nested={nested}
contentProps={{
// 540px - 1170px width based on viewport