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.

code improvements

Pedro Ladeira263551b368c4
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
index 69030e3f28..3e115c2fc8 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
@@ -8,8 +8,8 @@ import { IntervalOptions } from "@/lib/analytics/types";
import usePartnerLinks from "@/lib/swr/use-partner-links";
import {
PartnerLinksDisplayContext,
+ PartnerLinksDisplayOption,
PartnerLinksDisplayProvider,
- PartnerLinksViewMode,
} from "@/lib/swr/use-partner-links-display";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { usePartnerLinkModal } from "@/ui/modals/partner-link-modal";
@@ -28,7 +28,7 @@ const PartnerLinksContext = createContext<{
interval: (typeof DATE_RANGE_INTERVAL_PRESETS)[number];
openMenuLinkId: string | null;
setOpenMenuLinkId: (id: string | null) => void;
- viewMode: PartnerLinksViewMode;
+ displayOption: PartnerLinksDisplayOption;
} | null>(null);
export function usePartnerLinksContext() {
@@ -74,13 +74,15 @@ function PartnerProgramLinksPageInner({
error: ReturnType<typeof usePartnerLinks>["error"];
loading: boolean;
isValidating: boolean;
- programEnrollment: ReturnType<typeof useProgramEnrollment>["programEnrollment"];
+ programEnrollment: ReturnType<
+ typeof useProgramEnrollment
+ >["programEnrollment"];
showDetailedAnalytics?: boolean;
}) {
const { searchParamsObj } = useRouterStuff();
const { setShowPartnerLinkModal, PartnerLinkModal } = usePartnerLinkModal();
const [openMenuLinkId, setOpenMenuLinkId] = useState<string | null>(null);
- const { viewMode } = useContext(PartnerLinksDisplayContext);
+ const { displayOption } = useContext(PartnerLinksDisplayContext);
const {
start,
@@ -106,7 +108,8 @@ function PartnerProgramLinksPageInner({
enabled: canCreateNewLink ?? false,
});
- const showAllTimeAnalytics = !showDetailedAnalytics || viewMode === "rows";
+ const showAllTimeAnalytics =
+ !showDetailedAnalytics || displayOption === "cards";
return (
<div className="flex flex-col gap-4">
@@ -149,7 +152,7 @@ function PartnerProgramLinksPageInner({
interval,
openMenuLinkId,
setOpenMenuLinkId,
- viewMode,
+ displayOption,
}}
>
<ChartTooltipSync>
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
index 6d1231fa4d..529bc95954 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
@@ -1,10 +1,10 @@
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";
+import { PartnerLinksDisplayContext } from "@/lib/swr/use-partner-links-display";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { PartnerProfileLinkProps } from "@/lib/types";
import { CommentsBadge } from "@/ui/links/comments-badge";
-import { PartnerLinksDisplayContext } from "@/lib/swr/use-partner-links-display";
import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";
import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
import {
@@ -68,7 +68,7 @@ const CHARTS = [
export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
const { programEnrollment } = useProgramEnrollment();
- const { viewMode } = usePartnerLinksContext();
+ const { displayOption } = usePartnerLinksContext();
const { displayProperties } = useContext(PartnerLinksDisplayContext);
const partnerLink = constructPartnerLink({
@@ -213,12 +213,12 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
{discountCodeSection}
</Tooltip>
))}
- {viewMode === "rows" && <StatsBadge link={link} />}
+ {displayOption === "cards" && <StatsBadge link={link} />}
<Controls link={link} />
</div>
</div>
</div>
- {viewMode === "cards" && <StatsCharts link={link} />}
+ {displayOption === "full" && <StatsCharts link={link} />}
</CardList.Card>
);
}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-display.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-display.tsx
index 419331962f..add3354e65 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-display.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-display.tsx
@@ -1,23 +1,24 @@
"use client";
+import { PartnerLinksDisplayContext } from "@/lib/swr/use-partner-links-display";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import {
- PartnerLinksDisplayContext,
- partnerLinksDisplayProperties,
- PartnerLinksViewMode,
-} from "@/lib/swr/use-partner-links-display";
import { Button, Popover } from "@dub/ui";
-import { GridLayoutRows, Sliders, TableRows2 } from "@dub/ui/icons";
+import { GridIcon, GridLayoutRows, Sliders } from "@dub/ui/icons";
import { cn } from "@dub/utils";
import { ChevronDown } from "lucide-react";
import { AnimatePresence, motion } from "motion/react";
import { useContext, useState } from "react";
+const DISPLAY_PROPERTIES = [
+ { id: "link" as const, label: "Short link", switch: "title" as const },
+ { id: "title" as const, label: "Title", switch: "link" as const },
+];
+
export function PartnerLinkDisplay() {
const { showDetailedAnalytics } = useProgramEnrollment();
const {
- viewMode,
- setViewMode,
+ displayOption,
+ setDisplayOption,
displayProperties,
setDisplayProperties,
isDirty,
@@ -33,10 +34,10 @@ export function PartnerLinkDisplay() {
{!!showDetailedAnalytics && (
<div className="grid grid-cols-2 gap-2 p-3">
{[
+ { id: "full" as const, label: "Full", icon: GridIcon },
{ id: "cards" as const, label: "Cards", icon: GridLayoutRows },
- { id: "rows" as const, label: "Rows", icon: TableRows2 },
].map(({ id, label, icon: Icon }) => {
- const selected = viewMode === id;
+ const selected = displayOption === id;
return (
<button
key={id}
@@ -47,7 +48,7 @@ export function PartnerLinkDisplay() {
? "border-neutral-300 bg-neutral-100 text-neutral-950"
: "text-neutral-800 hover:bg-neutral-100 hover:text-neutral-950",
)}
- onClick={() => setViewMode(id as PartnerLinksViewMode)}
+ onClick={() => setDisplayOption(id)}
aria-pressed={selected}
>
<Icon
@@ -67,7 +68,7 @@ export function PartnerLinkDisplay() {
Display Properties
</span>
<div className="mt-4 flex flex-wrap gap-2">
- {partnerLinksDisplayProperties.map((property) => {
+ {DISPLAY_PROPERTIES.map((property) => {
const active = displayProperties.includes(property.id);
return (
<button
diff --git a/apps/web/lib/swr/use-partner-links-display.tsx b/apps/web/lib/swr/use-partner-links-display.tsx
index d158f8c54d..08cbf38b92 100644
--- a/apps/web/lib/swr/use-partner-links-display.tsx
+++ b/apps/web/lib/swr/use-partner-links-display.tsx
@@ -11,103 +11,37 @@ import {
useState,
} from "react";
-export type PartnerLinksViewMode = "cards" | "rows";
+export type PartnerLinksDisplayOption = "full" | "cards";
-export type PartnerLinksDisplayProperty = "link" | "title";
-
-export const partnerLinksDisplayProperties: {
- id: PartnerLinksDisplayProperty;
- label: string;
- switch: PartnerLinksDisplayProperty;
-}[] = [
- { id: "link", label: "Short link", switch: "title" },
- { id: "title", label: "Title", switch: "link" },
-];
+type PartnerLinksDisplayProperty = "link" | "title";
const DEFAULT_DISPLAY_PROPERTIES: PartnerLinksDisplayProperty[] = ["link"];
const STORAGE_KEY = "partnerLinksDisplay";
type PartnerLinksDisplayPreferences = {
- viewMode: PartnerLinksViewMode;
+ displayOption: PartnerLinksDisplayOption;
displayProperties: PartnerLinksDisplayProperty[];
};
-function resolveDefaultViewMode({
- linksCount,
- showDetailedAnalytics,
-}: {
- linksCount?: number;
- showDetailedAnalytics?: boolean;
-}): PartnerLinksViewMode {
- if ((linksCount && linksCount > 5) || !showDetailedAnalytics) return "rows";
- return "cards";
-}
-
-function readLegacyPrefs(): PartnerLinksDisplayPreferences | null {
- if (typeof window === "undefined") return null;
-
- try {
- const preferTitleRaw = window.localStorage.getItem(
- "partnerLinksDisplayPreferTitle",
- );
- const viewModeRaw = window.localStorage.getItem("partnerLinksViewMode");
-
- if (preferTitleRaw == null && viewModeRaw == null) {
- return null;
- }
-
- const preferTitle = preferTitleRaw ? JSON.parse(preferTitleRaw) : false;
- const parsedViewMode = viewModeRaw ? JSON.parse(viewModeRaw) : null;
- const viewMode: PartnerLinksViewMode =
- parsedViewMode === "cards" || parsedViewMode === "rows"
- ? parsedViewMode
- : "cards";
-
- return {
- viewMode,
- displayProperties: preferTitle ? ["title"] : DEFAULT_DISPLAY_PROPERTIES,
- };
- } catch {
- return null;
- }
-}
-
-function clearLegacyPrefs() {
- if (typeof window === "undefined") return;
- window.localStorage.removeItem("partnerLinksDisplayPreferTitle");
- window.localStorage.removeItem("partnerLinksViewMode");
-}
-
/** Read persisted partner links display prefs (for Analytics / Events / filters). */
export function usePartnerLinksDisplay() {
- const [persisted, setPersisted] =
+ const [persisted] =
useSyncedLocalStorage<PartnerLinksDisplayPreferences | null>(
STORAGE_KEY,
null,
);
- useEffect(() => {
- if (persisted) return;
- const legacy = readLegacyPrefs();
- if (!legacy) return;
- setPersisted(legacy);
- clearLegacyPrefs();
- }, [persisted, setPersisted]);
-
return {
- viewMode: persisted?.viewMode ?? "cards",
displayProperties:
persisted?.displayProperties ?? DEFAULT_DISPLAY_PROPERTIES,
};
}
type PartnerLinksDisplayContextValue = {
- viewMode: PartnerLinksViewMode;
- setViewMode: Dispatch<SetStateAction<PartnerLinksViewMode>>;
+ displayOption: PartnerLinksDisplayOption;
+ setDisplayOption: Dispatch<SetStateAction<PartnerLinksDisplayOption>>;
displayProperties: PartnerLinksDisplayProperty[];
- setDisplayProperties: Dispatch<
- SetStateAction<PartnerLinksDisplayProperty[]>
- >;
+ setDisplayProperties: Dispatch<SetStateAction<PartnerLinksDisplayProperty[]>>;
isDirty: boolean;
persist: () => void;
reset: () => void;
@@ -115,8 +49,8 @@ type PartnerLinksDisplayContextValue = {
export const PartnerLinksDisplayContext =
createContext<PartnerLinksDisplayContextValue>({
- viewMode: "cards",
- setViewMode: () => {},
+ displayOption: "full",
+ setDisplayOption: () => {},
displayProperties: DEFAULT_DISPLAY_PROPERTIES,
setDisplayProperties: () => {},
isDirty: false,
@@ -138,45 +72,32 @@ export function PartnerLinksDisplayProvider({
null,
);
- useEffect(() => {
- if (persisted) return;
- const legacy = readLegacyPrefs();
- if (!legacy) return;
- setPersisted(legacy);
- clearLegacyPrefs();
- }, [persisted, setPersisted]);
-
const resolvedPersisted = useMemo<PartnerLinksDisplayPreferences>(() => {
if (persisted) return persisted;
return {
- viewMode: resolveDefaultViewMode({
- linksCount,
- showDetailedAnalytics,
- }),
+ displayOption:
+ (linksCount && linksCount > 5) || !showDetailedAnalytics
+ ? "cards"
+ : "full",
displayProperties: DEFAULT_DISPLAY_PROPERTIES,
};
}, [persisted, linksCount, showDetailedAnalytics]);
- const [viewMode, setViewMode] = useState<PartnerLinksViewMode>(
- resolvedPersisted.viewMode,
+ const [displayOption, setDisplayOption] = useState<PartnerLinksDisplayOption>(
+ resolvedPersisted.displayOption,
);
const [displayProperties, setDisplayProperties] = useState<
PartnerLinksDisplayProperty[]
>(resolvedPersisted.displayProperties);
- // Sync draft when persisted defaults resolve (e.g. after links load / migration)
+ // Sync draft when persisted defaults resolve (e.g. after links load)
useEffect(() => {
- if (persisted) {
- setViewMode(persisted.viewMode);
- setDisplayProperties(persisted.displayProperties);
- return;
- }
- setViewMode(resolvedPersisted.viewMode);
+ setDisplayOption(resolvedPersisted.displayOption);
setDisplayProperties(resolvedPersisted.displayProperties);
- }, [persisted, resolvedPersisted]);
+ }, [resolvedPersisted]);
const isDirty = useMemo(() => {
- if (viewMode !== resolvedPersisted.viewMode) return true;
+ if (displayOption !== resolvedPersisted.displayOption) return true;
if (
displayProperties.slice().sort().join(",") !==
resolvedPersisted.displayProperties.slice().sort().join(",")
@@ -184,23 +105,23 @@ export function PartnerLinksDisplayProvider({
return true;
}
return false;
- }, [viewMode, displayProperties, resolvedPersisted]);
+ }, [displayOption, displayProperties, resolvedPersisted]);
return (
<PartnerLinksDisplayContext.Provider
value={{
- viewMode,
- setViewMode,
+ displayOption,
+ setDisplayOption,
displayProperties,
setDisplayProperties,
isDirty,
persist: () =>
setPersisted({
- viewMode,
+ displayOption,
displayProperties,
}),
reset: () => {
- setViewMode(resolvedPersisted.viewMode);
+ setDisplayOption(resolvedPersisted.displayOption);
setDisplayProperties(resolvedPersisted.displayProperties);
},
}}