Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Save name after website select. Fixed types.
Mike Caoc5994e5eb63a
diff --git a/package.components.json b/package.components.jsonindex 927e06604..d231f5b9b 100644--- a/package.components.json+++ b/package.components.json@@ -1,6 +1,6 @@{"name": "@umami/components",- "version": "0.127.0",+ "version": "0.128.0","description": "Umami React components.","author": "Mike Cao <[email protected]>","license": "MIT",diff --git a/src/components/hooks/queries/useEventDataEventsQuery.ts b/src/components/hooks/queries/useEventDataEventsQuery.tsindex 5273181e5..2c91dece5 100644--- a/src/components/hooks/queries/useEventDataEventsQuery.ts+++ b/src/components/hooks/queries/useEventDataEventsQuery.ts@@ -5,7 +5,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useEventDataEventsQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery({diff --git a/src/components/hooks/queries/useEventDataPropertiesQuery.ts b/src/components/hooks/queries/useEventDataPropertiesQuery.tsindex 26929700b..19a2eb61d 100644--- a/src/components/hooks/queries/useEventDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useEventDataPropertiesQuery.ts@@ -5,7 +5,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useEventDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery<any>({diff --git a/src/components/hooks/queries/useEventDataQuery.ts b/src/components/hooks/queries/useEventDataQuery.tsindex 00f5d14de..7e6f66ec2 100644--- a/src/components/hooks/queries/useEventDataQuery.ts+++ b/src/components/hooks/queries/useEventDataQuery.ts@@ -5,7 +5,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useEventDataQuery(websiteId: string, eventId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const params = useFilterParameters();return useQuery({diff --git a/src/components/hooks/queries/useEventDataValuesQuery.ts b/src/components/hooks/queries/useEventDataValuesQuery.tsindex 4b56e5537..de3b0590b 100644--- a/src/components/hooks/queries/useEventDataValuesQuery.ts+++ b/src/components/hooks/queries/useEventDataValuesQuery.ts@@ -10,7 +10,7 @@ export function useEventDataValuesQuery(options?: ReactQueryOptions,) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery<any>({diff --git a/src/components/hooks/queries/useResultQuery.ts b/src/components/hooks/queries/useResultQuery.tsindex cbc5bf01b..7b7a7bd18 100644--- a/src/components/hooks/queries/useResultQuery.ts+++ b/src/components/hooks/queries/useResultQuery.ts@@ -10,7 +10,7 @@ export function useResultQuery<T = any>() {const { websiteId, ...parameters } = params;const { post, useQuery } = useApi();- const { startDate, endDate, timezone } = useDateParameters(websiteId);+ const { startDate, endDate, timezone } = useDateParameters();const filters = useFilterParameters();return useQuery<T>({diff --git a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts b/src/components/hooks/queries/useSessionDataPropertiesQuery.tsindex 633a6ff83..2bb139501 100644--- a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useSessionDataPropertiesQuery.ts@@ -5,7 +5,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useSessionDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery<any>({diff --git a/src/components/hooks/queries/useSessionDataValuesQuery.ts b/src/components/hooks/queries/useSessionDataValuesQuery.tsindex bf7a8cef7..05373d21a 100644--- a/src/components/hooks/queries/useSessionDataValuesQuery.ts+++ b/src/components/hooks/queries/useSessionDataValuesQuery.ts@@ -9,7 +9,7 @@ export function useSessionDataValuesQuery(options?: ReactQueryOptions,) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery<any>({diff --git a/src/components/hooks/queries/useWebsiteEventsQuery.ts b/src/components/hooks/queries/useWebsiteEventsQuery.tsindex 0798524ce..51902d2f3 100644--- a/src/components/hooks/queries/useWebsiteEventsQuery.ts+++ b/src/components/hooks/queries/useWebsiteEventsQuery.ts@@ -15,7 +15,7 @@ export function useWebsiteEventsQuery(options?: ReactQueryOptions,) {const { get } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return usePagedQuery({diff --git a/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts b/src/components/hooks/queries/useWebsiteEventsSeriesQuery.tsindex 86fbe428d..50861cee6 100644--- a/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts+++ b/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts@@ -5,7 +5,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useWebsiteEventsSeriesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery({diff --git a/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.ts b/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.tsindex 9718dfe13..8fc9fc7bf 100644--- a/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.ts+++ b/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.ts@@ -19,7 +19,7 @@ export function useWebsiteExpandedMetricsQuery(options?: ReactQueryOptions<WebsiteExpandedMetricsData>,) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery<WebsiteExpandedMetricsData>({diff --git a/src/components/hooks/queries/useWebsiteMetricsQuery.ts b/src/components/hooks/queries/useWebsiteMetricsQuery.tsindex f521798e2..8370db8eb 100644--- a/src/components/hooks/queries/useWebsiteMetricsQuery.ts+++ b/src/components/hooks/queries/useWebsiteMetricsQuery.ts@@ -15,7 +15,7 @@ export function useWebsiteMetricsQuery(options?: ReactQueryOptions<WebsiteMetricsData>,) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery<WebsiteMetricsData>({diff --git a/src/components/hooks/queries/useWebsitePageviewsQuery.ts b/src/components/hooks/queries/useWebsitePageviewsQuery.tsindex c2a12b0b4..5784cae8e 100644--- a/src/components/hooks/queries/useWebsitePageviewsQuery.ts+++ b/src/components/hooks/queries/useWebsitePageviewsQuery.ts@@ -13,7 +13,7 @@ export function useWebsitePageviewsQuery(options?: ReactQueryOptions<WebsitePageviewsData>,) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const queryParams = useFilterParameters();return useQuery<WebsitePageviewsData>({diff --git a/src/components/hooks/queries/useWebsiteSessionStatsQuery.ts b/src/components/hooks/queries/useWebsiteSessionStatsQuery.tsindex 8d1f5d556..9c9aaddc7 100644--- a/src/components/hooks/queries/useWebsiteSessionStatsQuery.ts+++ b/src/components/hooks/queries/useWebsiteSessionStatsQuery.ts@@ -4,7 +4,7 @@ import { useDateParameters } from '../useDateParameters';export function useWebsiteSessionStatsQuery(websiteId: string, options?: Record<string, string>) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery({diff --git a/src/components/hooks/queries/useWebsiteSessionsQuery.ts b/src/components/hooks/queries/useWebsiteSessionsQuery.tsindex f16cfc85e..a3de19ca0 100644--- a/src/components/hooks/queries/useWebsiteSessionsQuery.ts+++ b/src/components/hooks/queries/useWebsiteSessionsQuery.ts@@ -10,7 +10,7 @@ export function useWebsiteSessionsQuery() {const { get } = useApi();const { modified } = useModified(`sessions`);- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return usePagedQuery({diff --git a/src/components/hooks/queries/useWebsiteStatsQuery.ts b/src/components/hooks/queries/useWebsiteStatsQuery.tsindex c42613a9c..98ae9d8ff 100644--- a/src/components/hooks/queries/useWebsiteStatsQuery.ts+++ b/src/components/hooks/queries/useWebsiteStatsQuery.ts@@ -23,7 +23,7 @@ export function useWebsiteStatsQuery(options?: UseQueryOptions<WebsiteStatsData, Error, WebsiteStatsData>,) {const { get, useQuery } = useApi();- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery<WebsiteStatsData>({diff --git a/src/components/hooks/queries/useWeeklyTrafficQuery.ts b/src/components/hooks/queries/useWeeklyTrafficQuery.tsindex fe0bbae19..5c09670ad 100644--- a/src/components/hooks/queries/useWeeklyTrafficQuery.ts+++ b/src/components/hooks/queries/useWeeklyTrafficQuery.ts@@ -6,7 +6,7 @@ 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(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();return useQuery({diff --git a/src/components/input/ExportButton.tsx b/src/components/input/ExportButton.tsxindex 76f63e2c7..15fb21240 100644--- a/src/components/input/ExportButton.tsx+++ b/src/components/input/ExportButton.tsx@@ -9,7 +9,7 @@ import { useFilterParameters } from '@/components/hooks/useFilterParameters';export function ExportButton({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();const [isLoading, setIsLoading] = useState(false);- const date = useDateParameters(websiteId);+ const date = useDateParameters();const filters = useFilterParameters();const searchParams = useSearchParams();const { get } = useApi();diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsxindex 21e8ad228..01861fbd4 100644--- a/src/components/input/WebsiteSelect.tsx+++ b/src/components/input/WebsiteSelect.tsx@@ -14,14 +14,16 @@ export function WebsiteSelect({teamId?: string;includeTeams?: boolean;} & SelectProps) {- const website = useWebsite();const { formatMessage, messages } = useMessages();+ const website = useWebsite();+ const [name, setName] = useState<string>(website?.name);const [search, setSearch] = useState('');const { user } = useLoginQuery();const { data, isLoading } = useUserWebsitesQuery({ userId: user?.id, teamId },{ search, pageSize: 10, includeTeams },);+ const listItems: { id: string; name: string }[] = data?.['data'] || [];const handleSearch = (value: string) => {setSearch(value);@@ -31,10 +33,15 @@ export function WebsiteSelect({setSearch('');};+ const handleChange = (id: string) => {+ setName(listItems.find(item => item.id === id)?.name);+ onChange(id);+ };+const renderValue = () => {return (<Row maxWidth="160px">- <Text truncate>{website.name}</Text>+ <Text truncate>{name}</Text></Row>);};@@ -42,13 +49,13 @@ export function WebsiteSelect({return (<Select{...props}- items={data?.['data'] || []}+ items={listItems}value={websiteId}isLoading={isLoading}allowSearch={true}searchValue={search}onSearch={handleSearch}- onChange={onChange}+ onChange={handleChange}onOpenChange={handleOpenChange}renderValue={renderValue}listProps={{