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.

Fixes for country search.

Mike Cao98352628cbf9
diff --git a/src/components/metrics/CitiesTable.tsx b/src/components/metrics/CitiesTable.tsx
index 61624f6a1..fd628e7fa 100644
--- a/src/components/metrics/CitiesTable.tsx
+++ b/src/components/metrics/CitiesTable.tsx
@@ -1,9 +1,6 @@
import MetricsTable, { MetricsTableProps } from './MetricsTable';
import { emptyFilter } from 'lib/filters';
import FilterLink from 'components/common/FilterLink';
-
-import TypeIcon from 'components/common/TypeIcon';
-import { useLocale } from 'components/hooks';
import { useMessages } from 'components/hooks';
import { useFormat } from 'components/hooks';
@@ -16,7 +13,9 @@ export function CitiesTable(props: MetricsTableProps) {
<FilterLink id="city" value={city} label={formatCity(city, country)}>
{country && (
<img
- src={`${process.env.basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
+ src={`${process.env.basePath || ''}/images/country/${
+ country?.toLowerCase() || 'xx'
+ }.png`}
alt={country}
/>
)}
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
index 3354c73c8..f4560ae34 100644
--- a/src/components/metrics/CountriesTable.tsx
+++ b/src/components/metrics/CountriesTable.tsx
@@ -29,7 +29,6 @@ export function CountriesTable({ ...props }: MetricsTableProps) {
type="country"
metric={formatMessage(labels.visitors)}
renderLabel={renderLink}
- onDataLoad={handleDataLoad}
searchFormattedValues={true}
/>
);
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index f8bc4df39..4db599b96 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -55,22 +55,8 @@ export function MetricsTable({
const { data, isLoading, isFetched, error } = useWebsiteMetrics(
websiteId,
- { type, limit, search, ...params },
+ { type, limit, search: searchFormattedValues ? undefined : search, ...params },
{
- type,
- startAt: +startDate,
- endAt: +endDate,
- url,
- referrer,
- os,
- title,
- browser,
- device,
- country,
- region,
- city,
- limit,
- search: (searchFormattedValues) ? undefined : search,
retryDelay: delay || DEFAULT_ANIMATION_DURATION,
onDataLoad,
},