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
fix event property format, fix realtime date format
Francis Cao7ae53e2650a4
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsxindex b1836d4f1..8bae2c17b 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx@@ -1,17 +1,16 @@-import { useContext, useMemo, useState } from 'react';-import { StatusLight, Icon, Text, SearchField } from 'react-basics';-import { FixedSizeList } from 'react-window';-import { format } from 'date-fns';-import thenby from 'thenby';-import { safeDecodeURI } from 'next-basics';-import FilterButtons from 'components/common/FilterButtons';+import useFormat from 'components//hooks/useFormat';import Empty from 'components/common/Empty';-import { useLocale, useCountryNames, useMessages } from 'components/hooks';+import FilterButtons from 'components/common/FilterButtons';+import { useCountryNames, useLocale, useMessages, useTimezone } from 'components/hooks';import Icons from 'components/icons';-import useFormat from 'components//hooks/useFormat';import { BROWSERS } from 'lib/constants';import { stringToColor } from 'lib/format';import { RealtimeData } from 'lib/types';+import { safeDecodeURI } from 'next-basics';+import { useContext, useMemo, useState } from 'react';+import { Icon, SearchField, StatusLight, Text } from 'react-basics';+import { FixedSizeList } from 'react-window';+import thenby from 'thenby';import { WebsiteContext } from '../WebsiteProvider';import styles from './RealtimeLog.module.css';@@ -32,6 +31,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {const { formatMessage, labels, messages, FormattedMessage } = useMessages();const { formatValue } = useFormat();const { locale } = useLocale();+ const { formatDate } = useTimezone();const { countryNames } = useCountryNames(locale);const [filter, setFilter] = useState(TYPE_ALL);@@ -54,7 +54,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {},];- const getTime = ({ createdAt, firstAt }) => format(new Date(firstAt || createdAt), 'h:mm:ss');+ const getTime = ({ createdAt, firstAt }) => formatDate(firstAt || createdAt, 'h:mm:ss');const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.tsindex abf2efc0c..d7754ad2a 100644--- a/src/queries/analytics/events/getEventDataValues.ts+++ b/src/queries/analytics/events/getEventDataValues.ts@@ -47,16 +47,18 @@ async function clickhouseQuery(return rawQuery(`select- string_value as "value",+ multiIf(data_type = 2, replaceAll(string_value, '.0000', ''),+ data_type = 4, toString(date_trunc('hour', date_value)),+ string_value) as "value",count(*) as "total"- from event_data+ from umami.event_datawhere website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}and data_key = {propertyName:String}${filterQuery}- group by string_value+ group by valueorder by 2 desc- limit 500+ limit 500;`,params,).then(result => {