📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Fix region map filters
Blue Mouse2b62f87b450c
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex dcf7c6df0..6d8b7640c 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -3425,8 +3425,8 @@ const ViewProjectContent = () => {data={countryData}regionData={regionData}total={total}- onClickCountry={(key) => {- const link = getFilterLink('cc', key)+ onClick={(type, key) => {+ const link = getFilterLink(type, key)navigate(link)}}/>@@ -3759,8 +3759,8 @@ const ViewProjectContent = () => {data={countryData}regionData={regionData}total={total}- onClickCountry={(key) => {- const link = getFilterLink('cc', key)+ onClick={(type, key) => {+ const link = getFilterLink(type, key)navigate(link)}}/>@@ -4064,8 +4064,8 @@ const ViewProjectContent = () => {data={countryData}regionData={regionData}total={total}- onClickCountry={(key) => {- const link = getFilterLink('cc', key)+ onClick={(type, key) => {+ const link = getFilterLink(type, key)navigate(link)}}/>diff --git a/web/app/pages/Project/View/components/InteractiveMap.tsx b/web/app/pages/Project/View/components/InteractiveMap.tsxindex 1b9363876..edb674bac 100644--- a/web/app/pages/Project/View/components/InteractiveMap.tsx+++ b/web/app/pages/Project/View/components/InteractiveMap.tsx@@ -22,7 +22,7 @@ import { useViewProjectContext } from '../ViewProject'interface InteractiveMapProps {data: Entry[]regionData?: Entry[]- onClickCountry: (country: string) => void+ onClick: (type: 'cc' | 'rg', key: string) => voidtotal: numbershowFullscreenToggle?: boolean}@@ -39,13 +39,7 @@ interface TooltipPosition {y: number}-const InteractiveMapCore = ({- data,- regionData,- onClickCountry,- total,- showFullscreenToggle = true,-}: InteractiveMapProps) => {+const InteractiveMapCore = ({ data, regionData, onClick, total, showFullscreenToggle = true }: InteractiveMapProps) => {const { t } = useTranslation('common')const { activeTab, dataLoading } = useViewProjectContext()const { theme } = useTheme()@@ -228,13 +222,16 @@ const InteractiveMapCore = ({},click: () => {const result = findDataForFeature(feature)- if (result?.key) {- onClickCountry(result.key)- }++ const key = result?.data?.name++ if (!key) return++ onClick(mapView === 'regions' ? 'rg' : 'cc', key)},})},- [findDataForFeature, total, onClickCountry, mapView],+ [findDataForFeature, total, onClick, mapView],)const MapEventHandler = () => {@@ -383,7 +380,7 @@ const InteractiveMapCore = ({<InteractiveMapCoredata={data}regionData={regionData}- onClickCountry={onClickCountry}+ onClick={onClick}total={total}showFullscreenToggle={false}/>@@ -396,7 +393,7 @@ const InteractiveMapCore = ({)}-const InteractiveMap = ({ data, regionData, onClickCountry, total }: InteractiveMapProps) => {+const InteractiveMap = ({ data, regionData, onClick, total }: InteractiveMapProps) => {const { t } = useTranslation('common')return (@@ -410,7 +407,7 @@ const InteractiveMap = ({ data, regionData, onClickCountry, total }: Interactive</div>}>- {() => <InteractiveMapCore data={data} regionData={regionData} onClickCountry={onClickCountry} total={total} />}+ {() => <InteractiveMapCore data={data} regionData={regionData} onClick={onClick} total={total} />}</ClientOnly>)}