Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Fix display of encoded characters. Closes #1171.

Mike Cao1bfb26ab447c
diff --git a/components/common/FilterLink.js b/components/common/FilterLink.js
index 9401cb132..459a8ae1d 100644
--- a/components/common/FilterLink.js
+++ b/components/common/FilterLink.js
@@ -2,6 +2,7 @@ import React from 'react';
import Link from 'next/link';
import classNames from 'classnames';
import usePageQuery from 'hooks/usePageQuery';
+import { safeDecodeURI } from 'lib/url';
import Icon from './Icon';
import External from 'assets/arrow-up-right-from-square.svg';
import styles from './FilterLink.module.css';
@@ -20,7 +21,7 @@ export default function FilterLink({ id, value, label, externalUrl }) {
[styles.active]: active && selected,
})}
>
- {label || value}
+ {safeDecodeURI(label || value)}
</a>
</Link>
{externalUrl && (
diff --git a/components/metrics/CountriesTable.js b/components/metrics/CountriesTable.js
index 17d9127aa..4a4c6132b 100644
--- a/components/metrics/CountriesTable.js
+++ b/components/metrics/CountriesTable.js
@@ -1,14 +1,21 @@
import React from 'react';
import MetricsTable from './MetricsTable';
import { percentFilter } from 'lib/filters';
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
import FilterLink from 'components/common/FilterLink';
import useCountryNames from 'hooks/useCountryNames';
import useLocale from 'hooks/useLocale';
+const messages = defineMessages({
+ unknown: { id: 'label.unknown', defaultMessage: 'Unknown' },
+ countries: { id: 'label.countries', defaultMessage: 'Countries' },
+ visitors: { id: 'label.visitors', defaultMessage: 'Visitors' },
+});
+
export default function CountriesTable({ websiteId, onDataLoad, ...props }) {
const { locale } = useLocale();
const countryNames = useCountryNames(locale);
+ const { formatMessage } = useIntl();
function renderLink({ x: code }) {
return (
@@ -16,9 +23,7 @@ export default function CountriesTable({ websiteId, onDataLoad, ...props }) {
<FilterLink
id="country"
value={code}
- label={
- countryNames[code] ?? <FormattedMessage id="label.unknown" defaultMessage="Unknown" />
- }
+ label={countryNames[code] ?? formatMessage(messages.unknown)}
/>
</div>
);
@@ -27,9 +32,9 @@ export default function CountriesTable({ websiteId, onDataLoad, ...props }) {
return (
<MetricsTable
{...props}
- title={<FormattedMessage id="metrics.countries" defaultMessage="Countries" />}
+ title={formatMessage(messages.countries)}
type="country"
- metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
+ metric={formatMessage(messages.visitors)}
websiteId={websiteId}
onDataLoad={data => onDataLoad?.(percentFilter(data))}
renderLabel={renderLink}