More work on reports. Added Funnel page.

src/components/hooks/queries/useGoalQuery.ts

@@ -9,9 +9,8 @@ export function useGoalQuery(
 
   return usePagedQuery({
     queryKey: ['goal', { websiteId, reportId, ...params }],
-    queryFn: (data: any) => {
+    queryFn: () => {
       return post(`/reports/goals`, {
-        ...data,
         ...params,
       });
     },

src/components/hooks/queries/useGoalsQuery.ts

@@ -11,9 +11,8 @@ export function useGoalsQuery(
 
   return usePagedQuery({
     queryKey: ['goals', { websiteId, modified, ...params }],
-    queryFn: (data: any) => {
+    queryFn: () => {
       return get(`/websites/${websiteId}/goals`, {
-        ...data,
         ...params,
       });
     },

src/components/hooks/queries/useReportQuery.ts

@@ -7,10 +7,8 @@ export function useReportQuery(reportId: string) {
 
   return useQuery({
     queryKey: ['report', { reportId, modified }],
-    queryFn: (data: any) => {
-      return get(`/reports/${reportId}`, {
-        ...data,
-      });
+    queryFn: () => {
+      return get(`/reports/${reportId}`);
     },
     enabled: !!reportId,
   });

src/components/hooks/queries/useReportsQuery.ts

@@ -2,14 +2,13 @@ import { useApi } from '../useApi';
 import { usePagedQuery } from '../usePagedQuery';
 import { useModified } from '../useModified';
 
-export function useReportsQuery({ websiteId, teamId }: { websiteId?: string; teamId?: string }) {
-  const { modified } = useModified(`reports`);
+export function useReportsQuery({ websiteId, type }: { websiteId: string; type?: string }) {
+  const { modified } = useModified(`reports:${type}`);
   const { get } = useApi();
 
   return usePagedQuery({
-    queryKey: ['reports', { websiteId, teamId, modified }],
-    queryFn: (params: any) => {
-      return get('/reports', { websiteId, teamId, ...params });
-    },
+    queryKey: ['reports', { websiteId, type, modified }],
+    queryFn: async () => get('/reports', { websiteId, type }),
+    enabled: !!websiteId && !!type,
   });
 }

src/components/hooks/queries/useResultQuery.ts

@@ -10,7 +10,7 @@ export function useResultQuery<T>(
 
   return useQuery<T>({
     queryKey: ['reports', type, params],
-    queryFn: () => post(`/reports/${type}`, params),
+    queryFn: () => post(`/reports/${type}`, { type, ...params }),
     enabled: !!type,
     ...options,
   });

src/components/hooks/queries/useWebsiteSessionsQuery.ts

@@ -13,9 +13,8 @@ export function useWebsiteSessionsQuery(
 
   return usePagedQuery({
     queryKey: ['sessions', { websiteId, modified, ...params, ...filters }],
-    queryFn: (data: any) => {
+    queryFn: () => {
       return get(`/websites/${websiteId}/sessions`, {
-        ...data,
         ...params,
         ...filters,
         pageSize: 20,

src/components/hooks/queries/useWebsites.ts

@@ -13,9 +13,8 @@ export function useWebsites(
 
   return usePagedQuery({
     queryKey: ['websites', { userId, teamId, modified, ...params }],
-    queryFn: (data: any) => {
+    queryFn: () => {
       return get(teamId ? `/teams/${teamId}/websites` : `/users/${userId || user.id}/websites`, {
-        ...data,
         ...params,
       });
     },