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.

Analytics view all fix (#3495)

Marcus Farrellb52e70c17713
diff --git a/apps/web/ui/analytics/analytics-card.tsx b/apps/web/ui/analytics/analytics-card.tsx
index 654630b194..c87e157aa3 100644
--- a/apps/web/ui/analytics/analytics-card.tsx
+++ b/apps/web/ui/analytics/analytics-card.tsx
@@ -28,7 +28,7 @@ export function AnalyticsCard<T extends string>({
selectedSubTabId,
onSelectSubTab,
expandLimit,
- hasMore,
+ dataLength,
children,
className,
}: {
@@ -41,7 +41,7 @@ export function AnalyticsCard<T extends string>({
| Dispatch<SetStateAction<string>>
| ((subTabId: string) => void);
expandLimit: number;
- hasMore?: boolean;
+ dataLength?: number;
children: (props: {
limit?: number;
event?: EventType;
@@ -57,6 +57,11 @@ export function AnalyticsCard<T extends string>({
const selectedTab = tabs.find(({ id }) => id === selectedTabId) || tabs[0];
const SelectedTabIcon = selectedTab.icon;
const { isMobile } = useMediaQuery();
+ const hasSecondaryTabs = !!(subTabs && selectedSubTabId && onSelectSubTab);
+ const effectiveExpandLimit = hasSecondaryTabs
+ ? Math.max(1, expandLimit - 1)
+ : expandLimit;
+ const showViewAll = (dataLength ?? 0) > effectiveExpandLimit;
return (
<>
@@ -168,12 +173,12 @@ export function AnalyticsCard<T extends string>({
</AnimatedSizeContainer>
<div className="py-4">
{children({
- limit: expandLimit,
+ limit: effectiveExpandLimit,
event,
setShowModal,
})}
</div>
- {hasMore && (
+ {showViewAll && (
<div className="absolute bottom-0 left-0 z-10 flex w-full items-end">
<div className="pointer-events-none absolute bottom-0 left-0 h-48 w-full bg-gradient-to-t from-white" />
<button
diff --git a/apps/web/ui/analytics/device-section.tsx b/apps/web/ui/analytics/device-section.tsx
index a3bf2cfa80..f7b6aae744 100644
--- a/apps/web/ui/analytics/device-section.tsx
+++ b/apps/web/ui/analytics/device-section.tsx
@@ -32,7 +32,7 @@ export function DeviceSection() {
selectedTabId={tab}
onSelectTab={setTab}
expandLimit={8}
- hasMore={(data?.length ?? 0) > 8}
+ dataLength={data?.length}
>
{({ limit, setShowModal }) =>
data ? (
diff --git a/apps/web/ui/analytics/location-section.tsx b/apps/web/ui/analytics/location-section.tsx
index 8601fe7a13..709cddf37f 100644
--- a/apps/web/ui/analytics/location-section.tsx
+++ b/apps/web/ui/analytics/location-section.tsx
@@ -39,7 +39,7 @@ export function LocationSection() {
selectedTabId={tab}
onSelectTab={setTab}
expandLimit={8}
- hasMore={(data?.length ?? 0) > 8}
+ dataLength={data?.length}
>
{({ limit, setShowModal }) =>
data ? (
diff --git a/apps/web/ui/analytics/partner-section.tsx b/apps/web/ui/analytics/partner-section.tsx
index a6237f4525..d787a64fda 100644
--- a/apps/web/ui/analytics/partner-section.tsx
+++ b/apps/web/ui/analytics/partner-section.tsx
@@ -126,7 +126,7 @@ export function PartnerSection() {
{ id: "links", label: "Partner Links", icon: Hyperlink },
]}
expandLimit={8}
- hasMore={(data?.length ?? 0) > 8}
+ dataLength={data?.length}
selectedTabId={tab}
onSelectTab={handleTabChange}
{...subTabProps}
diff --git a/apps/web/ui/analytics/referrers-utms.tsx b/apps/web/ui/analytics/referrers-utms.tsx
index 818647ba99..f1f5eb5eb3 100644
--- a/apps/web/ui/analytics/referrers-utms.tsx
+++ b/apps/web/ui/analytics/referrers-utms.tsx
@@ -91,7 +91,7 @@ export function ReferrersUTMs() {
onSelectTab={handleTabChange}
{...subTabProps}
expandLimit={8}
- hasMore={(data?.length ?? 0) > 8}
+ dataLength={data?.length}
>
{({ limit, setShowModal }) => (
<>
diff --git a/apps/web/ui/analytics/top-links.tsx b/apps/web/ui/analytics/top-links.tsx
index 57c684d89a..94dcba0105 100644
--- a/apps/web/ui/analytics/top-links.tsx
+++ b/apps/web/ui/analytics/top-links.tsx
@@ -124,7 +124,7 @@ export function TopLinks() {
{ id: "urls", label: "Destination URLs", icon: Globe },
]}
expandLimit={8}
- hasMore={(data?.length ?? 0) > 8}
+ dataLength={data?.length}
selectedTabId={tab}
onSelectTab={handleTabChange}
{...subTabProps}