Skip to content

Commit 9a3eb5d

Browse files
izadoesdevizadoesdev
committed
fix: everything
1 parent 0ba7a73 commit 9a3eb5d

File tree

10 files changed

+116
-113
lines changed

10 files changed

+116
-113
lines changed

‎apps/dashboard/app/(main)/websites/[id]/assistant/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default function AssistantPage() {
7777

7878
return (
7979
<div className="fixed inset-0 flex flex-col bg-gradient-to-br from-background to-muted/20 pt-16 md:pl-72">
80-
<div className="flex flex-1 overflow-hidden p-3 sm:p-4 lg:p-6">
80+
<div className="flex flex-1 overflow-hidden mt-6">
8181
{isLoading || !websiteData ? (
8282
<AIAssistantLoadingSkeleton />
8383
) : (

‎apps/dashboard/app/(main)/websites/[id]/errors/_components/errors-page-content.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ export const ErrorsPageContent = ({ params }: ErrorsPageContentProps) => {
314314
}
315315

316316
return (
317-
<div className="mx-auto max-w-[1600px] space-y-6 p-3 sm:p-4 lg:p-6">
317+
<div className="mx-auto max-w-[1600px] space-y-6 mt-6">
318318
<WebsitePageHeader
319319
description="Monitor and analyze application errors to improve user experience"
320320
icon={

‎apps/dashboard/app/(main)/websites/[id]/experiments/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export default function ExperimentsPage() {
217217

218218
return (
219219
<div
220-
className="mx-auto max-w-[1600px] space-y-4 p-3 sm:p-4 lg:p-6"
220+
className="mx-auto max-w-[1600px] space-y-4 mt-6"
221221
ref={pageRef}
222222
>
223223
<WebsitePageHeader

‎apps/dashboard/app/(main)/websites/[id]/funnels/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ export default function FunnelsPage() {
257257

258258
return (
259259
<div
260-
className="mx-auto max-w-[1600px] space-y-4 p-3 sm:p-4 lg:p-6"
260+
className="mx-auto max-w-[1600px] space-y-4 mt-6"
261261
ref={pageRef}
262262
>
263263
<WebsitePageHeader

‎apps/dashboard/app/(main)/websites/[id]/goals/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export default function GoalsPage() {
211211

212212
return (
213213
<div
214-
className="mx-auto max-w-[1600px] space-y-4 p-3 sm:p-4 lg:p-6"
214+
className="mx-auto max-w-[1600px] space-y-4 mt-6"
215215
ref={pageRef}
216216
>
217217
<WebsitePageHeader

‎apps/dashboard/app/(main)/websites/[id]/map/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function WebsiteMapPage() {
128128
}
129129

130130
return (
131-
<div className="flex h-[calc(100vh-7rem)] flex-col space-y-4 p-3 sm:p-4 lg:p-6">
131+
<div className="flex h-[calc(100vh-7rem)] flex-col space-y-4 mt-6">
132132
<div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
133133
<WebsitePageHeader
134134
additionalActions={

‎apps/dashboard/app/(main)/websites/[id]/profiles/_components/profiles-list.tsx‎

Lines changed: 103 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
'use client';
22

33
import { SpinnerIcon, UsersIcon } from '@phosphor-icons/react';
4+
import { useAtom } from 'jotai';
45
import dynamic from 'next/dynamic';
5-
import { useCallback, useEffect, useState } from 'react';
6+
import { useCallback, useEffect, useMemo, useState } from 'react';
67
import { Card, CardContent } from '@/components/ui/card';
78
import { useProfilesData } from '@/hooks/use-dynamic-query';
9+
import {
10+
dynamicQueryFiltersAtom,
11+
formattedDateRangeAtom,
12+
timeGranularityAtom,
13+
} from '@/stores/jotai/filterAtoms';
814

915
// Type adapter for the new profile data structure
1016
type ProfileData = {
@@ -47,8 +53,7 @@ type ProfileData = {
4753
}>;
4854
};
4955

50-
import { WebsitePageHeader } from '../../_components/website-page-header';
51-
import { getDefaultDateRange } from './profile-utils';
56+
5257

5358
const ProfileRow = dynamic(
5459
() => import('./profile-row').then((mod) => ({ default: mod.ProfileRow })),
@@ -66,7 +71,20 @@ interface ProfilesListProps {
6671
}
6772

6873
export function ProfilesList({ websiteId }: ProfilesListProps) {
69-
const [dateRange] = useState(() => getDefaultDateRange());
74+
// Use shared state atoms for consistency
75+
const [formattedDateRangeState] = useAtom(formattedDateRangeAtom);
76+
const [currentGranularity] = useAtom(timeGranularityAtom);
77+
const [filters] = useAtom(dynamicQueryFiltersAtom);
78+
79+
const dateRange = useMemo(
80+
() => ({
81+
start_date: formattedDateRangeState.startDate,
82+
end_date: formattedDateRangeState.endDate,
83+
granularity: currentGranularity,
84+
}),
85+
[formattedDateRangeState, currentGranularity]
86+
);
87+
7088
const [expandedProfileId, setExpandedProfileId] = useState<string | null>(
7189
null
7290
);
@@ -80,9 +98,17 @@ export function ProfilesList({ websiteId }: ProfilesListProps) {
8098
websiteId,
8199
dateRange,
82100
25,
83-
page
101+
page,
102+
filters
84103
);
85104

105+
// Reset page and profiles when dateRange or filters change
106+
useEffect(() => {
107+
setPage(1);
108+
setAllProfiles([]);
109+
setIsInitialLoad(true);
110+
}, [dateRange.start_date, dateRange.end_date, dateRange.granularity, JSON.stringify(filters)]);
111+
86112
const toggleProfile = useCallback((profileId: string) => {
87113
setExpandedProfileId((currentId) =>
88114
currentId === profileId ? null : profileId
@@ -144,121 +170,93 @@ export function ProfilesList({ websiteId }: ProfilesListProps) {
144170

145171
if (isLoading && isInitialLoad) {
146172
return (
147-
<div className="space-y-6">
148-
<WebsitePageHeader
149-
description="Visitor profiles with session data and behavior patterns"
150-
icon={<UsersIcon className="h-6 w-6 text-primary" />}
151-
title="Recent Profiles"
152-
variant="minimal"
153-
websiteId={websiteId}
154-
/>
155-
<Card>
156-
<CardContent>
157-
<div className="space-y-3">
158-
{[1, 2, 3, 4, 5, 6, 7, 8].map((i) => (
159-
<div
160-
className="h-16 animate-pulse rounded bg-muted/20"
161-
key={i}
162-
/>
163-
))}
164-
</div>
165-
<div className="flex items-center justify-center pt-4">
166-
<div className="flex items-center gap-2 text-muted-foreground">
167-
<SpinnerIcon className="h-4 w-4 animate-spin" />
168-
<span className="text-sm">Loading profiles...</span>
169-
</div>
173+
<Card>
174+
<CardContent>
175+
<div className="space-y-3">
176+
{[1, 2, 3, 4, 5, 6, 7, 8].map((i) => (
177+
<div
178+
className="h-16 animate-pulse rounded bg-muted/20"
179+
key={i}
180+
/>
181+
))}
182+
</div>
183+
<div className="flex items-center justify-center pt-4">
184+
<div className="flex items-center gap-2 text-muted-foreground">
185+
<SpinnerIcon className="h-4 w-4 animate-spin" />
186+
<span className="text-sm">Loading profiles...</span>
170187
</div>
171-
</CardContent>
172-
</Card>
173-
</div>
188+
</div>
189+
</CardContent>
190+
</Card>
174191
);
175192
}
176193

177194
if (isError) {
178195
return (
179-
<div className="space-y-6">
180-
<WebsitePageHeader
181-
description="Visitor profiles with session data and behavior patterns"
182-
errorMessage={error?.message || 'Failed to load profiles'}
183-
hasError={true}
184-
icon={<UsersIcon className="h-6 w-6 text-primary" />}
185-
title="Recent Profiles"
186-
variant="minimal"
187-
websiteId={websiteId}
188-
/>
189-
</div>
196+
<Card>
197+
<CardContent>
198+
<div className="flex flex-col items-center py-12 text-center text-muted-foreground">
199+
<UsersIcon className="mb-4 h-12 w-12 opacity-50" />
200+
<p className="mb-2 font-medium text-lg">Failed to load profiles</p>
201+
<p className="text-sm">
202+
{error?.message || 'There was an error loading the profiles'}
203+
</p>
204+
</div>
205+
</CardContent>
206+
</Card>
190207
);
191208
}
192209

193210
if (!allProfiles || allProfiles.length === 0) {
194211
return (
195-
<div className="space-y-6">
196-
<WebsitePageHeader
197-
description="Visitor profiles with session data and behavior patterns"
198-
icon={<UsersIcon className="h-6 w-6 text-primary" />}
199-
title="Recent Profiles"
200-
variant="minimal"
201-
websiteId={websiteId}
202-
/>
203-
<Card>
204-
<CardContent>
205-
<div className="flex flex-col items-center py-12 text-center text-muted-foreground">
206-
<UsersIcon className="mb-4 h-12 w-12 opacity-50" />
207-
<p className="mb-2 font-medium text-lg">No profiles found</p>
208-
<p className="text-sm">
209-
Visitor profiles will appear here once users visit your website
210-
</p>
211-
</div>
212-
</CardContent>
213-
</Card>
214-
</div>
212+
<Card>
213+
<CardContent>
214+
<div className="flex flex-col items-center py-12 text-center text-muted-foreground">
215+
<UsersIcon className="mb-4 h-12 w-12 opacity-50" />
216+
<p className="mb-2 font-medium text-lg">No profiles found</p>
217+
<p className="text-sm">
218+
Visitor profiles will appear here once users visit your website
219+
</p>
220+
</div>
221+
</CardContent>
222+
</Card>
215223
);
216224
}
217225

218226
return (
219-
<div className="space-y-6">
220-
<WebsitePageHeader
221-
description="Visitor profiles with session data and behavior patterns"
222-
icon={<UsersIcon className="h-6 w-6 text-primary" />}
223-
subtitle={`${allProfiles.length} loaded`}
224-
title="Recent Profiles"
225-
variant="minimal"
226-
websiteId={websiteId}
227-
/>
228-
<Card>
229-
<CardContent className="p-0">
230-
<div className="divide-y divide-border">
231-
{allProfiles.map((profile, index) => (
232-
<ProfileRow
233-
index={index}
234-
isExpanded={expandedProfileId === profile.visitor_id}
235-
key={`${profile.visitor_id}-${index}`}
236-
onToggle={() => toggleProfile(profile.visitor_id)}
237-
profile={profile}
238-
/>
239-
))}
240-
</div>
227+
<Card>
228+
<CardContent className="p-0">
229+
<div className="divide-y divide-border">
230+
{allProfiles.map((profile, index) => (
231+
<ProfileRow
232+
index={index}
233+
isExpanded={expandedProfileId === profile.visitor_id}
234+
key={`${profile.visitor_id}-${index}`}
235+
onToggle={() => toggleProfile(profile.visitor_id)}
236+
profile={profile}
237+
/>
238+
))}
239+
</div>
241240

242-
<div className="border-t p-4" ref={setLoadMoreRef}>
243-
{pagination.hasNext ? (
244-
<div className="flex justify-center">
245-
{isLoading ? (
246-
<div className="flex items-center gap-2 text-muted-foreground">
247-
<SpinnerIcon className="h-4 w-4 animate-spin" />
248-
<span className="text-sm">Loading more profiles...</span>
249-
</div>
250-
) : null}
251-
</div>
252-
) : (
253-
<div className="text-center text-muted-foreground text-sm">
254-
{allProfiles.length > 0
255-
? 'All profiles loaded'
256-
: 'No more profiles'}
257-
</div>
258-
)}
259-
</div>
260-
</CardContent>
261-
</Card>
262-
</div>
241+
<div className="border-t p-4" ref={setLoadMoreRef}>
242+
{pagination.hasNext ? (
243+
<div className="flex justify-center">
244+
{isLoading ? (
245+
<div className="flex items-center gap-2 text-muted-foreground">
246+
<SpinnerIcon className="h-4 w-4 animate-spin" />
247+
<span className="text-sm">Loading more profiles...</span>
248+
</div>
249+
) : null}
250+
</div>
251+
) : (
252+
<div className="text-center text-muted-foreground text-sm">
253+
{allProfiles.length > 0
254+
? 'All profiles loaded'
255+
: 'No more profiles'}
256+
</div>
257+
)}
258+
</div>
259+
</CardContent>
260+
</Card>
263261
);
264262
}

‎apps/dashboard/app/(main)/websites/[id]/profiles/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default function ProfilesPage() {
2020
const { id: websiteId } = useParams();
2121

2222
return (
23-
<div className="p-3 sm:p-4 lg:p-6">
23+
<div className="mt-6">
2424
<ProfilesList websiteId={websiteId as string} />
2525
</div>
2626
);

‎apps/dashboard/app/(main)/websites/[id]/revenue/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export default function WebsiteRevenuePage() {
214214
}
215215

216216
return (
217-
<div className="mx-auto max-w-[1600px] space-y-4 p-3 sm:p-4 lg:p-6">
217+
<div className="mx-auto max-w-[1600px] mt-6">
218218
<WebsitePageHeader
219219
description="Track revenue and transaction data for this website"
220220
errorMessage={revenueError?.message}

‎apps/dashboard/hooks/use-dynamic-query.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,18 +499,21 @@ export function useEnhancedGeographicData(
499499
export function useMapLocationData(
500500
websiteId: string,
501501
dateRange: DateRange,
502+
filters?: DynamicQueryFilter[],
502503
options?: Partial<UseQueryOptions<BatchQueryResponse>>
503504
) {
504505
const queries: DynamicQueryRequest[] = [
505506
{
506507
id: 'map-countries',
507508
parameters: ['country'],
508509
limit: 100,
510+
filters,
509511
},
510512
{
511513
id: 'map-regions',
512514
parameters: ['region'],
513515
limit: 100,
516+
filters,
514517
},
515518
];
516519

@@ -880,6 +883,7 @@ export function useProfilesData(
880883
dateRange: DateRange,
881884
limit = 50,
882885
page = 1,
886+
filters?: DynamicQueryFilter[],
883887
options?: Partial<UseQueryOptions<DynamicQueryResponse>>
884888
) {
885889
const queryResult = useDynamicQuery(
@@ -890,6 +894,7 @@ export function useProfilesData(
890894
parameters: ['profile_list'],
891895
limit,
892896
page,
897+
filters,
893898
},
894899
{
895900
...options,

0 commit comments

Comments
 (0)