m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-05 17:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3053 from mooxl/respect-filter-in-usewebsitemetric

Browse Source 
fix: respect filter in TableView
This commit is contained in:
Mike Cao 2024-11-18 13:21:58 -08:00 committed by GitHub
commit 22c892489f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/hooks/queries/useWebsiteMetrics.ts
View File

@ -1,6 +1,7 @@
import { UseQueryOptions } from '@tanstack/react-query'; import { UseQueryOptions } from '@tanstack/react-query';
import { useApi } from '../useApi'; import { useApi } from '../useApi';
import { useFilterParams } from '../useFilterParams'; import { useFilterParams } from '../useFilterParams';
import { useSearchParams } from 'next/navigation';
export function useWebsiteMetrics( export function useWebsiteMetrics(
websiteId: string, websiteId: string,
@ -9,6 +10,7 @@ export function useWebsiteMetrics(
) { ) {
const { get, useQuery } = useApi(); const { get, useQuery } = useApi();
const params = useFilterParams(websiteId); const params = useFilterParams(websiteId);
const searchParams = useSearchParams();
return useQuery({ return useQuery({
queryKey: [ queryKey: [
@ -20,12 +22,9 @@ export function useWebsiteMetrics(
}, },
], ],
queryFn: async () => { queryFn: async () => {
const filters = { ...params };
filters[queryParams.type] = undefined;
const data = await get(`/websites/${websiteId}/metrics`, { const data = await get(`/websites/${websiteId}/metrics`, {
...filters, ...params,
[searchParams.get('view')]: undefined,
...queryParams, ...queryParams,
}); });