Fixed properties queries.

This commit is contained in:
Mike Cao 2025-07-15 01:31:08 -07:00
parent 465a03f987
commit 5e6799a715
38 changed files with 139 additions and 499 deletions

View file

@ -4,15 +4,24 @@ import { useDateParameters } from '../useDateParameters';
import { usePagedQuery } from '../usePagedQuery';
import { ReactQueryOptions } from '@/lib/types';
export function useWebsiteEventsQuery(websiteId: string, options?: ReactQueryOptions<any>) {
export function useWebsiteEventsQuery(
websiteId: string,
params?: Record<string, any>,
options?: ReactQueryOptions<any>,
) {
const { get } = useApi();
const date = useDateParameters(websiteId);
const filters = useFilterParameters();
return usePagedQuery({
queryKey: ['websites:events', { websiteId, ...date, ...filters }],
queryKey: ['websites:events', { websiteId, ...date, ...filters, ...params }],
queryFn: pageParams =>
get(`/websites/${websiteId}/events`, { ...date, ...filters, ...pageParams, pageSize: 20 }),
get(`/websites/${websiteId}/events`, {
...date,
...filters,
...pageParams,
...params,
}),
enabled: !!websiteId,
...options,
});

View file

@ -28,6 +28,7 @@ export function WebsiteSelect({
return (
<Select
{...props}
placeholder=""
items={data?.['data'] || []}
value={websiteId}
isLoading={isLoading}

View file

@ -74,6 +74,7 @@ export const labels = defineMessages({
language: { id: 'label.language', defaultMessage: 'Language' },
theme: { id: 'label.theme', defaultMessage: 'Theme' },
profile: { id: 'label.profile', defaultMessage: 'Profile' },
profiles: { id: 'label.profiles', defaultMessage: 'Profiles' },
dashboard: { id: 'label.dashboard', defaultMessage: 'Dashboard' },
more: { id: 'label.more', defaultMessage: 'More' },
realtime: { id: 'label.realtime', defaultMessage: 'Realtime' },
@ -335,6 +336,7 @@ export const labels = defineMessages({
lastClick: { id: 'label.last-click', defaultMessage: 'Last click' },
online: { id: 'label.online', defaultMessage: 'Online' },
preferences: { id: 'label.preferences', defaultMessage: 'Preferences' },
location: { id: 'label.location', defaultMessage: 'Location' },
});
export const messages = defineMessages({