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
add regions to useFormat
Francis Caoe9ae4903d452
diff --git a/src/components/hooks/useFormat.js b/src/components/hooks/useFormat.jsindex 3fd10ec8e..0e609c488 100644--- a/src/components/hooks/useFormat.js+++ b/src/components/hooks/useFormat.js@@ -2,6 +2,7 @@ import useMessages from './useMessages';import { BROWSERS } from 'lib/constants';import useLocale from './useLocale';import useCountryNames from './useCountryNames';+import regions from 'public/iso-3166-2.json';export function useFormat() {const { formatMessage, labels } = useMessages();@@ -16,6 +17,10 @@ export function useFormat() {return countryNames[value] || value;};+ const formatRegion = value => {+ return regions[value] ? regions[value] : value;+ };+const formatDevice = value => {return formatMessage(labels[value] || labels.unknown);};@@ -26,6 +31,8 @@ export function useFormat() {return formatBrowser(value);case 'country':return formatCountry(value);+ case 'region':+ return formatRegion(value);case 'device':return formatDevice(value);default:@@ -33,7 +40,7 @@ export function useFormat() {}};- return { formatBrowser, formatCountry, formatDevice, formatValue };+ return { formatBrowser, formatCountry, formatRegion, formatDevice, formatValue };}export default useFormat;diff --git a/src/pages/api/websites/[id]/values.ts b/src/pages/api/websites/[id]/values.tsindex d90a16822..1f479aebe 100644--- a/src/pages/api/websites/[id]/values.ts+++ b/src/pages/api/websites/[id]/values.ts@@ -6,7 +6,7 @@ import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';import { getValues } from 'queries';-export interface WebsiteResetRequestQuery {+export interface ValuesRequestQuery {id: string;}@@ -17,10 +17,7 @@ const schema = {}),};-export default async (- req: NextApiRequestQueryBody<WebsiteResetRequestQuery>,- res: NextApiResponse,-) => {+export default async (req: NextApiRequestQueryBody<ValuesRequestQuery>, res: NextApiResponse) => {await useCors(req, res);await useAuth(req, res);