watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

clean-up hooks for passing uneccessary date params
Some checks are pending
Create docker images (cloud) / Build, push, and deploy (push) Waiting to run
Details
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Details

Browse source
This commit is contained in:
Francis Cao 2025-10-21 16:52:04 -07:00
parent 06230ad2e9
commit b7747b33e4
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/hooks/queries/useWebsiteExpandedMetricsQuery.ts
View file

@ -19,7 +19,7 @@ export function useWebsiteExpandedMetricsQuery(
options?: ReactQueryOptions<WebsiteExpandedMetricsData>,
) {
const { get, useQuery } = useApi();
const date = useDateParameters();
const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters();
return useQuery<WebsiteExpandedMetricsData>({
@ -27,14 +27,20 @@ export function useWebsiteExpandedMetricsQuery(
'websites:metrics:expanded',
{
websiteId,
...date,
startAt,
endAt,
unit,
timezone,
...filters,
...params,
},
],
queryFn: async () =>
get(`/websites/${websiteId}/metrics/expanded`, {
...date,
startAt,
endAt,
unit,
timezone,
...filters,
...params,
}),

12
src/components/hooks/queries/useWeeklyTrafficQuery.ts
View file

@ -6,15 +6,21 @@ import { useFilterParameters } from '@/components/hooks/useFilterParameters';
export function useWeeklyTrafficQuery(websiteId: string, params?: Record<string, string | number>) {
const { get, useQuery } = useApi();
const { modified } = useModified(`sessions`);
const date = useDateParameters();
const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters();
return useQuery({
queryKey: ['sessions', { websiteId, modified, ...params, ...date, ...filters }],
queryKey: [
'sessions',
{ websiteId, modified, startAt, endAt, unit, timezone, ...params, ...filters },
],
queryFn: () => {
return get(`/websites/${websiteId}/sessions/weekly`, {
startAt,
endAt,
unit,
timezone,
...params,
...date,
...filters,
});
},