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

Merge remote-tracking branch 'origin/dev' into dev
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 
# Conflicts:
#	src/app/(main)/websites/[websiteId]/ExpandedViewModal.tsx
#	src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
This commit is contained in:
Mike Cao 2025-10-16 02:43:43 -07:00
commit 036748cdeb
15 changed files with 98 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/hooks/queries/useEventDataValuesQuery.ts
View file

@ -5,7 +5,7 @@ import { useFilterParameters } from '../useFilterParameters';
export function useEventDataValuesQuery(
websiteId: string,
eventName: string,
event: string,
propertyName: string,
options?: ReactQueryOptions,
) {
@ -16,7 +16,7 @@ export function useEventDataValuesQuery(
return useQuery<any>({
queryKey: [
'websites:event-data:values',
{ websiteId, eventName, propertyName, startAt, endAt, unit, timezone, ...filters },
{ websiteId, event, propertyName, startAt, endAt, unit, timezone, ...filters },
],
queryFn: () =>
get(`/websites/${websiteId}/event-data/values`, {
@ -25,7 +25,7 @@ export function useEventDataValuesQuery(
unit,
timezone,
...filters,
eventName,
event,
propertyName,
}),
enabled: !!(websiteId && propertyName),

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

@ -15,14 +15,20 @@ export function useWebsiteEventsQuery(
options?: ReactQueryOptions,
) {
const { get } = useApi();
const date = useDateParameters();
const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters();
return usePagedQuery({
queryKey: ['websites:events', { websiteId, ...date, ...filters, ...params }],
queryKey: [
'websites:events',
{ websiteId, startAt, endAt, unit, timezone, ...filters, ...params },
],
queryFn: pageParams =>
get(`/websites/${websiteId}/events`, {
...date,
startAt,
endAt,
unit,
timezone,
...filters,
...pageParams,
eventType: EVENT_TYPES[params.view],

7
src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts
View file

@ -5,12 +5,13 @@ import { ReactQueryOptions } from '@/lib/types';
export function useWebsiteEventsSeriesQuery(websiteId: string, options?: ReactQueryOptions) {
const { get, useQuery } = useApi();
const date = useDateParameters();
const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters();
return useQuery({
queryKey: ['websites:events:series', { websiteId, ...date, ...filters }],
queryFn: () => get(`/websites/${websiteId}/events/series`, { ...date, ...filters }),
queryKey: ['websites:events:series', { websiteId, startAt, endAt, unit, timezone, ...filters }],
queryFn: () =>
get(`/websites/${websiteId}/events/series`, { startAt, endAt, unit, timezone, ...filters }),
enabled: !!websiteId,
...options,
});