Skip to content

📈 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!

added flags support for regions / cities

Blue Mouse121a20b15620
diff --git a/app/pages/Project/View/Panels.tsx b/app/pages/Project/View/Panels.tsx
index 44be2aa22..684c0e4fe 100644
--- a/app/pages/Project/View/Panels.tsx
+++ b/app/pages/Project/View/Panels.tsx
@@ -1093,7 +1093,7 @@ const Panel = ({
count, name: entryName,
} = entry
const perc = _round((count / total) * 100, 2)
- const rowData = rowMapper(entryName)
+ const rowData = rowMapper(entry)
const valueData = valueMapper(count)
return (
@@ -1212,7 +1212,7 @@ Panel.propTypes = {
Panel.defaultProps = {
id: null,
- rowMapper: (value: any): any => value,
+ rowMapper: (row: IEntry): string => row.name,
valueMapper: (value: number): number => value,
capitalize: false,
linkContent: false,
diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsx
index 910ade78f..34130f064 100644
--- a/app/pages/Project/View/ViewProject.tsx
+++ b/app/pages/Project/View/ViewProject.tsx
@@ -52,6 +52,7 @@ import {
import { IUser } from 'redux/models/IUser'
import { IProject, ILiveStats } from 'redux/models/IProject'
import { IProjectForShared, ISharedProject } from 'redux/models/ISharedProject'
+import { IEntry } from 'redux/models/IEntry'
import Loader from 'ui/Loader'
import Dropdown from 'ui/Dropdown'
import Checkbox from 'ui/Checkbox'
@@ -2193,12 +2194,26 @@ const ViewProject = ({
if (type === 'cc') {
const ccPanelName = tnMapping[countryActiveTab]
+ const rowMapper = (entry: IEntry) => {
+ const { name: entryName, cc } = entry
+
+ if (cc) {
+ return (
+ <CCRow rowName={cc} language={language} />
+ )
+ }
+
+ return (
+ <CCRow rowName={entryName} language={language} />
+ )
+ }
+
return (
<Panel
t={t}
- key={type}
+ key={countryActiveTab}
icon={panelIcon}
- id={type}
+ id={countryActiveTab}
onFilter={filterHandler}
activeTab={activeTab}
name={(
@@ -2209,9 +2224,7 @@ const ViewProject = ({
)}
data={panelsData.data[countryActiveTab]}
customTabs={customTabs}
- rowMapper={(rowName) => (
- <CCRow rowName={rowName} language={language} />
- )}
+ rowMapper={rowMapper}
/>
)
}
@@ -2245,8 +2258,8 @@ const ViewProject = ({
activeTab={activeTab}
data={panelsData.data[type]}
customTabs={customTabs}
- rowMapper={(rowName) => (
- <RefRow rowName={rowName} showIcons={showIcons} />
+ rowMapper={({ name: entryName }) => (
+ <RefRow rowName={entryName} showIcons={showIcons} />
)}
/>
)
@@ -2264,7 +2277,7 @@ const ViewProject = ({
name={panelName}
data={panelsData.data[type]}
customTabs={customTabs}
- rowMapper={(row) => decodeURIComponent(row)}
+ rowMapper={({ name: entryName }) => decodeURIComponent(entryName)}
/>
)
}
@@ -2350,20 +2363,39 @@ const ViewProject = ({
const customTabs = _filter(customPanelTabs, tab => tab.panelID === type)
if (type === 'cc') {
+ const ccPanelName = tnMapping[countryActiveTab]
+
+ const rowMapper = (entry: IEntry) => {
+ const { name: entryName, cc } = entry
+
+ if (cc) {
+ return (
+ <CCRow rowName={cc} language={language} />
+ )
+ }
+
+ return (
+ <CCRow rowName={entryName} language={language} />
+ )
+ }
+
return (
<Panel
t={t}
- key={type}
+ key={countryActiveTab}
icon={panelIcon}
- id={type}
+ id={countryActiveTab}
onFilter={filterHandler}
- name={panelName}
+ name={(
+ <CountryDropdown
+ onSelect={setCountryActiveTab}
+ title={ccPanelName}
+ />
+ )}
activeTab={activeTab}
- data={panelsDataPerf.data[type]}
+ data={panelsDataPerf.data[countryActiveTab]}
customTabs={customTabs}
- rowMapper={(rowName) => (
- <CCRow rowName={rowName} language={language} />
- )}
+ rowMapper={rowMapper}
valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}
/>
)