watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 05:37:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Handle country data for regions and cities.

Browse source
This commit is contained in:
Mike Cao 2023-08-27 23:30:46 -07:00
parent 8c9e473550
commit 684587f945
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/metrics/CitiesTable.js
View file

@ -22,9 +22,7 @@ export function CitiesTable({ websiteId, ...props }) {
<FilterLink id="city" value={city} label={renderLabel(city, country)}>
{country && (
<img
src={`${basePath}/images/flags/${
country?.split?.('-')?.[0]?.toLowerCase() || 'xx'
}.png`}
src={`${basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
alt={country}
/>
)}

14
src/components/metrics/RegionsTable.js
View file

@ -13,17 +13,15 @@ export function RegionsTable({ websiteId, ...props }) {
const countryNames = useCountryNames(locale);
const { basePath } = useRouter();
const renderLabel = x => {
return regions[x] ? `${regions[x]}, ${countryNames[x.split('-')[0]]}` : x;
const renderLabel = (code, country) => {
const region = code.includes('-') ? code : `${country}-${code}`;
return regions[region] ? `${regions[region]}, ${countryNames[country]}` : region;
};
const renderLink = ({ x: code }) => {
const renderLink = ({ x: code, country }) => {
return (
<FilterLink id="region" className={locale} value={code} label={renderLabel(code)}>
<img
src={`${basePath}/images/flags/${code?.split('-')?.[0]?.toLowerCase() || 'xx'}.png`}
alt={code}
/>
<FilterLink id="region" className={locale} value={code} label={renderLabel(code, country)}>
<img src={`${basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`} alt={code} />
</FilterLink>
);
};