src/components/hooks/queries/useWebsiteMetricsQuery.ts

@@ -1,8 +1,8 @@
-import { ReactQueryOptions } from '@/lib/types';
 import { keepPreviousData } from '@tanstack/react-query';
 import { useApi } from '../useApi';
-import { useDateParameters } from '../useDateParameters';
 import { useFilterParameters } from '../useFilterParameters';
+import { useDateParameters } from '../useDateParameters';
+import { ReactQueryOptions } from '@/lib/types';
 
 export type WebsiteMetricsData = {
   x: string;
@@ -15,7 +15,7 @@ export function useWebsiteMetricsQuery(
   options?: ReactQueryOptions<WebsiteMetricsData>,
 ) {
   const { get, useQuery } = useApi();
-  const { startAt, endAt, unit, timezone } = useDateParameters();
+  const date = useDateParameters();
   const filters = useFilterParameters();
 
   return useQuery<WebsiteMetricsData>({
@@ -23,20 +23,14 @@ export function useWebsiteMetricsQuery(
       'websites:metrics',
       {
         websiteId,
-        startAt,
+        ...date,
-        endAt,
-        unit,
-        timezone,
         ...filters,
         ...params,
       },
     ],
     queryFn: async () =>
       get(`/websites/${websiteId}/metrics`, {
-        startAt,
+        ...date,
-        endAt,
-        unit,
-        timezone,
         ...filters,
         ...params,
       }),

src/components/hooks/queries/useWebsitePageviewsQuery.ts

@@ -13,23 +13,12 @@ export function useWebsitePageviewsQuery(
   options?: ReactQueryOptions<WebsitePageviewsData>,
 ) {
   const { get, useQuery } = useApi();
-  const { startAt, endAt, unit, timezone } = useDateParameters();
+  const date = useDateParameters();
   const queryParams = useFilterParameters();
 
   return useQuery<WebsitePageviewsData>({
-    queryKey: [
+    queryKey: ['websites:pageviews', { websiteId, compare, ...date, ...queryParams }],
-      'websites:pageviews',
+    queryFn: () => get(`/websites/${websiteId}/pageviews`, { compare, ...date, ...queryParams }),
-      { websiteId, compare, startAt, endAt, unit, timezone, ...queryParams },
-    ],
-    queryFn: () =>
-      get(`/websites/${websiteId}/pageviews`, {
-        compare,
-        startAt,
-        endAt,
-        unit,
-        timezone,
-        ...queryParams,
-      }),
     enabled: !!websiteId,
     ...options,
   });

src/components/hooks/queries/useWebsiteStatsQuery.ts

@@ -23,13 +23,12 @@ export function useWebsiteStatsQuery(
   options?: UseQueryOptions<WebsiteStatsData, Error, WebsiteStatsData>,
 ) {
   const { get, useQuery } = useApi();
-  const { startAt, endAt, unit, timezone } = useDateParameters();
+  const date = useDateParameters();
   const filters = useFilterParameters();
 
   return useQuery<WebsiteStatsData>({
-    queryKey: ['websites:stats', { websiteId, startAt, endAt, unit, timezone, ...filters }],
+    queryKey: ['websites:stats', { websiteId, ...date, ...filters }],
-    queryFn: () =>
+    queryFn: () => get(`/websites/${websiteId}/stats`, { ...date, ...filters }),
-      get(`/websites/${websiteId}/stats`, { startAt, endAt, unit, timezone, ...filters }),
     enabled: !!websiteId,
     ...options,
   });

src/lib/request.ts

@@ -1,6 +1,6 @@
 import { checkAuth } from '@/lib/auth';
 import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS } from '@/lib/constants';
-import { getAllowedUnits, getMinimumUnit, maxDate, parseDateRange } from '@/lib/date';
+import { getAllowedUnits, getMinimumUnit, parseDateRange } from '@/lib/date';
 import { fetchWebsite } from '@/lib/load';
 import { filtersArrayToObject } from '@/lib/params';
 import { badRequest, unauthorized } from '@/lib/response';
@@ -84,7 +84,7 @@ export async function setWebsiteDate(websiteId: string, data: Record<string, any
   const website = await fetchWebsite(websiteId);
 
   if (website?.resetAt) {
-    data.startDate = maxDate(data.startDate, new Date(website?.resetAt));
+    data.startDate = new Date(website.resetAt);
   }
 
   return data;