📈 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
Merge with main
Blue Mouse418d03f69600
diff --cc app/api/index.tsindex 2d0278cd1,54dec9a89..f0fdccc60--- a/app/api/index.ts+++ b/app/api/index.ts@@@ -19,7 -19,7 +19,8 @@@ import { IAlerts } from 'redux/models/Iimport { ISharedProject } from 'redux/models/ISharedProject'import { ISubscribers } from 'redux/models/ISubscribers'import { IFilter, IProjectViewCustomEvent } from 'pages/Project/View/interfaces/traffic'+import { AIResponse } from 'pages/Project/View/interfaces/ai'+ import { Monitor, MonitorOverall } from 'redux/models/Uptime'const debug = Debug('swetrix:api')diff --cc app/pages/Project/View/ViewProject.tsxindex 18f60b8a8,96932bf59..9d714faf5--- a/app/pages/Project/View/ViewProject.tsx+++ b/app/pages/Project/View/ViewProject.tsx@@@ -214,7 -223,7 +226,8 @@@ importimport { trackCustom } from 'utils/analytics'import AddAViewModal from './components/AddAViewModal'import CustomMetrics from './components/CustomMetrics'+import { AIProcessedResponse, AIResponse } from './interfaces/ai'+ import { useRequiredParams } from 'hooks/useRequiredParams'const SwetrixSDK = require('@swetrix/sdk')const CUSTOM_EV_DROPDOWN_MAX_VISIBLE_LENGTH = 32@@@ -3788,82 -3723,118 +3835,136 @@@ const ViewProject = (return (<ClientOnly>{() => (- <>- {!embedded && <Header ssrTheme={ssrTheme} authenticated={authenticated} />}- <EventsRunningOutBanner />- <div- ref={ref}- className={cx('bg-gray-50 dark:bg-slate-900', {- 'min-h-[100vh]': analyticsLoading && embedded,- })}- >+ <ViewProjectContext.Provider+ value={{+ // States+ projectId: project?.id,+ projectPassword,+ timezone,+ dateRange,+ isLoading,+ timeBucket,+ period,+ activePeriod,+ periodPairs,+ timeFormat,+ size,++ // Functions+ setDateRange,+ updatePeriod,+ updateTimebucket,+ setPeriodPairs,++ // Refs+ refCalendar,+ }}+ >+ <>+ {!embedded && <Header ssrTheme={ssrTheme} authenticated={authenticated} />}+ <EventsRunningOutBanner /><div- className={cx('mx-auto w-full max-w-[1584px] px-2 py-6 sm:px-4 lg:px-8', {- 'min-h-min-footer': !embedded,- 'min-h-[100vh]': embedded,+ ref={ref}+ className={cx('bg-gray-50 dark:bg-slate-900', {+ 'min-h-[100vh]': analyticsLoading && embedded,})}- ref={dashboardRef}>- {isInAIDetailsMode ? (- <>- <button- onClick={() => {- setIsInAIDetailsMode(false)- setAiDetails(null)- setActiveAIDetail(null)- }}- className='mx-auto mb-4 mt-2 flex items-center text-base font-normal text-gray-900 underline decoration-dashed hover:decoration-solid dark:text-gray-100 lg:mx-0 lg:mt-0'- >- <ChevronLeftIcon className='h-4 w-4' />- {t('project.exitForecastingMode')}- </button>- <AITabsSelector />- <span className='mt-6 text-sm'>{t('project.aiDetailsDesc')}</span>- </>- ) : (- <TabsSelector />- )}- {!isInAIDetailsMode &&- activeTab !== PROJECT_TABS.alerts &&- (activeTab !== PROJECT_TABS.sessions || !activePSID) &&- (activeFunnel || activeTab !== PROJECT_TABS.funnels) && (+ <div+ className={cx('mx-auto w-full max-w-[1584px] px-2 py-6 sm:px-4 lg:px-8', {+ 'min-h-min-footer': !embedded,+ 'min-h-[100vh]': embedded,+ })}+ ref={dashboardRef}+ >- {/* Tabs selector */}- <TabsSelector />- {activeTab !== PROJECT_TABS.alerts &&++ {isInAIDetailsMode ? (+ <>- <div className='mt-2 flex flex-col items-center justify-between lg:flex-row lg:items-start'>- <div className='flex flex-wrap items-center space-x-5'>- <h2 className='break-words break-all text-xl font-bold text-gray-900 dark:text-gray-50'>- {/* If tab is funnels - then display a funnel name, otherwise a project name */}- {activeTab === PROJECT_TABS.funnels ? activeFunnel?.name : name}- </h2>- {activeTab !== PROJECT_TABS.funnels && (- <LiveVisitorsDropdown- projectId={project.id}- live={liveStats[id]}- projectPassword={projectPassword}- />- )}- </div>- <div className='mx-auto mt-3 flex w-full max-w-[420px] flex-wrap items-center justify-center gap-y-1 space-x-2 sm:mx-0 sm:w-auto sm:max-w-none sm:flex-nowrap sm:justify-between lg:mt-0'>- {activeTab !== PROJECT_TABS.funnels && (- <>- <div>- <button- type='button'- title={t('project.refreshStats')}- onClick={refreshStats}- className={cx(- 'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',- {- 'cursor-not-allowed opacity-50': isLoading || dataLoading,- },- )}- >- <ArrowPathIcon className='h-5 w-5 stroke-2 text-gray-700 dark:text-gray-50' />- </button>- </div>- {!isSelfhosted && !isActiveCompare && (++ <button++ onClick={() => {++ setIsInAIDetailsMode(false)++ setAiDetails(null)++ setActiveAIDetail(null)++ }}++ className='mx-auto mb-4 mt-2 flex items-center text-base font-normal text-gray-900 underline decoration-dashed hover:decoration-solid dark:text-gray-100 lg:mx-0 lg:mt-0'++ >++ <ChevronLeftIcon className='h-4 w-4' />++ {t('project.exitForecastingMode')}++ </button>++ <AITabsSelector />++ <span className='mt-6 text-sm'>{t('project.aiDetailsDesc')}</span>++ </>++ ) : (++ <TabsSelector />++ )}++ {!isInAIDetailsMode &&++ activeTab !== PROJECT_TABS.alerts &&+ activeTab !== PROJECT_TABS.uptime &&+ (activeTab !== PROJECT_TABS.sessions || !activePSID) &&+ (activeFunnel || activeTab !== PROJECT_TABS.funnels) && (+ <>+ <div className='mt-2 flex flex-col items-center justify-between lg:flex-row lg:items-start'>+ <div className='flex flex-wrap items-center space-x-5'>+ <h2 className='break-words break-all text-xl font-bold text-gray-900 dark:text-gray-50'>+ {/* If tab is funnels - then display a funnel name, otherwise a project name */}+ {activeTab === PROJECT_TABS.funnels ? activeFunnel?.name : name}+ </h2>+ {activeTab !== PROJECT_TABS.funnels && (+ <LiveVisitorsDropdown+ projectId={project.id}+ live={liveStats[id]}+ projectPassword={projectPassword}+ />+ )}+ </div>+ <div className='mx-auto mt-3 flex w-full max-w-[420px] flex-wrap items-center justify-center gap-y-1 space-x-2 sm:mx-0 sm:w-auto sm:max-w-none sm:flex-nowrap sm:justify-between lg:mt-0'>+ {activeTab !== PROJECT_TABS.funnels && (+ <>+ <div>+ <button+ type='button'+ title={t('project.refreshStats')}+ onClick={refreshStats}+ className={cx(+ 'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',+ {+ 'cursor-not-allowed opacity-50': isLoading || dataLoading,+ },+ )}+ >+ <ArrowPathIcon className='h-5 w-5 stroke-2 text-gray-700 dark:text-gray-50' />+ </button>+ </div>+ {!isSelfhosted && !isActiveCompare && (+ <div+ className={cx({+ hidden: activeTab !== PROJECT_TABS.traffic || _isEmpty(chartData),+ })}+ >+ <button+ type='button'+ title={t('modals.forecast.title')}+ onClick={onForecastOpen}+ disabled={!_isEmpty(filters)}+ className={cx(+ 'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',+ {+ 'cursor-not-allowed opacity-50': isLoading || dataLoading || !_isEmpty(filters),+ '!border !border-gray-300 !bg-gray-200 dark:!border-gray-500 dark:!bg-gray-600':+ !_isEmpty(forecasedChartData),+ },+ )}+ >+ <Robot+ theme={_theme}+ containerClassName='w-5 h-5'+ className='stroke-2 text-gray-700 dark:text-gray-50'+ />+ </button>+ </div>+ )}<div- className={cx({- hidden: activeTab !== PROJECT_TABS.traffic || _isEmpty(chartData),+ className={cx('border-gray-200 dark:border-gray-600', {+ 'lg:border-r': activeTab === PROJECT_TABS.funnels,+ hidden: activeTab === PROJECT_TABS.errors && activeError,})}><button@@@ -4778,157 -4736,144 +4866,150 @@@onFilter={filterHandler}name={panelName}data={activeError.params[type]}- rowMapper={({ name: entryName }: { name: string }) =>- getLocaleDisplayName(entryName, language)- }/>)- }-- return (- <Panel- projectPassword={projectPassword}- key={type}- icon={panelIcon}- id={type}- activeTab={activeTab}- onFilter={filterHandler}- name={panelName}- data={activeError.params[type]}- />- )- })}- </div>- {_isEmpty(activeError) && errorLoading && <Loader />}- {!errorLoading && _isEmpty(activeError) && <NoErrorDetails />}- </>- )}- {activeTab === PROJECT_TABS.alerts && !isSharedProject && project?.isOwner && authenticated && (- <ProjectAlertsView projectId={id} />- )}- {analyticsLoading && (activeTab === PROJECT_TABS.traffic || activeTab === PROJECT_TABS.performance) && (- <Loader />- )}- {isPanelsDataEmpty && activeTab === PROJECT_TABS.traffic && (- <NoEvents filters={filters} resetFilters={resetFilters} />- )}- {isPanelsDataEmptyPerf && activeTab === PROJECT_TABS.performance && (- <NoEvents filters={filtersPerf} resetFilters={resetFilters} />- )}- {activeTab === PROJECT_TABS.traffic && (- <div className={cx('pt-2', { hidden: isPanelsDataEmpty || analyticsLoading })}>- {!isInAIDetailsMode && !_isEmpty(overall) && (- <div className='mb-5 flex flex-wrap justify-center gap-5 lg:justify-start'>- <MetricCards- overall={overall}- overallCompare={overallCompare}- activePeriodCompare={activePeriodCompare}- />- {!_isEmpty(panelsData.meta) &&- _map(panelsData.meta, ({ key, current, previous }) => (- <React.Fragment key={key}>- <MetricCard- label={t('project.metrics.xAvg', { x: key })}- value={current.avg}- change={current.avg - previous.avg}- goodChangeDirection='down'- valueMapper={(value, type) =>- `${type === 'badge' && value > 0 ? '+' : ''}${nLocaleFormatter(value)}`- }- />- <MetricCard- label={t('project.metrics.xTotal', { x: key })}- value={current.sum}- change={current.sum - previous.sum}- goodChangeDirection='down'- valueMapper={(value, type) =>- `${type === 'badge' && value > 0 ? '+' : ''}${nLocaleFormatter(value)}`- }- />- </React.Fragment>- ))}+ })}</div>- )}- <div- className={cx('h-80', {- hidden: checkIfAllMetricsAreDisabled || isInAIDetailsMode,- })}- >- <div className='mt-5 h-80 md:mt-0 [&_svg]:!overflow-visible' id='dataChart' />- </div>- {!isInAIDetailsMode && (- <>- <Filters- filters={filters}- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />- <CustomMetrics- metrics={customMetrics}- onRemoveMetric={(id) => onRemoveCustomMetric(id)}- resetMetrics={resetCustomMetrics}- />- </>- )}- {dataLoading && (- <div className='static mt-4 !bg-transparent' id='loader'>- <div className='loader-head dark:!bg-slate-800'>- <div className='first dark:!bg-slate-600' />- <div className='second dark:!bg-slate-600' />+ {_isEmpty(activeError) && errorLoading && <Loader />}+ {!errorLoading && _isEmpty(activeError) && <NoErrorDetails />}+ </>+ )}+ {activeTab === PROJECT_TABS.alerts && !isSharedProject && project?.isOwner && authenticated && (+ <ProjectAlertsView projectId={id} />+ )}+ {activeTab === PROJECT_TABS.uptime && <Uptime />}+ {analyticsLoading && (activeTab === PROJECT_TABS.traffic || activeTab === PROJECT_TABS.performance) && (+ <Loader />+ )}+ {isPanelsDataEmpty && activeTab === PROJECT_TABS.traffic && (+ <NoEvents filters={filters} resetFilters={resetFilters} />+ )}+ {isPanelsDataEmptyPerf && activeTab === PROJECT_TABS.performance && (+ <NoEvents filters={filtersPerf} resetFilters={resetFilters} />+ )}+ {activeTab === PROJECT_TABS.traffic && (+ <div className={cx('pt-2', { hidden: isPanelsDataEmpty || analyticsLoading })}>- {!_isEmpty(overall) && (++ {!isInAIDetailsMode && !_isEmpty(overall) && (+ <div className='mb-5 flex flex-wrap justify-center gap-5 lg:justify-start'>+ <MetricCards+ overall={overall}+ overallCompare={overallCompare}+ activePeriodCompare={activePeriodCompare}+ />+ {!_isEmpty(panelsData.meta) &&+ _map(panelsData.meta, ({ key, current, previous }) => (+ <React.Fragment key={key}>+ <MetricCard+ label={t('project.metrics.xAvg', { x: key })}+ value={current.avg}+ change={current.avg - previous.avg}+ goodChangeDirection='down'+ valueMapper={(value, type) =>+ `${type === 'badge' && value > 0 ? '+' : ''}${nLocaleFormatter(value)}`+ }+ />+ <MetricCard+ label={t('project.metrics.xTotal', { x: key })}+ value={current.sum}+ change={current.sum - previous.sum}+ goodChangeDirection='down'+ valueMapper={(value, type) =>+ `${type === 'badge' && value > 0 ? '+' : ''}${nLocaleFormatter(value)}`+ }+ />+ </React.Fragment>+ ))}</div>+ )}+ <div+ className={cx('h-80', {- hidden: checkIfAllMetricsAreDisabled,++ hidden: checkIfAllMetricsAreDisabled || isInAIDetailsMode,+ })}+ >+ <div className='mt-5 h-80 md:mt-0 [&_svg]:!overflow-visible' id='dataChart' /></div>- )}- <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>- {!_isEmpty(panelsData.types) &&- _map(TRAFFIC_PANELS_ORDER, (type: keyof typeof tnMapping) => {- const panelName = tnMapping[type]- // @ts-ignore- const panelIcon = panelIconMapping[type]- const customTabs = _filter(customPanelTabs, (tab) => tab.panelID === type)- <Filters- filters={filters}- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />- <CustomMetrics- metrics={customMetrics}- onRemoveMetric={(id) => onRemoveCustomMetric(id)}- resetMetrics={resetCustomMetrics}- />++ {!isInAIDetailsMode && (++ <>++ <Filters++ filters={filters}++ onRemoveFilter={filterHandler}++ onChangeExclusive={onChangeExclusive}++ tnMapping={tnMapping}++ resetFilters={resetActiveTabFilters}++ />++ <CustomMetrics++ metrics={customMetrics}++ onRemoveMetric={(id) => onRemoveCustomMetric(id)}++ resetMetrics={resetCustomMetrics}++ />++ </>++ )}+ {dataLoading && (+ <div className='static mt-4 !bg-transparent' id='loader'>+ <div className='loader-head dark:!bg-slate-800'>+ <div className='first dark:!bg-slate-600' />+ <div className='second dark:!bg-slate-600' />+ </div>+ </div>+ )}+ <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>+ {!_isEmpty(panelsData.types) &&+ _map(TRAFFIC_PANELS_ORDER, (type: keyof typeof tnMapping) => {+ const panelName = tnMapping[type]+ // @ts-ignore+ const panelIcon = panelIconMapping[type]+ const customTabs = _filter(customPanelTabs, (tab) => tab.panelID === type)+++ const dataSource = isInAIDetailsMode ? aiDetails?.[activeAiDetail!] || {} : panelsData.data+- const dataSource = isInAIDetailsMode ? aiDetails?.[activeAiDetail!] || {} : panelsData.data+ if (type === 'cc') {+ const ccPanelName = tnMapping[countryActiveTab]- if (type === 'cc') {- const ccPanelName = tnMapping[countryActiveTab]+ const rowMapper = (entry: ICountryEntry) => {+ const { name: entryName, cc } = entry- const rowMapper = (entry: ICountryEntry) => {- const { name: entryName, cc } = entry+ if (cc) {+ return <CCRow cc={cc} name={entryName} language={language} />+ }- if (cc) {- return <CCRow cc={cc} name={entryName} language={language} />+ return <CCRow cc={entryName} language={language} />}- return <CCRow cc={entryName} language={language} />+ return (+ <Panel+ projectPassword={projectPassword}+ key={countryActiveTab}+ icon={panelIcon}+ id={countryActiveTab}+ onFilter={filterHandler}+ activeTab={activeTab}+ name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}- data={panelsData.data[countryActiveTab]}++ data={dataSource[countryActiveTab]}+ customTabs={customTabs}+ rowMapper={rowMapper}+ />+ )}- return (- <Panel- projectPassword={projectPassword}- key={countryActiveTab}- icon={panelIcon}- id={countryActiveTab}- onFilter={filterHandler}- activeTab={activeTab}- name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}- data={dataSource[countryActiveTab]}- customTabs={customTabs}- rowMapper={rowMapper}- />- )- }+ if (type === 'br') {+ const rowMapper = (entry: any) => {+ const { name: entryName } = entry+ // @ts-ignore+ const logoUrl = BROWSER_LOGO_MAP[entryName]- if (type === 'br') {- const rowMapper = (entry: any) => {- const { name: entryName } = entry- // @ts-ignore- const logoUrl = BROWSER_LOGO_MAP[entryName]+ if (!logoUrl) {+ return (+ <>+ <GlobeAltIcon className='h-5 w-5' />+ + {entryName}+ </>+ )+ }- if (!logoUrl) {return (<>- <GlobeAltIcon className='h-5 w-5' />+ <img src={logoUrl} className='h-5 w-5' alt='' /> {entryName}</>@@@ -4936,11 -4881,18 +5017,18 @@@}return (- <>- <img src={logoUrl} className='h-5 w-5' alt='' />- - {entryName}- </>+ <Panel+ projectPassword={projectPassword}+ key={type}+ icon={panelIcon}+ id={type}+ activeTab={activeTab}+ onFilter={filterHandler}+ name={panelName}- data={panelsData.data[type]}++ data={dataSource[type]}+ customTabs={customTabs}+ rowMapper={rowMapper}+ />)}@@@ -4981,129 -4928,136 +5064,136 @@@)}- const logoUrl = `/${logoPath}`+ return (+ <Panel+ projectPassword={projectPassword}+ key={type}+ icon={panelIcon}+ id={type}+ activeTab={activeTab}+ onFilter={filterHandler}+ name={panelName}- data={panelsData.data[type]}++ data={dataSource[type]}+ customTabs={customTabs}+ rowMapper={rowMapper}+ />+ )+ }+ if (type === 'dv') {return (- <>- <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' />- - {entryName}- </>+ <Panel+ projectPassword={projectPassword}+ key={type}+ activeTab={activeTab}+ icon={panelIcon}+ id={type}+ onFilter={filterHandler}+ name={panelName}- data={panelsData.data[type]}++ data={dataSource[type]}+ customTabs={customTabs}+ capitalize+ />)}- return (- <Panel- projectPassword={projectPassword}- key={type}- icon={panelIcon}- id={type}- activeTab={activeTab}- onFilter={filterHandler}- name={panelName}- data={dataSource[type]}- customTabs={customTabs}- rowMapper={rowMapper}- />- )- }+ if (type === 'ref') {+ return (+ <Panel+ projectPassword={projectPassword}+ key={type}+ icon={panelIcon}+ id={type}+ onFilter={filterHandler}+ name={panelName}+ activeTab={activeTab}- data={panelsData.data[type]}++ data={dataSource[type]}+ customTabs={customTabs}+ // @ts-ignore+ rowMapper={({ name: entryName }) => <RefRow rowName={entryName} />}+ />+ )+ }- if (type === 'dv') {- return (- <Panel- projectPassword={projectPassword}- key={type}- activeTab={activeTab}- icon={panelIcon}- id={type}- onFilter={filterHandler}- name={panelName}- data={dataSource[type]}- customTabs={customTabs}- capitalize- />- )- }+ if (type === 'so') {+ const ccPanelName = tnMapping[utmActiveTab]- if (type === 'ref') {- return (- <Panel- projectPassword={projectPassword}- key={type}- icon={panelIcon}- id={type}- onFilter={filterHandler}- name={panelName}- activeTab={activeTab}- data={dataSource[type]}- customTabs={customTabs}- // @ts-ignore- rowMapper={({ name: entryName }) => <RefRow rowName={entryName} />}- />- )- }+ return (+ <Panel+ projectPassword={projectPassword}+ key={utmActiveTab}+ icon={panelIcon}+ id={utmActiveTab}+ activeTab={activeTab}+ onFilter={filterHandler}+ name={<UTMDropdown onSelect={setUtmActiveTab} title={ccPanelName} />}- data={panelsData.data[utmActiveTab]}++ data={dataSource[utmActiveTab]}+ customTabs={customTabs}+ // @ts-ignore+ rowMapper={({ name: entryName }) => decodeURIComponent(entryName)}+ />+ )+ }- if (type === 'so') {- const ccPanelName = tnMapping[utmActiveTab]+ if (type === 'pg') {+ return (+ <Panel+ projectPassword={projectPassword}+ key={type}+ icon={panelIcon}+ id={type}+ onFilter={filterHandler}+ onFragmentChange={setPgActiveFragment}+ // @ts-ignore+ rowMapper={({ name: entryName }) => {+ if (!entryName) {+ return _toUpper(t('project.redactedPage'))+ }- return (- <Panel- projectPassword={projectPassword}- key={utmActiveTab}- icon={panelIcon}- id={utmActiveTab}- activeTab={activeTab}- onFilter={filterHandler}- name={<UTMDropdown onSelect={setUtmActiveTab} title={ccPanelName} />}- data={dataSource[utmActiveTab]}- customTabs={customTabs}- // @ts-ignore- rowMapper={({ name: entryName }) => decodeURIComponent(entryName)}- />- )- }+ let decodedUri = entryName as string- if (type === 'pg') {- return (- <Panel- projectPassword={projectPassword}- key={type}- icon={panelIcon}- id={type}- onFilter={filterHandler}- onFragmentChange={setPgActiveFragment}- // @ts-ignore- rowMapper={({ name: entryName }) => {- if (!entryName) {- return _toUpper(t('project.redactedPage'))- }+ try {+ decodedUri = decodeURIComponent(entryName)+ } catch (_) {+ // do nothing+ }- let decodedUri = entryName as string+ return decodedUri+ }}+ name={pgPanelNameMapping[pgActiveFragment]}- data={panelsData.data[type]}++ data={dataSource[type]}+ customTabs={customTabs}+ period={period}+ activeTab={activeTab}+ pid={id}+ timeBucket={timeBucket}+ filters={filters}+ from={dateRange ? getFormatDate(dateRange[0]) : null}+ to={dateRange ? getFormatDate(dateRange[1]) : null}+ timezone={timezone}+ />+ )+ }- try {- decodedUri = decodeURIComponent(entryName)- } catch (_) {- // do nothing+ if (type === 'lc') {+ return (+ <Panel+ projectPassword={projectPassword}+ key={type}+ icon={panelIcon}+ id={type}+ activeTab={activeTab}+ onFilter={filterHandler}+ name={panelName}- data={panelsData.data[type]}++ data={dataSource[type]}+ rowMapper={({ name: entryName }: { name: string }) =>+ getLocaleDisplayName(entryName, language)}+ customTabs={customTabs}+ />+ )+ }- return decodedUri- }}- name={pgPanelNameMapping[pgActiveFragment]}- data={dataSource[type]}- customTabs={customTabs}- period={period}- activeTab={activeTab}- pid={id}- timeBucket={timeBucket}- filters={filters}- from={dateRange ? getFormatDate(dateRange[0]) : null}- to={dateRange ? getFormatDate(dateRange[1]) : null}- timezone={timezone}- />- )- }-- if (type === 'lc') {return (<PanelprojectPassword={projectPassword}@@@ -5113,166 -5067,157 +5203,157 @@@activeTab={activeTab}onFilter={filterHandler}name={panelName}- data={panelsData.data[type]}+ data={dataSource[type]}- rowMapper={({ name: entryName }: { name: string }) =>- getLocaleDisplayName(entryName, language)- }customTabs={customTabs}/>)- }-- return (- <Panel- projectPassword={projectPassword}- key={type}- icon={panelIcon}- id={type}- activeTab={activeTab}- onFilter={filterHandler}- name={panelName}- data={dataSource[type]}- customTabs={customTabs}- />- )- })}- {!isInAIDetailsMode && !_isEmpty(panelsData.data) && (- <Metadata- customs={panelsData.customs}- properties={panelsData.properties}- filters={filters}- onFilter={filterHandler}- chartData={chartData}- customTabs={_filter(customPanelTabs, (tab) => tab.panelID === 'ce')}- getCustomEventMetadata={getCustomEventMetadata}- getPropertyMetadata={_getPropertyMetadata}+ })}- {!_isEmpty(panelsData.data) && (++ {!isInAIDetailsMode && !_isEmpty(panelsData.data) && (+ <Metadata+ customs={panelsData.customs}+ properties={panelsData.properties}+ filters={filters}+ onFilter={filterHandler}+ chartData={chartData}+ customTabs={_filter(customPanelTabs, (tab) => tab.panelID === 'ce')}+ getCustomEventMetadata={getCustomEventMetadata}+ getPropertyMetadata={_getPropertyMetadata}+ />+ )}+ </div>+ </div>+ )}+ {activeTab === PROJECT_TABS.performance && (+ <div className={cx('pt-8 md:pt-4', { hidden: isPanelsDataEmptyPerf || analyticsLoading })}>+ {!_isEmpty(overallPerformance) && (+ <PerformanceMetricCards+ overall={overallPerformance}+ overallCompare={overallPerformanceCompare}+ activePeriodCompare={activePeriodCompare}/>)}- </div>- </div>- )}- {activeTab === PROJECT_TABS.performance && (- <div className={cx('pt-8 md:pt-4', { hidden: isPanelsDataEmptyPerf || analyticsLoading })}>- {!_isEmpty(overallPerformance) && (- <PerformanceMetricCards- overall={overallPerformance}- overallCompare={overallPerformanceCompare}- activePeriodCompare={activePeriodCompare}+ <div+ className={cx('h-80', {+ hidden: checkIfAllMetricsAreDisabled,+ })}+ >+ <div className='h-80 [&_svg]:!overflow-visible' id='dataChart' />+ </div>+ <Filters+ filters={filtersPerf}+ onRemoveFilter={filterHandler}+ onChangeExclusive={onChangeExclusive}+ tnMapping={tnMapping}+ resetFilters={resetActiveTabFilters}/>- )}- <div- className={cx('h-80', {- hidden: checkIfAllMetricsAreDisabled,- })}- >- <div className='h-80 [&_svg]:!overflow-visible' id='dataChart' />- </div>- <Filters- filters={filtersPerf}- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />- {dataLoading && (- <div className='static mt-4 !bg-transparent' id='loader'>- <div className='loader-head dark:!bg-slate-800'>- <div className='first dark:!bg-slate-600' />- <div className='second dark:!bg-slate-600' />+ {dataLoading && (+ <div className='static mt-4 !bg-transparent' id='loader'>+ <div className='loader-head dark:!bg-slate-800'>+ <div className='first dark:!bg-slate-600' />+ <div className='second dark:!bg-slate-600' />+ </div></div>- </div>- )}- <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>- {!_isEmpty(panelsDataPerf.types) &&- _map(PERFORMANCE_PANELS_ORDER, (type: keyof typeof tnMapping) => {- const panelName = tnMapping[type]- // @ts-ignore- const panelIcon = panelIconMapping[type]- const customTabs = _filter(customPanelTabs, (tab) => tab.panelID === type)-- if (type === 'cc') {- const ccPanelName = tnMapping[countryActiveTab]-- const rowMapper = (entry: ICountryEntry) => {- const { name: entryName, cc } = entry-- if (cc) {- return <CCRow cc={cc} name={entryName} language={language} />+ )}+ <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>+ {!_isEmpty(panelsDataPerf.types) &&+ _map(PERFORMANCE_PANELS_ORDER, (type: keyof typeof tnMapping) => {+ const panelName = tnMapping[type]+ // @ts-ignore+ const panelIcon = panelIconMapping[type]+ const customTabs = _filter(customPanelTabs, (tab) => tab.panelID === type)++ if (type === 'cc') {+ const ccPanelName = tnMapping[countryActiveTab]++ const rowMapper = (entry: ICountryEntry) => {+ 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} />+ return (+ <Panel+ projectPassword={projectPassword}+ key={countryActiveTab}+ icon={panelIcon}+ id={countryActiveTab}+ onFilter={filterHandler}+ name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}+ activeTab={activeTab}+ data={panelsDataPerf.data[countryActiveTab]}+ customTabs={customTabs}+ rowMapper={rowMapper}+ // @ts-ignore+ valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}+ />+ )}- return (- <Panel- projectPassword={projectPassword}- key={countryActiveTab}- icon={panelIcon}- id={countryActiveTab}- onFilter={filterHandler}- name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}- activeTab={activeTab}- data={panelsDataPerf.data[countryActiveTab]}- customTabs={customTabs}- rowMapper={rowMapper}- // @ts-ignore- valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}- />- )- }+ if (type === 'dv') {+ return (+ <Panel+ projectPassword={projectPassword}+ key={type}+ icon={panelIcon}+ id={type}+ onFilter={filterHandler}+ name={panelName}+ activeTab={activeTab}+ data={panelsDataPerf.data[type]}+ customTabs={customTabs}+ // @ts-ignore+ valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}+ capitalize+ />+ )+ }- if (type === 'dv') {- return (- <Panel- projectPassword={projectPassword}- key={type}- icon={panelIcon}- id={type}- onFilter={filterHandler}- name={panelName}- activeTab={activeTab}- data={panelsDataPerf.data[type]}- customTabs={customTabs}- // @ts-ignore- valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}- capitalize- />- )- }+ if (type === 'pg') {+ return (+ <Panel+ projectPassword={projectPassword}+ key={type}+ icon={panelIcon}+ id={type}+ activeTab={activeTab}+ onFilter={filterHandler}+ name={panelName}+ data={panelsDataPerf.data[type]}+ customTabs={customTabs}+ // @ts-ignore+ valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}+ // @ts-ignore+ rowMapper={({ name: entryName }) => {+ // todo: add uppercase+ return entryName || t('project.redactedPage')+ }}+ />+ )+ }- if (type === 'pg') {- return (- <Panel- projectPassword={projectPassword}- key={type}- icon={panelIcon}- id={type}- activeTab={activeTab}- onFilter={filterHandler}- name={panelName}- data={panelsDataPerf.data[type]}- customTabs={customTabs}+ if (type === 'br') {+ const rowMapper = (entry: any) => {+ const { name: entryName } = entry// @ts-ignore- valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}- // @ts-ignore- rowMapper={({ name: entryName }) => {- // todo: add uppercase- return entryName || t('project.redactedPage')- }}- />- )- }+ const logoUrl = BROWSER_LOGO_MAP[entryName]- if (type === 'br') {- const rowMapper = (entry: any) => {- const { name: entryName } = entry- // @ts-ignore- const logoUrl = BROWSER_LOGO_MAP[entryName]+ if (!logoUrl) {+ return (+ <>+ <GlobeAltIcon className='h-5 w-5' />+ + {entryName}+ </>+ )+ }- if (!logoUrl) {return (<>- <GlobeAltIcon className='h-5 w-5' />+ <img src={logoUrl} className='h-5 w-5' alt='' /> {entryName}</>