m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-06-28 16:57:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

add regions to useFormat

Browse Source
This commit is contained in:
Francis Cao 2023-09-20 14:36:18 -07:00
parent 3f6fb4654b
commit e9ae4903d4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/hooks/useFormat.js
View File

@ -2,6 +2,7 @@ import useMessages from './useMessages';
import { BROWSERS } from 'lib/constants'; import { BROWSERS } from 'lib/constants';
import useLocale from './useLocale'; import useLocale from './useLocale';
import useCountryNames from './useCountryNames'; import useCountryNames from './useCountryNames';
import regions from 'public/iso-3166-2.json';
export function useFormat() { export function useFormat() {
const { formatMessage, labels } = useMessages(); const { formatMessage, labels } = useMessages();
@ -16,6 +17,10 @@ export function useFormat() {
return countryNames[value] || value; return countryNames[value] || value;
}; };
const formatRegion = value => {
return regions[value] ? regions[value] : value;
};
const formatDevice = value => { const formatDevice = value => {
return formatMessage(labels[value] || labels.unknown); return formatMessage(labels[value] || labels.unknown);
}; };
@ -26,6 +31,8 @@ export function useFormat() {
return formatBrowser(value); return formatBrowser(value);
case 'country': case 'country':
return formatCountry(value); return formatCountry(value);
case 'region':
return formatRegion(value);
case 'device': case 'device':
return formatDevice(value); return formatDevice(value);
default: default:
@ -33,7 +40,7 @@ export function useFormat() {
} }
}; };
return { formatBrowser, formatCountry, formatDevice, formatValue }; return { formatBrowser, formatCountry, formatRegion, formatDevice, formatValue };
} }
export default useFormat; export default useFormat;

7
src/pages/api/websites/[id]/values.ts
View File

@ -6,7 +6,7 @@ import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants'; import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
import { getValues } from 'queries'; import { getValues } from 'queries';
export interface WebsiteResetRequestQuery { export interface ValuesRequestQuery {
id: string; id: string;
} }
@ -17,10 +17,7 @@ const schema = {
}), }),
}; };
export default async ( export default async (req: NextApiRequestQueryBody<ValuesRequestQuery>, res: NextApiResponse) => {
req: NextApiRequestQueryBody<WebsiteResetRequestQuery>,
res: NextApiResponse,
) => {
await useCors(req, res); await useCors(req, res);
await useAuth(req, res); await useAuth(req, res);