From 3decad5198c19d8191451cb2454c7b42310f54f0 Mon Sep 17 00:00:00 2001
From: Max Schmidt <max.schmidt@outlook.de>
Date: Sat, 16 Nov 2024 13:26:42 +0100
Subject: [PATCH 1/3] use params

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
---
 src/components/hooks/queries/useWebsiteMetrics.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 184fd4d4..530eb5aa 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -20,12 +20,8 @@ export function useWebsiteMetrics(
       },
     ],
     queryFn: async () => {
-      const filters = { ...params };
-
-      filters[queryParams.type] = undefined;
-
       const data = await get(`/websites/${websiteId}/metrics`, {
-        ...filters,
+        ...params,
         ...queryParams,
       });
 

From 8b676c637000a29d804fcd5fd64d593dcbb1c8a0 Mon Sep 17 00:00:00 2001
From: Max Schmidt <max.schmidt@outlook.de>
Date: Sat, 16 Nov 2024 13:56:58 +0100
Subject: [PATCH 2/3] respect expanded view

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
---
 src/components/hooks/queries/useWebsiteMetrics.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 530eb5aa..c6498383 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -1,6 +1,7 @@
 import { UseQueryOptions } from '@tanstack/react-query';
 import useApi from './useApi';
 import { useFilterParams } from '../useFilterParams';
+import { useSearchParams } from 'next/navigation';
 
 export function useWebsiteMetrics(
   websiteId: string,
@@ -9,6 +10,7 @@ export function useWebsiteMetrics(
 ) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);
+  const searchParams = useSearchParams();
 
   return useQuery({
     queryKey: [
@@ -20,8 +22,15 @@ export function useWebsiteMetrics(
       },
     ],
     queryFn: async () => {
+      const filters = { ...params };
+      const view = searchParams.get('view');
+
+      if (view && filters[view]) {
+        filters[view] = undefined;
+      }
+
       const data = await get(`/websites/${websiteId}/metrics`, {
-        ...params,
+        ...filters,
         ...queryParams,
       });
 

From 7e6e79c19528a23848fea2fb4c73fd17a3bbb666 Mon Sep 17 00:00:00 2001
From: Max Schmidt <max.schmidt@outlook.de>
Date: Sat, 16 Nov 2024 14:05:02 +0100
Subject: [PATCH 3/3] cleanup

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
---
 src/components/hooks/queries/useWebsiteMetrics.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index c6498383..9fa9ab28 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -22,15 +22,9 @@ export function useWebsiteMetrics(
       },
     ],
     queryFn: async () => {
-      const filters = { ...params };
-      const view = searchParams.get('view');
-
-      if (view && filters[view]) {
-        filters[view] = undefined;
-      }
-
       const data = await get(`/websites/${websiteId}/metrics`, {
-        ...filters,
+        ...params,
+        [searchParams.get('view')]: undefined,
         ...queryParams,
       });