📈 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
combine some dashboard panels, introduce panel tabs
Blue Mousea43d84bbee1b
diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.tsindex 087cc9a26..db9c3b802 100644--- a/web/app/lib/constants/index.ts+++ b/web/app/lib/constants/index.ts@@ -247,7 +247,7 @@ export const PERIOD_PAIRS_COMPARE = {} as const// the order of panels in the project view-export const TRAFFIC_PANELS_ORDER = ['cc', 'pg', 'br', 'os', 'ref', 'lc', 'dv', 'so']+export const TRAFFIC_PANELS_ORDER = ['location', 'pg', 'browser', 'device', 'ref', 'so']export const FILTERS_PANELS_ORDER = ['cc', 'pg', 'br', 'os', 'ref', 'lc', 'dv']export const ERRORS_FILTERS_PANELS_ORDER = ['cc', 'pg', 'br', 'os', 'lc', 'dv']export const PERFORMANCE_PANELS_ORDER = ['cc', 'pg', 'br', 'dv']diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex d9773a3dc..f7f285902 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -22,16 +22,7 @@ import _sortBy from 'lodash/sortBy'import _sum from 'lodash/sum'import _toPairs from 'lodash/toPairs'import _values from 'lodash/values'-import {- AlignJustifyIcon,- ChartPieIcon,- MapIcon,- MaximizeIcon,- WorkflowIcon,- FilterIcon,- PuzzleIcon,- ScanIcon,-} from 'lucide-react'+import { AlignJustifyIcon, ChartPieIcon, MaximizeIcon, FilterIcon, PuzzleIcon, ScanIcon } from 'lucide-react'import React, { memo, useState, useEffect, useMemo, Fragment } from 'react'import { useTranslation } from 'react-i18next'import { Link, LinkProps, useNavigate } from 'react-router'@@ -46,8 +37,6 @@ import Modal from '~/ui/Modal'import { nFormatter } from '~/utils/generic'import CustomEventsDropdown from './components/CustomEventsDropdown'-import InteractiveMap from './components/InteractiveMap'-import UserFlow from './components/UserFlow'import { Customs, Filter, Properties } from './interfaces/traffic'import { useViewProjectContext } from './ViewProject'import { iconClassName } from './ViewProject.helpers'@@ -106,8 +95,14 @@ interface PanelContainerProps {activeFragment?: number | stringsetActiveFragment?: (arg: number) => voidcustomTabs?: CustomTab[]- activeTab?: stringisCustomContent?: boolean+ tabs?: Array<{+ id: string+ label: string+ hasData?: boolean+ }>+ onTabChange?: (tab: string) => void+ activeTabId?: string}const PanelContainer = ({@@ -118,9 +113,11 @@ const PanelContainer = ({activeFragment = 0,setActiveFragment = () => {},customTabs = [],- activeTab,isCustomContent,onExpandClick = () => {},+ tabs,+ onTabChange,+ activeTabId,}: PanelContainerProps) => (<divclassName={cx(@@ -130,140 +127,124 @@ const PanelContainer = ({},)}>- <div className='mb-2 flex items-center justify-between'>+ <div className='mb-2 flex items-center justify-between gap-4'><h3 className='flex items-center text-lg leading-6 font-semibold text-gray-900 dark:text-gray-50'>{icon ? <span className='mr-1'>{icon}</span> : null}{name}</h3>- <div className='flex'>- {checkIfBarsNeeded(type) || checkCustomTabs(type, customTabs) ? (- <button- type='button'- onClick={() => setActiveFragment(0)}- aria-label='Switch to bar view'- className='rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'- >- <AlignJustifyIcon- className={cx(iconClassName, {- 'text-slate-900 dark:text-gray-50': activeFragment === 0,- 'text-slate-400 dark:text-slate-500': _isString(activeFragment) || activeFragment === 1,- })}- strokeWidth={1.5}- />- </button>- ) : null}-- {/* if it is a Country tab */}- {type === 'cc' || type === 'rg' || type === 'ct' ? (+ <div className='flex items-center gap-1 overflow-x-auto'>+ {/* Custom panel tabs */}+ {tabs && onTabChange ? (<>- <button- type='button'- onClick={() => setActiveFragment(1)}- aria-label='Switch to map view'- className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'- >- <MapIcon- className={cx(iconClassName, {- 'text-slate-900 dark:text-gray-50': activeFragment === 1,- 'text-slate-400 dark:text-slate-500': _isString(activeFragment) || activeFragment === 0,+ {tabs.map((tab) => (+ <button+ key={tab.id}+ type='button'+ onClick={() => {+ onTabChange(tab.id)+ // Reset to list view when switching tabs+ setActiveFragment(0)+ }}+ disabled={tab.hasData === false}+ className={cx('rounded px-2 py-1 text-xs font-medium whitespace-nowrap transition-colors', {+ 'bg-slate-900 text-white dark:bg-gray-50 dark:text-slate-900':+ activeTabId === tab.id && activeFragment === 0,+ 'bg-gray-100 text-gray-700 hover:bg-gray-200 dark:bg-slate-700 dark:text-gray-300 dark:hover:bg-slate-600':+ (activeTabId !== tab.id || activeFragment !== 0) && tab.hasData !== false,+ 'cursor-not-allowed bg-gray-50 text-gray-400 dark:bg-slate-800 dark:text-gray-600':+ tab.hasData === false,})}- strokeWidth={1.5}- />- </button>- <button- type='button'- onClick={onExpandClick}- aria-label='Expand view'- className={cx('ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700', {- hidden: activeFragment === 0,- })}- >- <MaximizeIcon className={cx(iconClassName, 'text-slate-400 dark:text-slate-500')} strokeWidth={1.5} />- </button>- </>- ) : null}-- {type === 'pg' && activeTab !== PROJECT_TABS.performance && activeTab !== PROJECT_TABS.errors ? (- <button- type='button'- onClick={onExpandClick}- aria-label='View user flow'- className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'- >- <WorkflowIcon- className={cx(iconClassName, {- 'text-slate-900 dark:text-gray-50': activeFragment === 1,- 'text-slate-400 dark:text-slate-500': _isString(activeFragment) || activeFragment === 0,- })}- strokeWidth={1.5}- />- </button>- ) : null}-- {/* if this tab using Circle showing stats panel */}- {type === 'ce' || type === 'os' || type === 'br' || type === 'dv' ? (- <button- type='button'- onClick={() => setActiveFragment(1)}- aria-label='Switch to pie chart view'- className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'- >- <ChartPieIcon- className={cx(iconClassName, {- 'text-slate-900 dark:text-gray-50': activeFragment === 1,- 'text-slate-400 dark:text-slate-500': _isString(activeFragment) || activeFragment === 0,- })}- strokeWidth={1.5}- />- </button>- ) : null}-- {/* if it is a 'Custom events' tab */}- {type === 'ce' || type === 'props' ? (- <>- <button- type='button'- onClick={onExpandClick}- aria-label='Expand view'- className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'- >- <MaximizeIcon className={cx(iconClassName, 'text-slate-400 dark:text-slate-500')} strokeWidth={1.5} />- </button>+ >+ {tab.label}+ </button>+ ))}</>- ) : null}-- {checkCustomTabs(type, customTabs) ? (+ ) : (+ /* Existing icon buttons for panels without custom tabs */<>- {/* This is a temp fix to prevent multiple tabs of the same extensionID be displayed */}- {/* TODO: Investigate the issue and fix it */}- {_map(removeDuplicates(customTabs, ['extensionID', 'panelID']), ({ extensionID, panelID, onOpen }) => {- if (panelID !== type) return null+ {checkIfBarsNeeded(type) || checkCustomTabs(type, customTabs) ? (+ <button+ type='button'+ onClick={() => setActiveFragment(0)}+ aria-label='Switch to bar view'+ className='rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'+ >+ <AlignJustifyIcon+ className={cx(iconClassName, {+ 'text-slate-900 dark:text-gray-50': activeFragment === 0,+ 'text-slate-400 dark:text-slate-500': _isString(activeFragment) || activeFragment === 1,+ })}+ strokeWidth={1.5}+ />+ </button>+ ) : null}- const onClick = () => {- onOpen?.()- setActiveFragment(extensionID)- }+ {/* if this tab using Circle showing stats panel */}+ {type === 'ce' || type === 'os' || type === 'br' || type === 'dv' ? (+ <button+ type='button'+ onClick={() => setActiveFragment(1)}+ aria-label='Switch to pie chart view'+ className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'+ >+ <ChartPieIcon+ className={cx(iconClassName, {+ 'text-slate-900 dark:text-gray-50': activeFragment === 1,+ 'text-slate-400 dark:text-slate-500': _isString(activeFragment) || activeFragment === 0,+ })}+ strokeWidth={1.5}+ />+ </button>+ ) : null}- return (+ {/* if it is a 'Custom events' tab */}+ {type === 'ce' || type === 'props' ? (+ <><buttontype='button'- key={`${extensionID}-${panelID}`}- onClick={onClick}- aria-label='Switch to custom tab'+ onClick={onExpandClick}+ aria-label='Expand view'className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'>- <PuzzleIcon- className={cx(iconClassName, {- 'text-slate-900 dark:text-gray-50': activeFragment === extensionID,- 'text-slate-400 dark:text-slate-500': activeFragment === 0,- })}- strokeWidth={1.5}- />+ <MaximizeIcon className={cx(iconClassName, 'text-slate-400 dark:text-slate-500')} strokeWidth={1.5} /></button>- )- })}+ </>+ ) : null}++ {checkCustomTabs(type, customTabs) ? (+ <>+ {/* This is a temp fix to prevent multiple tabs of the same extensionID be displayed */}+ {/* TODO: Investigate the issue and fix it */}+ {_map(removeDuplicates(customTabs, ['extensionID', 'panelID']), ({ extensionID, panelID, onOpen }) => {+ if (panelID !== type) return null++ const onClick = () => {+ onOpen?.()+ setActiveFragment(extensionID)+ }++ return (+ <button+ type='button'+ key={`${extensionID}-${panelID}`}+ onClick={onClick}+ aria-label='Switch to custom tab'+ className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'+ >+ <PuzzleIcon+ className={cx(iconClassName, {+ 'text-slate-900 dark:text-gray-50': activeFragment === extensionID,+ 'text-slate-400 dark:text-slate-500': activeFragment === 0,+ })}+ strokeWidth={1.5}+ />+ </button>+ )+ })}+ </>+ ) : null}</>- ) : null}+ )}</div></div>{/* for other tabs */}@@ -1477,6 +1458,14 @@ interface PanelProps {customTabs?: CustomTab[]onFragmentChange?: (arg: number) => voidgetFilterLink?: (column: string, value: string) => LinkProps['to']+ tabs?: Array<{+ id: string+ label: string+ hasData?: boolean+ }>+ onTabChange?: (tab: string) => void+ activeTabId?: string+ customRenderer?: () => React.ReactNode}const Panel = ({@@ -1492,13 +1481,15 @@ const Panel = ({customTabs = [],onFragmentChange = () => {},getFilterLink = () => '',+ tabs,+ onTabChange,+ activeTabId,+ customRenderer,}: PanelProps) => {const { dataLoading, activeTab } = useViewProjectContext()const { t } = useTranslation('common')const total = useMemo(() => _reduce(data, (prev, curr) => prev + curr.count, 0), [data])const [activeFragment, setActiveFragment] = useState(0)- const [isModalOpen, setIsModalOpen] = useState(false)- const [isReversedUserFlow, setIsReversedUserFlow] = useState(false)const [detailsOpened, setDetailsOpened] = useState(false)const [sortedData, setSortedData] = useState(data)const [sort, setSort] = useState<SortRows>({@@ -1660,47 +1651,6 @@ const Panel = ({</div>)- // Showing map of stats a data- if ((id === 'cc' || id === 'rg' || id === 'ct') && activeFragment === 1 && !_isEmpty(data)) {- return (- <PanelContainer- name={name}- icon={icon}- type={id}- activeFragment={activeFragment}- setActiveFragment={_setActiveFragment}- onExpandClick={() => setIsModalOpen(true)}- customTabs={customTabs}- >- <InteractiveMap- data={data}- total={total}- onClickCountry={(key) => {- const link = getFilterLink(id, key)- navigate(link)- }}- />- <Modal- onClose={() => setIsModalOpen(false)}- closeText={t('common.close')}- isOpened={isModalOpen}- message={- <InteractiveMap- data={data}- total={total}- onClickCountry={(key) => {- const link = getFilterLink(id, key)- navigate(link)- setIsModalOpen(false)- }}- />- }- size='large'- />- </PanelContainer>- )- }-// Showing chart of stats a dataif ((id === 'os' || id === 'br' || id === 'dv') && activeFragment === 1 && !_isEmpty(data)) {const tQuantity = t('project.quantity')@@ -1748,7 +1698,9 @@ const Panel = ({setActiveFragment={_setActiveFragment}activeFragment={activeFragment}customTabs={customTabs}- activeTab={activeTab}+ tabs={tabs}+ onTabChange={onTabChange}+ activeTabId={activeTabId}>{_isEmpty(data) ? (<p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>@@ -1771,10 +1723,11 @@ const Panel = ({type={id}activeFragment={activeFragment}setActiveFragment={_setActiveFragment}- onExpandClick={() => setIsModalOpen(true)}customTabs={customTabs}- activeTab={activeTab}isCustomContent+ tabs={tabs}+ onTabChange={onTabChange}+ activeTabId={activeTabId}>{/* Using this instead of dangerouslySetInnerHTML to support script tags */}{tabContent ? <InnerHTML className='absolute overflow-auto' html={tabContent} /> : null}@@ -1789,11 +1742,14 @@ const Panel = ({type={id}activeFragment={activeFragment}setActiveFragment={_setActiveFragment}- onExpandClick={() => setIsModalOpen(true)}customTabs={customTabs}- activeTab={activeTab}+ tabs={tabs}+ onTabChange={onTabChange}+ activeTabId={activeTabId}>- {_isEmpty(data) ? (+ {customRenderer ? (+ customRenderer()+ ) : _isEmpty(data) ? (<p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>) : (<>@@ -1879,31 +1835,6 @@ const Panel = ({</>)}- {/* PAGE - User flow modal */}- {id === 'pg' ? (- <Modal- onClose={() => setIsModalOpen(false)}- closeText={t('common.close')}- isOpened={isModalOpen}- title={t('project.userFlow.title')}- customButtons={- <button- type='button'- onClick={() => setIsReversedUserFlow((prev) => !prev)}- className='mt-3 inline-flex w-full justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 hover:bg-gray-50 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm dark:border-none dark:border-gray-600 dark:bg-slate-700 dark:text-gray-50 dark:hover:border-gray-600 dark:hover:bg-gray-700'- >- {t('project.reverse')}- </button>- }- message={- <div className='h-[500px] dark:text-gray-800'>- <UserFlow isReversed={isReversedUserFlow} setReversed={() => setIsReversedUserFlow((prev) => !prev)} />- </div>- }- size='large'- />- ) : null}-<ModalonClose={() => setDetailsOpened(false)}closeText={t('common.close')}diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsxindex fe56d8b7b..4b531610c 100644--- a/web/app/pages/Project/View/ViewProject.helpers.tsx+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx@@ -28,6 +28,7 @@ import {MapPinIcon,MonitorCog,MonitorIcon,+ ShareIcon,SmartphoneIcon,TabletIcon,TabletSmartphoneIcon,@@ -1412,11 +1413,16 @@ const typeNameMapping = (t: typeof i18next.t) => ({te: t('project.mapping.te'),co: t('project.mapping.co'),ev: t('project.event'),- userFlow: t('main.competitiveFeatures.usfl'),+ userFlow: t('project.mapping.userFlow'),'tag:key': t('project.metamapping.tag.key'),'tag:value': t('project.metamapping.tag.value'),'ev:key': t('project.metamapping.ev.key'),'ev:value': t('project.metamapping.ev.value'),+ // Combined panel types+ location: t('project.location'),+ browser: t('project.browser'),+ device: t('project.device'),+ map: t('project.map'),})const iconClassName = 'w-5 h-5'@@ -1428,6 +1434,7 @@ const panelIconMapping = {dv: <TabletSmartphoneIcon className={iconClassName} strokeWidth={1.5} />,br: <CompassIcon className={iconClassName} strokeWidth={1.5} />,os: <MonitorCog className={iconClassName} strokeWidth={1.5} />,+ so: <ShareIcon className={iconClassName} strokeWidth={1.5} />,}export const deviceIconMapping = {diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 537c561c1..52954d6a8 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -140,6 +140,7 @@ import { ErrorDetails } from './components/ErrorDetails'import { Errors } from './components/Errors'import Filters from './components/Filters'import FunnelsList from './components/FunnelsList'+import InteractiveMap from './components/InteractiveMap'import LiveVisitorsDropdown from './components/LiveVisitorsDropdown'import LockedDashboard from './components/LockedDashboard'import { MetricCard, MetricCards, PerformanceMetricCards } from './components/MetricCards'@@ -155,7 +156,7 @@ import { SessionChart } from './components/SessionChart'import { SessionDetails } from './components/SessionDetails'import { Sessions } from './components/Sessions'import TBPeriodSelector from './components/TBPeriodSelector'-import UTMDropdown from './components/UTMDropdown'+import UserFlow from './components/UserFlow'import WaitingForAnError from './components/WaitingForAnError'import WaitingForAnEvent from './components/WaitingForAnEvent'import {@@ -591,16 +592,11 @@ const ViewProject = () => {setFunnelActionLoading(false)}- const [countryActiveTab, setCountryActiveTab] = useState<'cc' | 'rg' | 'ct'>('cc')-+ const [locationActiveTab, setLocationActiveTab] = useState<'cc' | 'rg' | 'ct' | 'lc' | 'map'>('cc')const [browserActiveTab, setBrowserActiveTab] = useState<'br' | 'brv'>('br')-- const [pageActiveTab, setPageActiveTab] = useState<'pg' | 'host'>('pg')- const [pgActiveFragment, setPgActiveFragment] = useState(0)-- const [osActiveTab, setOsActiveTab] = useState<'os' | 'osv'>('os')-- const [utmActiveTab, setUtmActiveTab] = useState<'so' | 'me' | 'ca'>('so')+ const [pageActiveTab, setPageActiveTab] = useState<'pg' | 'host' | 'userFlow'>('pg')+ const [deviceActiveTab, setDeviceActiveTab] = useState<'os' | 'osv' | 'dv'>('os')+ const [utmActiveTab, setUtmActiveTab] = useState<'so' | 'me' | 'ca' | 'te' | 'co'>('so')const [chartDataPerf, setChartDataPerf] = useState<any>({})const [isPanelsDataEmptyPerf, setIsPanelsDataEmptyPerf] = useState(false)@@ -3358,7 +3354,7 @@ const ViewProject = () => {const panelIcon = panelIconMapping[type]if (type === 'cc') {- const ccPanelName = tnMapping[countryActiveTab]+ const ccPanelName = tnMapping[locationActiveTab]const rowMapper = (entry: CountryEntry) => {const { name: entryName, cc } = entry@@ -3372,19 +3368,19 @@ const ViewProject = () => {return (<Panel- key={countryActiveTab}+ key={locationActiveTab}icon={panelIcon}- id={countryActiveTab}+ id={locationActiveTab}getFilterLink={getFilterLink}name={<CountryDropdown// @ts-expect-error - onSelect not typed- onSelect={setCountryActiveTab}+ onSelect={setLocationActiveTab}title={ccPanelName}data={activeError?.params}/>}- data={activeError?.params[countryActiveTab]}+ data={activeError?.params[locationActiveTab]}rowMapper={rowMapper}/>)@@ -3440,12 +3436,12 @@ const ViewProject = () => {}if (type === 'os') {- const osPanelName = tnMapping[osActiveTab]+ const osPanelName = tnMapping[deviceActiveTab]const rowMapper = (entry: any) => {const { name: entryName, os } = entry- const logoKey = osActiveTab === 'os' ? entryName : os+ const logoKey = deviceActiveTab === 'os' ? entryName : os// @ts-expect-errorconst logoPathLight = OS_LOGO_MAP[logoKey]@@ -3478,18 +3474,18 @@ const ViewProject = () => {return (<Panel- key={osActiveTab}+ key={deviceActiveTab}icon={panelIcon}- id={osActiveTab}+ id={deviceActiveTab}getFilterLink={getFilterLink}name={<OSDropdown- onSelect={setOsActiveTab}+ onSelect={setDeviceActiveTab}title={osPanelName}data={activeError?.params}/>}- data={activeError?.params[osActiveTab]}+ data={activeError?.params[deviceActiveTab]}rowMapper={rowMapper}/>)@@ -3662,53 +3658,80 @@ const ViewProject = () => {<div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2'>{!_isEmpty(panelsData.types)? _map(TRAFFIC_PANELS_ORDER, (type: keyof typeof tnMapping) => {- const panelName = tnMapping[type]- // @ts-expect-error- const panelIcon = panelIconMapping[type]const customTabs = _filter(customPanelTabs, (tab) => tab.panelID === type)- if (type === 'cc') {- const ccPanelName = tnMapping[countryActiveTab]-- const rowMapper = (entry: CountryEntry) => {- const { name: entryName, cc } = entry-- if (cc) {- return <CCRow cc={cc} name={entryName} language={language} />+ if (type === 'location') {+ const locationTabs = [+ { id: 'cc', label: t('project.mapping.cc'), hasData: !!panelsData.data.cc },+ { id: 'rg', label: t('project.mapping.rg'), hasData: !!panelsData.data.rg },+ { id: 'ct', label: t('project.mapping.ct'), hasData: !!panelsData.data.ct },+ { id: 'lc', label: t('project.mapping.lc'), hasData: !!panelsData.data.lc },+ { id: 'map', label: 'Map', hasData: !!panelsData.data.cc },+ ]++ const getLocationRowMapper = (activeTab: string) => {+ if (activeTab === 'cc' || activeTab === 'rg' || activeTab === 'ct') {+ // eslint-disable-next-line+ return (entry: CountryEntry) => {+ const { name: entryName, cc } = entry+ if (cc) {+ return <CCRow cc={cc} name={entryName} language={language} />+ }+ return <CCRow cc={entryName} language={language} />+ }}-- return <CCRow cc={entryName} language={language} />+ if (activeTab === 'lc') {+ return ({ name: entryName }: { name: string }) =>+ getLocaleDisplayName(entryName, language)+ }+ return undefined}return (<Panel- key={countryActiveTab}- icon={panelIcon}- id={countryActiveTab}+ key={locationActiveTab}+ icon={panelIconMapping.cc}+ id={locationActiveTab}getFilterLink={getFilterLink}- name={- <CountryDropdown- // @ts-expect-error - onSelect not typed- onSelect={setCountryActiveTab}- title={ccPanelName}- data={panelsData.data}- />- }- data={panelsData.data[countryActiveTab]}+ name={t('project.location')}+ tabs={locationTabs}+ onTabChange={(tab) => setLocationActiveTab(tab as 'cc' | 'rg' | 'ct' | 'lc' | 'map')}+ activeTabId={locationActiveTab}+ data={panelsData.data[locationActiveTab]}customTabs={customTabs}- rowMapper={rowMapper}+ rowMapper={getLocationRowMapper(locationActiveTab)}+ customRenderer={+ locationActiveTab === 'map'+ ? () => {+ const countryData = panelsData.data?.cc || []+ const total = countryData.reduce((acc, curr) => acc + curr.count, 0)++ return (+ <InteractiveMap+ data={countryData}+ total={total}+ onClickCountry={(key) => {+ const link = getFilterLink(id, key)+ navigate(link)+ }}+ />+ )+ }+ : undefined+ }/>)}- if (type === 'br') {- const brPanelName = tnMapping[browserActiveTab]+ if (type === 'browser') {+ const browserTabs = [+ { id: 'br', label: t('project.mapping.br'), hasData: !!panelsData.data.br },+ { id: 'brv', label: t('project.mapping.brv'), hasData: !!panelsData.data.brv },+ ]const rowMapper = (entry: any) => {const { name: entryName, br } = entry-const logoKey = browserActiveTab === 'br' ? entryName : br-// @ts-expect-errorconst logoUrl = BROWSER_LOGO_MAP[logoKey]@@ -3734,87 +3757,65 @@ const ViewProject = () => {return (<Panelkey={browserActiveTab}- icon={panelIcon}+ icon={panelIconMapping.br}id={browserActiveTab}getFilterLink={getFilterLink}- name={- <BrowserDropdown- onSelect={setBrowserActiveTab}- title={brPanelName}- data={panelsData.data}- />- }+ name={t('project.browser')}+ tabs={browserTabs}+ onTabChange={(tab) => setBrowserActiveTab(tab as 'br' | 'brv')}+ activeTabId={browserActiveTab}data={panelsData.data[browserActiveTab]}+ customTabs={customTabs}rowMapper={rowMapper}/>)}- if (type === 'os') {- const osPanelName = tnMapping[osActiveTab]-- const rowMapper = (entry: any) => {- const { name: entryName, os } = entry-- const logoKey = osActiveTab === 'os' ? entryName : os-- // @ts-expect-error- const logoPathLight = OS_LOGO_MAP[logoKey]- // @ts-expect-error- const logoPathDark = OS_LOGO_MAP_DARK[logoKey]-- let logoPath = theme === 'dark' ? logoPathDark : logoPathLight- logoPath ||= logoPathLight-- if (!logoPath) {- return (- <>- <GlobeAltIcon className='h-5 w-5' />- - {entryName}- </>- )- }-- const logoUrl = `/${logoPath}`-- return (- <>- <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' />- - {entryName}- </>- )- }+ if (type === 'device') {+ const deviceTabs = [+ { id: 'os', label: t('project.mapping.os'), hasData: !!panelsData.data.os },+ { id: 'osv', label: t('project.mapping.osv'), hasData: !!panelsData.data.osv },+ { id: 'dv', label: t('project.mapping.dv'), hasData: !!panelsData.data.dv },+ ]++ const getDeviceRowMapper = (activeTab: string) => {+ if (activeTab === 'os' || activeTab === 'osv') {+ // eslint-disable-next-line+ return (entry: any) => {+ const { name: entryName, os } = entry+ const logoKey = activeTab === 'os' ? entryName : os+ // @ts-expect-error+ const logoPathLight = OS_LOGO_MAP[logoKey]+ // @ts-expect-error+ const logoPathDark = OS_LOGO_MAP_DARK[logoKey]++ let logoPath = theme === 'dark' ? logoPathDark : logoPathLight+ logoPath ||= logoPathLight++ if (!logoPath) {+ return (+ <>+ <GlobeAltIcon className='h-5 w-5' />+ + {entryName}+ </>+ )+ }- return (- <Panel- key={osActiveTab}- icon={panelIcon}- id={osActiveTab}- getFilterLink={getFilterLink}- name={- <OSDropdown onSelect={setOsActiveTab} title={osPanelName} data={panelsData.data} />+ const logoUrl = `/${logoPath}`+ return (+ <>+ <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' />+ + {entryName}+ </>+ )}- data={panelsData.data[osActiveTab]}- rowMapper={rowMapper}- />- )- }-- if (type === 'dv') {- return (- <Panel- key={type}- icon={panelIcon}- id={type}- getFilterLink={getFilterLink}- name={panelName}- data={panelsData.data[type]}- customTabs={customTabs}- rowMapper={(entry: { name: keyof typeof deviceIconMapping }) => {+ }+ if (activeTab === 'dv') {+ // eslint-disable-next-line+ return (entry: { name: keyof typeof deviceIconMapping }) => {const { name: entryName } = entry-const icon = deviceIconMapping[entryName]if (!icon) {@@ -3828,59 +3829,46 @@ const ViewProject = () => {{entryName}</>)- }}- capitalize- />- )- }+ }+ }+ return undefined+ }- if (type === 'ref') {return (<Panel- key={type}- icon={panelIcon}- id={type}+ key={deviceActiveTab}+ icon={panelIconMapping.os}+ id={deviceActiveTab}getFilterLink={getFilterLink}- name={panelName}- data={panelsData.data[type]}+ name={t('project.device')}+ tabs={deviceTabs}+ onTabChange={(tab) => setDeviceActiveTab(tab as 'os' | 'osv' | 'dv')}+ activeTabId={deviceActiveTab}+ data={panelsData.data[deviceActiveTab]}customTabs={customTabs}- rowMapper={({ name: entryName }) => <RefRow rowName={entryName} />}- />- )- }-- if (type === 'so') {- const ccPanelName = tnMapping[utmActiveTab]-- return (- <Panel- key={utmActiveTab}- icon={panelIcon}- id={utmActiveTab}- getFilterLink={getFilterLink}- 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)}+ rowMapper={getDeviceRowMapper(deviceActiveTab)}+ capitalize={deviceActiveTab === 'dv'}/>)}if (type === 'pg') {+ const pageTabs = [+ { id: 'pg', label: t('project.mapping.pg'), hasData: !!panelsData.data.pg },+ {+ id: 'host',+ label: t('project.mapping.host'),+ hasData: !!panelsData.data.host,+ },+ { id: 'userFlow', label: t('project.mapping.userFlow'), hasData: true },+ ]+return (<Panelkey={pageActiveTab}- icon={panelIcon}+ icon={panelIconMapping.pg}id={pageActiveTab}getFilterLink={getFilterLink}- onFragmentChange={setPgActiveFragment}rowMapper={({ name: entryName }) => {if (!entryName) {return _toUpper(@@ -3898,51 +3886,61 @@ const ViewProject = () => {return decodedUri}}- name={- pgActiveFragment === 1 ? (- tnMapping.userFlow- ) : (- <PageDropdown- onSelect={setPageActiveTab}- title={tnMapping[pageActiveTab]}- data={panelsData.data}- />- )- }+ name={t('project.pages')}+ tabs={pageTabs}+ onTabChange={(tab) => setPageActiveTab(tab as 'pg' | 'host' | 'userFlow')}+ activeTabId={pageActiveTab}data={panelsData.data[pageActiveTab]}customTabs={customTabs}+ customRenderer={+ pageActiveTab === 'userFlow'+ ? () => <UserFlow isReversed={false} setReversed={() => {}} />+ : undefined+ }/>)}- if (type === 'lc') {+ if (type === 'ref') {return (<Panelkey={type}- icon={panelIcon}+ icon={panelIconMapping[type]}id={type}getFilterLink={getFilterLink}- name={panelName}+ name={tnMapping[type]}data={panelsData.data[type]}- rowMapper={({ name: entryName }: { name: string }) =>- getLocaleDisplayName(entryName, language)- }customTabs={customTabs}+ rowMapper={({ name: entryName }) => <RefRow rowName={entryName} />}/>)}- return (- <Panel- key={type}- icon={panelIcon}- id={type}- getFilterLink={getFilterLink}- name={panelName}- data={panelsData.data[type]}- customTabs={customTabs}- />- )+ if (type === 'so') {+ return (+ <Panel+ key={utmActiveTab}+ icon={panelIconMapping.so}+ id={utmActiveTab}+ getFilterLink={getFilterLink}+ name={t('project.utm')}+ tabs={[+ { id: 'so', label: t('project.mapping.so'), hasData: !!panelsData.data.so },+ { id: 'me', label: t('project.mapping.me'), hasData: !!panelsData.data.me },+ { id: 'ca', label: t('project.mapping.ca'), hasData: !!panelsData.data.ca },+ { id: 'te', label: t('project.mapping.te'), hasData: !!panelsData.data.te },+ { id: 'co', label: t('project.mapping.co'), hasData: !!panelsData.data.co },+ ]}+ onTabChange={(tab) => setUtmActiveTab(tab as 'so' | 'me' | 'ca' | 'te' | 'co')}+ activeTabId={utmActiveTab}+ data={panelsData.data[utmActiveTab]}+ customTabs={customTabs}+ rowMapper={({ name: entryName }) => decodeURIComponent(entryName)}+ />+ )+ }++ return null}): null}{!_isEmpty(panelsData.data) ? (@@ -3991,7 +3989,7 @@ const ViewProject = () => {const customTabs = _filter(customPanelTabs, (tab) => tab.panelID === type)if (type === 'cc') {- const ccPanelName = tnMapping[countryActiveTab]+ const ccPanelName = tnMapping[locationActiveTab]const rowMapper = (entry: CountryEntry) => {const { name: entryName, cc } = entry@@ -4005,19 +4003,19 @@ const ViewProject = () => {return (<Panel- key={countryActiveTab}+ key={locationActiveTab}icon={panelIcon}- id={countryActiveTab}+ id={locationActiveTab}getFilterLink={getFilterLink}name={<CountryDropdown// @ts-expect-error - onSelect not typed- onSelect={setCountryActiveTab}+ onSelect={setLocationActiveTab}title={ccPanelName}data={panelsDataPerf.data}/>}- data={panelsDataPerf.data[countryActiveTab]}+ data={panelsDataPerf.data[locationActiveTab]}customTabs={customTabs}rowMapper={rowMapper}// @ts-expect-errordiff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex c8f3b5445..f2f8d0c7a 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -952,7 +952,8 @@"me": "UTM Medium","ca": "UTM Campaign","te": "UTM Term",- "co": "UTM Content"+ "co": "UTM Content",+ "userFlow": "User flow"},"metamapping": {"ev": {