📈 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
Display counts for panel dropdowns
Blue Mousef32e93872920
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex f7ea68305..dd8d554a3 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -343,10 +343,18 @@ interface MetadataProps {interface CustomEventsProps extends MetadataProps {setActiveTab: React.Dispatch<React.SetStateAction<'customEv' | 'properties'>>+ dataKeys: {+ properties: string[]+ customEv: string[]+ }}interface PagePropertiesProps extends MetadataProps {setActiveTab: React.Dispatch<React.SetStateAction<'customEv' | 'properties'>>+ dataKeys: {+ properties: string[]+ customEv: string[]+ }}interface SortRows {@@ -553,6 +561,7 @@ const CustomEvents = ({getCustomEventMetadata,setActiveTab,getFilterLink,+ dataKeys,}: CustomEventsProps) => {const { t } = useTranslation('common')const [page, setPage] = useState(0)@@ -818,7 +827,7 @@ const CustomEvents = ({return (<PanelContainer// @ts-expect-error - onSelect not typed- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} data={dataKeys} />}type='ce'setActiveFragment={setActiveFragment}activeFragment={activeFragment}@@ -834,7 +843,7 @@ const CustomEvents = ({return (<PanelContainer// @ts-expect-error - onSelect not typed- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} data={dataKeys} />}type='ce'setActiveFragment={setActiveFragment}activeFragment={activeFragment}@@ -864,7 +873,7 @@ const CustomEvents = ({return (<PanelContainer// @ts-expect-error - onSelect not typed- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} data={dataKeys} />}type='ce'activeFragment={activeFragment}setActiveFragment={setActiveFragment}@@ -882,7 +891,7 @@ const CustomEvents = ({<PanelContainercustomTabs={customTabs}// @ts-expect-error - onSelect not typed- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} data={dataKeys} />}type='ce'setActiveFragment={setActiveFragment}activeFragment={activeFragment}@@ -1022,6 +1031,7 @@ const PageProperties = ({getPropertyMetadata,setActiveTab,getFilterLink,+ dataKeys,}: PagePropertiesProps) => {const { t } = useTranslation('common')const [page, setPage] = useState(0)@@ -1272,7 +1282,7 @@ const PageProperties = ({return (<PanelContainer// @ts-expect-error - onSelect not typed- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} />}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} data={dataKeys} />}type='props'setActiveFragment={setActiveFragment}activeFragment={activeFragment}@@ -1286,7 +1296,7 @@ const PageProperties = ({return (<PanelContainer// @ts-expect-error - onSelect not typed- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} />}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} data={dataKeys} />}type='props'setActiveFragment={setActiveFragment}activeFragment={activeFragment}@@ -1422,11 +1432,18 @@ const PageProperties = ({const Metadata = (props: MetadataProps) => {const [activeTab, setActiveTab] = useState<'customEv' | 'properties'>('customEv')+ const dataKeys = useMemo(() => {+ return {+ properties: Object.keys(props.properties || {}),+ customEv: Object.keys(props.customs || {}),+ }+ }, [props.properties, props.customs])+if (activeTab === 'customEv') {- return <CustomEvents {...props} setActiveTab={setActiveTab} />+ return <CustomEvents {...props} dataKeys={dataKeys} setActiveTab={setActiveTab} />}- return <PageProperties {...props} setActiveTab={setActiveTab} />+ return <PageProperties {...props} dataKeys={dataKeys} setActiveTab={setActiveTab} />}interface FilterWrapperProps {diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 940808d27..4941119d5 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -3375,8 +3375,14 @@ const ViewProject = () => {icon={panelIcon}id={countryActiveTab}getFilterLink={getFilterLink}- // @ts-expect-error - onSelect not typed- name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}+ name={+ <CountryDropdown+ // @ts-expect-error - onSelect not typed+ onSelect={setCountryActiveTab}+ title={ccPanelName}+ data={activeError?.params}+ />+ }data={activeError?.params[countryActiveTab]}rowMapper={rowMapper}/>@@ -3419,7 +3425,13 @@ const ViewProject = () => {icon={panelIcon}id={browserActiveTab}getFilterLink={getFilterLink}- name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}+ name={+ <BrowserDropdown+ onSelect={setBrowserActiveTab}+ title={brPanelName}+ data={activeError?.params}+ />+ }data={activeError?.params[browserActiveTab]}rowMapper={rowMapper}/>@@ -3469,7 +3481,13 @@ const ViewProject = () => {icon={panelIcon}id={osActiveTab}getFilterLink={getFilterLink}- name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}+ name={+ <OSDropdown+ onSelect={setOsActiveTab}+ title={osPanelName}+ data={activeError?.params}+ />+ }data={activeError?.params[osActiveTab]}rowMapper={rowMapper}/>@@ -3532,7 +3550,13 @@ const ViewProject = () => {return decodedUri}}data={activeError?.params[pageActiveTab]}- name={<PageDropdown onSelect={setPageActiveTab} title={tnMapping[pageActiveTab]} />}+ name={+ <PageDropdown+ onSelect={setPageActiveTab}+ title={tnMapping[pageActiveTab]}+ data={activeError?.params}+ />+ }/>)}@@ -3664,8 +3688,14 @@ const ViewProject = () => {icon={panelIcon}id={countryActiveTab}getFilterLink={getFilterLink}- // @ts-expect-error - onSelect not typed- name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}+ name={+ <CountryDropdown+ // @ts-expect-error - onSelect not typed+ onSelect={setCountryActiveTab}+ title={ccPanelName}+ data={panelsData.data}+ />+ }data={panelsData.data[countryActiveTab]}customTabs={customTabs}rowMapper={rowMapper}@@ -3709,7 +3739,13 @@ const ViewProject = () => {icon={panelIcon}id={browserActiveTab}getFilterLink={getFilterLink}- name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}+ name={+ <BrowserDropdown+ onSelect={setBrowserActiveTab}+ title={brPanelName}+ data={panelsData.data}+ />+ }data={panelsData.data[browserActiveTab]}rowMapper={rowMapper}/>@@ -3759,7 +3795,9 @@ const ViewProject = () => {icon={panelIcon}id={osActiveTab}getFilterLink={getFilterLink}- name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}+ name={+ <OSDropdown onSelect={setOsActiveTab} title={osPanelName} data={panelsData.data} />+ }data={panelsData.data[osActiveTab]}rowMapper={rowMapper}/>@@ -3822,8 +3860,14 @@ const ViewProject = () => {icon={panelIcon}id={utmActiveTab}getFilterLink={getFilterLink}- // @ts-expect-error - onSelect not typed- name={<UTMDropdown onSelect={setUtmActiveTab} title={ccPanelName} />}+ name={+ <UTMDropdown+ // @ts-expect-error - onSelect not typed+ onSelect={setUtmActiveTab}+ title={ccPanelName}+ data={panelsData.data}+ />+ }data={panelsData.data[utmActiveTab]}customTabs={customTabs}rowMapper={({ name: entryName }) => decodeURIComponent(entryName)}@@ -3860,7 +3904,11 @@ const ViewProject = () => {pgActiveFragment === 1 ? (tnMapping.userFlow) : (- <PageDropdown onSelect={setPageActiveTab} title={tnMapping[pageActiveTab]} />+ <PageDropdown+ onSelect={setPageActiveTab}+ title={tnMapping[pageActiveTab]}+ data={panelsData.data}+ />)}data={panelsData.data[pageActiveTab]}@@ -3966,8 +4014,14 @@ const ViewProject = () => {icon={panelIcon}id={countryActiveTab}getFilterLink={getFilterLink}- // @ts-expect-error - onSelect not typed- name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}+ name={+ <CountryDropdown+ // @ts-expect-error - onSelect not typed+ onSelect={setCountryActiveTab}+ title={ccPanelName}+ data={panelsDataPerf.data}+ />+ }data={panelsDataPerf.data[countryActiveTab]}customTabs={customTabs}rowMapper={rowMapper}@@ -4026,7 +4080,13 @@ const ViewProject = () => {entryName ||(pageActiveTab === 'pg' ? t('project.redactedPage') : t('project.unknownHost'))}- name={<PageDropdown onSelect={setPageActiveTab} title={tnMapping[pageActiveTab]} />}+ name={+ <PageDropdown+ onSelect={setPageActiveTab}+ title={tnMapping[pageActiveTab]}+ data={panelsDataPerf.data}+ />+ }/>)}@@ -4067,7 +4127,13 @@ const ViewProject = () => {icon={panelIcon}id={browserActiveTab}getFilterLink={getFilterLink}- name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}+ name={+ <BrowserDropdown+ onSelect={setBrowserActiveTab}+ title={brPanelName}+ data={panelsDataPerf.data}+ />+ }data={panelsDataPerf.data[browserActiveTab]}rowMapper={rowMapper}/>diff --git a/web/app/pages/Project/View/components/BrowserDropdown.tsx b/web/app/pages/Project/View/components/BrowserDropdown.tsxindex 839c653f7..391969e20 100644--- a/web/app/pages/Project/View/components/BrowserDropdown.tsx+++ b/web/app/pages/Project/View/components/BrowserDropdown.tsx@@ -1,3 +1,5 @@+import { Params } from '../interfaces/traffic'+import ProjectDropdown from './ProjectDropdown'const OPTIONS = [@@ -14,10 +16,13 @@ const OPTIONS = [interface BrowserDropdownProps {onSelect: (value: (typeof OPTIONS)[number]['value']) => voidtitle: string+ data: Params}-const BrowserDropdown = ({ onSelect, title }: BrowserDropdownProps) => {- return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.browserInfo' />+const BrowserDropdown = ({ onSelect, title, data }: BrowserDropdownProps) => {+ return (+ <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.browserInfo' data={data} />+ )}export default BrowserDropdowndiff --git a/web/app/pages/Project/View/components/CountryDropdown.tsx b/web/app/pages/Project/View/components/CountryDropdown.tsxindex 3e7092f07..df57c3ecd 100644--- a/web/app/pages/Project/View/components/CountryDropdown.tsx+++ b/web/app/pages/Project/View/components/CountryDropdown.tsx@@ -1,8 +1,11 @@+import { Params } from '../interfaces/traffic'+import ProjectDropdown from './ProjectDropdown'interface CountryDropdownProps {onSelect: (value: string) => voidtitle: string+ data: Params}const OPTIONS = [@@ -20,8 +23,8 @@ const OPTIONS = [},]-const CountryDropdown = ({ onSelect, title }: CountryDropdownProps) => {- return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.geo' />+const CountryDropdown = ({ onSelect, title, data }: CountryDropdownProps) => {+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.geo' data={data} />}export default CountryDropdowndiff --git a/web/app/pages/Project/View/components/CustomEventsDropdown.tsx b/web/app/pages/Project/View/components/CustomEventsDropdown.tsxindex f4a377622..7afb42d6a 100644--- a/web/app/pages/Project/View/components/CustomEventsDropdown.tsx+++ b/web/app/pages/Project/View/components/CustomEventsDropdown.tsx@@ -1,8 +1,11 @@+import { Params } from '../interfaces/traffic'+import ProjectDropdown from './ProjectDropdown'interface CustomEventsDropdownProps {onSelect: (value: string) => voidtitle: string+ data: Params}const OPTIONS = [@@ -16,8 +19,11 @@ const OPTIONS = [},]-const CustomEventsDropdown = ({ onSelect, title }: CustomEventsDropdownProps) => {- return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.metadata' />+const CustomEventsDropdown = ({ onSelect, title, data }: CustomEventsDropdownProps) => {+ console.log('data:', data)+ return (+ <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.metadata' data={data} />+ )}export default CustomEventsDropdowndiff --git a/web/app/pages/Project/View/components/OSDropdown.tsx b/web/app/pages/Project/View/components/OSDropdown.tsxindex 07a575f09..33657789c 100644--- a/web/app/pages/Project/View/components/OSDropdown.tsx+++ b/web/app/pages/Project/View/components/OSDropdown.tsx@@ -1,3 +1,5 @@+import { Params } from '../interfaces/traffic'+import ProjectDropdown from './ProjectDropdown'const OPTIONS = [@@ -14,10 +16,11 @@ const OPTIONS = [interface OSDropdownProps {onSelect: (value: (typeof OPTIONS)[number]['value']) => voidtitle: string+ data: Params}-const OSDropdown = ({ onSelect, title }: OSDropdownProps) => {- return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.osInfo' />+const OSDropdown = ({ onSelect, title, data }: OSDropdownProps) => {+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.osInfo' data={data} />}export default OSDropdowndiff --git a/web/app/pages/Project/View/components/PageDropdown.tsx b/web/app/pages/Project/View/components/PageDropdown.tsxindex ab1657b33..790ce446b 100644--- a/web/app/pages/Project/View/components/PageDropdown.tsx+++ b/web/app/pages/Project/View/components/PageDropdown.tsx@@ -1,3 +1,5 @@+import { Params } from '../interfaces/traffic'+import ProjectDropdown from './ProjectDropdown'const OPTIONS = [@@ -14,10 +16,11 @@ const OPTIONS = [interface PageDropdownProps {onSelect: (value: (typeof OPTIONS)[number]['value']) => voidtitle: string+ data: Params}-const PageDropdown = ({ onSelect, title }: PageDropdownProps) => {- return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.urlInfo' />+const PageDropdown = ({ onSelect, title, data }: PageDropdownProps) => {+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.urlInfo' data={data} />}export default PageDropdowndiff --git a/web/app/pages/Project/View/components/ProjectDropdown.tsx b/web/app/pages/Project/View/components/ProjectDropdown.tsxindex 69116ebd5..42ab98cf8 100644--- a/web/app/pages/Project/View/components/ProjectDropdown.tsx+++ b/web/app/pages/Project/View/components/ProjectDropdown.tsx@@ -1,7 +1,10 @@import { useTranslation } from 'react-i18next'+import { Badge } from '~/ui/Badge'import Dropdown from '~/ui/Dropdown'+import { Params } from '../interfaces/traffic'+interface ProjectDropdownOption {readonly label: stringreadonly value: string@@ -12,6 +15,7 @@ interface ProjectDropdownProps<T extends string = string> {title: stringoptions: readonly ProjectDropdownOption[]headerKey: string+ data: Params}const ProjectDropdown = <T extends string = string>({@@ -19,6 +23,7 @@ const ProjectDropdown = <T extends string = string>({title,options,headerKey,+ data,}: ProjectDropdownProps<T>) => {const { t } = useTranslation()@@ -30,13 +35,19 @@ const ProjectDropdown = <T extends string = string>({onSelect(item.value as T)close()}}- labelExtractor={(item) => t(item.label)}+ selectItemClassName='flex items-center justify-between space-x-4'+ labelExtractor={(item) => (+ <>+ <span>{t(item.label)}</span>+ {data?.[item.value] ? <Badge colour='slate' label={data[item.value].length.toString()} /> : null}+ </>+ )}keyExtractor={(item) => item.value}header={t(headerKey)}headlessbuttonClassName='cursor-pointer !p-0 text-lg font-semibold flex items-center'className='relative inline-block'- menuItemsClassName='absolute top-4 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto'+ menuItemsClassName='absolute top-4 left-5 z-10 mt-2 max-h-[200px] !min-w-[220px] overflow-auto'chevron='mini'/>)diff --git a/web/app/pages/Project/View/components/UTMDropdown.tsx b/web/app/pages/Project/View/components/UTMDropdown.tsxindex 5c4fb40ba..fb5736486 100644--- a/web/app/pages/Project/View/components/UTMDropdown.tsx+++ b/web/app/pages/Project/View/components/UTMDropdown.tsx@@ -1,8 +1,11 @@+import { Params } from '../interfaces/traffic'+import ProjectDropdown from './ProjectDropdown'interface UTMDropdownProps {onSelect: (value: string) => voidtitle: string+ data: Params}const OPTIONS = [@@ -28,8 +31,10 @@ const OPTIONS = [},]-const UTMDropdown = ({ onSelect, title }: UTMDropdownProps) => {- return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.campaigns' />+const UTMDropdown = ({ onSelect, title, data }: UTMDropdownProps) => {+ return (+ <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.campaigns' data={data} />+ )}export default UTMDropdown