Merge branch 'analytics' into dev

src/components/hooks/queries/useWebsitePageviews.ts

@@ -26,7 +26,7 @@ export function useWebsitePageviews(websiteId: string, options?: { [key: string]
   };
 
   return useQuery({
-    queryKey: ['websites:pageviews', params],
+    queryKey: ['websites:pageviews', { websiteId, ...params }],
     queryFn: () => get(`/websites/${websiteId}/pageviews`, params),
     ...options,
   });

src/components/hooks/queries/useWebsiteStats.ts

@@ -23,7 +23,7 @@ export function useWebsiteStats(websiteId: string, options?: { [key: string]: st
   };
 
   return useQuery({
-    queryKey: ['websites:stats', params],
+    queryKey: ['websites:stats', { websiteId, ...params }],
     queryFn: () => get(`/websites/${websiteId}/stats`, params),
     ...options,
   });

src/components/input/DateFilter.tsx

@@ -92,7 +92,7 @@ export function DateFilter({
   const handleClose = () => setShowPicker(false);
 
   const renderValue = (value: string) => {
-    const { unit } = parseDateValue(value);
+    const { unit } = parseDateValue(value) || {};
 
     if (offset && unit === 'year') {
       return formatDate(startDate, 'yyyy', locale);