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
Added useFormat hook to format special values.
Mike Cao2eee9c23c3de
diff --git a/components/metrics/BrowsersTable.js b/components/metrics/BrowsersTable.jsindex 2920280f6..bf4d0aaab 100644--- a/components/metrics/BrowsersTable.js+++ b/components/metrics/BrowsersTable.js@@ -1,16 +1,17 @@+import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';import MetricsTable from 'components/metrics/MetricsTable';-import { BROWSERS } from 'lib/constants';import useMessages from 'hooks/useMessages';-import { useRouter } from 'next/router';+import useFormat from 'hooks/useFormat';export function BrowsersTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();const { basePath } = useRouter();+ const { formatBrowser } = useFormat();function renderLink({ x: browser }) {return (- <FilterLink id="browser" value={browser} label={BROWSERS[browser] || browser}>+ <FilterLink id="browser" value={browser} label={formatBrowser(browser)}><imgsrc={`${basePath}/images/browsers/${browser || 'unknown'}.png`}alt={browser}diff --git a/components/metrics/CountriesTable.js b/components/metrics/CountriesTable.jsindex c72d96ed2..283fdaf29 100644--- a/components/metrics/CountriesTable.js+++ b/components/metrics/CountriesTable.js@@ -1,8 +1,7 @@import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';import useCountryNames from 'hooks/useCountryNames';-import useLocale from 'hooks/useLocale';-import useMessages from 'hooks/useMessages';+import { useLocale, useMessages, useFormat } from 'hooks';import MetricsTable from './MetricsTable';export function CountriesTable({ websiteId, ...props }) {@@ -10,6 +9,7 @@ export function CountriesTable({ websiteId, ...props }) {const countryNames = useCountryNames(locale);const { formatMessage, labels } = useMessages();const { basePath } = useRouter();+ const { formatCountry } = useFormat();function renderLink({ x: code }) {return (@@ -17,7 +17,7 @@ export function CountriesTable({ websiteId, ...props }) {id="country"className={locale}value={countryNames[code] && code}- label={countryNames[code]}+ label={formatCountry(code)}><img src={`${basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`} alt={code} /></FilterLink>diff --git a/components/metrics/DevicesTable.js b/components/metrics/DevicesTable.jsindex 0b8d57086..98690d0a7 100644--- a/components/metrics/DevicesTable.js+++ b/components/metrics/DevicesTable.js@@ -2,18 +2,16 @@ import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';import useMessages from 'hooks/useMessages';import { useRouter } from 'next/router';+import { useFormat } from 'hooks';export function DevicesTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();const { basePath } = useRouter();+ const { formatDevice } = useFormat();function renderLink({ x: device }) {return (- <FilterLink- id="device"- value={labels[device] && device}- label={formatMessage(labels[device] || labels.unknown)}- >+ <FilterLink id="device" value={labels[device] && device} label={formatDevice(device)}><imgsrc={`${basePath}/images/device/${device?.toLowerCase() || 'unknown'}.png`}alt={device}diff --git a/components/pages/reports/insights/InsightsTable.js b/components/pages/reports/insights/InsightsTable.jsindex 7832a899a..51ad36843 100644--- a/components/pages/reports/insights/InsightsTable.js+++ b/components/pages/reports/insights/InsightsTable.js@@ -1,20 +1,29 @@import { useContext } from 'react';import { GridTable, GridColumn } from 'react-basics';-import { useMessages } from 'hooks';+import { useFormat, useMessages } from 'hooks';import { ReportContext } from '../Report';export function InsightsTable() {const { report } = useContext(ReportContext);const { formatMessage, labels } = useMessages();const { groups = [] } = report?.parameters || {};+ const { formatValue } = useFormat();return (<GridTable data={report?.data || []}>{groups.map(({ name, label }) => {- return <GridColumn key={name} name={name} label={label} />;+ return (+ <GridColumn key={name} name={name} label={label}>+ {row => formatValue(row[name], name)}+ </GridColumn>+ );})}- <GridColumn name="views" label={formatMessage(labels.views)} width="100px" />- <GridColumn name="visitors" label={formatMessage(labels.visitors)} width="100px" />+ <GridColumn name="views" label={formatMessage(labels.views)} width="100px">+ {row => row.views.toLocaleString()}+ </GridColumn>+ <GridColumn name="visitors" label={formatMessage(labels.visitors)} width="100px">+ {row => row.views.toLocaleString()}+ </GridColumn></GridTable>);}diff --git a/hooks/index.js b/hooks/index.jsindex 6a9b3b353..004260b0d 100644--- a/hooks/index.js+++ b/hooks/index.js@@ -6,6 +6,7 @@ export * from './useDocumentClick';export * from './useEscapeKey';export * from './useFilters';export * from './useForceUpdate';+export * from './useFormat';export * from './useLanguageNames';export * from './useLocale';export * from './useMessages';diff --git a/hooks/useFormat.js b/hooks/useFormat.jsnew file mode 100644index 000000000..3fd10ec8e--- /dev/null+++ b/hooks/useFormat.js@@ -0,0 +1,39 @@+import useMessages from './useMessages';+import { BROWSERS } from 'lib/constants';+import useLocale from './useLocale';+import useCountryNames from './useCountryNames';++export function useFormat() {+ const { formatMessage, labels } = useMessages();+ const { locale } = useLocale();+ const countryNames = useCountryNames(locale);++ const formatBrowser = value => {+ return BROWSERS[value] || value;+ };++ const formatCountry = value => {+ return countryNames[value] || value;+ };++ const formatDevice = value => {+ return formatMessage(labels[value] || labels.unknown);+ };++ const formatValue = (value, type) => {+ switch (type) {+ case 'browser':+ return formatBrowser(value);+ case 'country':+ return formatCountry(value);+ case 'device':+ return formatDevice(value);+ default:+ return value;+ }+ };++ return { formatBrowser, formatCountry, formatDevice, formatValue };+}++export default useFormat;diff --git a/hooks/useMessages.js b/hooks/useMessages.jsindex 0719afd8d..3c13fab03 100644--- a/hooks/useMessages.js+++ b/hooks/useMessages.js@@ -4,11 +4,11 @@ import { messages, labels } from 'components/messages';export function useMessages() {const { formatMessage } = useIntl();- function getMessage(id) {+ const getMessage = id => {const message = Object.values(messages).find(value => value.id === id);return message ? formatMessage(message) : id;- }+ };return { formatMessage, FormattedMessage, messages, labels, getMessage };}diff --git a/lib/data.ts b/lib/data.tsindex c2c53de31..47023bb43 100644--- a/lib/data.ts+++ b/lib/data.ts@@ -25,7 +25,7 @@ export function flattenJSON().keyValues;}-export function getDynamicDataType(value: any): string {+export function getDataType(value: any): string {let type: string = typeof value;if ((type === 'string' && isValid(value)) || isValid(parseISO(value))) {@@ -36,7 +36,7 @@ export function getDynamicDataType(value: any): string {}function createKey(key, value, acc: { keyValues: any[]; parentKey: string }) {- const type = getDynamicDataType(value);+ const type = getDataType(value);let dynamicDataType = null;diff --git a/queries/analytics/reports/getInsights.ts b/queries/analytics/reports/getInsights.tsindex 0f778555a..b7c8777d3 100644--- a/queries/analytics/reports/getInsights.ts+++ b/queries/analytics/reports/getInsights.ts@@ -41,6 +41,7 @@ async function relationalQuery(and website_event.event_type = {{eventType}}${filterQuery}group by 1+ limit 500`,params,);