📈 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
move errors logic from viewproject to a dedicated component
Blue Mouse9aeafeecf442
diff --git a/web/app/pages/Project/Errors/View/ErrorsView.tsx b/web/app/pages/Project/Errors/View/ErrorsView.tsxindex 6a913ce58..eeb108a4a 100644--- a/web/app/pages/Project/Errors/View/ErrorsView.tsx+++ b/web/app/pages/Project/Errors/View/ErrorsView.tsx@@ -3,6 +3,7 @@ import { area, bar } from 'billboard.js'import cx from 'clsx'import * as d3 from 'd3'import dayjs from 'dayjs'+import _debounce from 'lodash/debounce'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import _size from 'lodash/size'@@ -12,16 +13,17 @@ import {UsersIcon,MonitorIcon,ChevronRightIcon,+ ChevronLeftIcon,AlertTriangleIcon,UserIcon,} from 'lucide-react'-import { useState, useEffect, useMemo, useRef, useCallback } from 'react'+import { useState, useEffect, useMemo, useRef, useCallback, lazy, Suspense } from 'react'import { useTranslation } from 'react-i18next'-import { Link, useLocation } from 'react-router'+import { Link, useLocation, useSearchParams, useNavigate, type LinkProps } from 'react-router'import { ClientOnly } from 'remix-utils/client-only'import { toast } from 'sonner'-import { getErrors, getErrorOverview, type ErrorOverviewResponse } from '~/api'+import { getErrors, getErrorOverview, getError, updateErrorStatus, type ErrorOverviewResponse } from '~/api'import {TimeFormat,tbsFormatMapper,@@ -29,22 +31,40 @@ import {tbsFormatMapperTooltip,tbsFormatMapperTooltip24h,chartTypes,+ ERROR_PANELS_ORDER,} from '~/lib/constants'-import { SwetrixError } from '~/lib/models/Project'+import { CountryEntry, Entry } from '~/lib/models/Entry'+import { SwetrixError, SwetrixErrorDetails } from '~/lib/models/Project'import { useViewProjectContext } from '~/pages/Project/View/ViewProject'-import { getFormatDate, typeNameMapping } from '~/pages/Project/View/ViewProject.helpers'+import {+ getFormatDate,+ typeNameMapping,+ panelIconMapping,+ getDeviceRowMapper,+} from '~/pages/Project/View/ViewProject.helpers'import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'+import { useTheme } from '~/providers/ThemeProvider'import { Badge } from '~/ui/Badge'import BillboardChart from '~/ui/BillboardChart'+import Checkbox from '~/ui/Checkbox'+import Dropdown from '~/ui/Dropdown'import Loader from '~/ui/Loader'import LoadingBar from '~/ui/LoadingBar'import { Text } from '~/ui/Text'import Tooltip from '~/ui/Tooltip'import { getRelativeDateIfPossible } from '~/utils/date'-import { nFormatter } from '~/utils/generic'+import { getLocaleDisplayName, nFormatter } from '~/utils/generic'+import CCRow from '../../View/components/CCRow'+import { ErrorChart } from '../../View/components/ErrorChart'+import { ErrorDetails } from '../../View/components/ErrorDetails'import Filters from '../../View/components/Filters'+import NoErrorDetails from '../../View/components/NoErrorDetails'import NoEvents from '../../View/components/NoEvents'+import { Panel, MetadataPanel } from '../../View/Panels'+import { ERROR_FILTERS_MAPPING } from '../../View/utils/filters'++const InteractiveMap = lazy(() => import('../../View/components/InteractiveMap'))// Calculate optimal Y axis ticksconst calculateOptimalTicks = (data: number[], targetCount: number = 6): number[] => {@@ -238,7 +258,6 @@ const StatCard = ({ icon, value, label }: StatCardProps) => (</div>)-// Most Frequent Error Card// Error Item Componentinterface ErrorItemProps {error: SwetrixError@@ -370,15 +389,29 @@ const ErrorItem = ({ error }: ErrorItemProps) => {)}+const ERRORS_TAKE = 30+const ErrorsView = () => {- const { id } = useCurrentProject()+ const { id, allowedToManage } = useCurrentProject()const projectPassword = useProjectPassword(id)- const { timeBucket, timeFormat, period, dateRange, timezone, filters } = useViewProjectContext()- const { t } = useTranslation('common')+ const { timeBucket, timeFormat, period, dateRange, timezone, filters, size } = useViewProjectContext()+ const {+ t,+ i18n: { language },+ } = useTranslation('common')+ const { theme } = useTheme()+ const [searchParams] = useSearchParams()+ const navigate = useNavigate()const from = dateRange ? getFormatDate(dateRange[0]) : ''const to = dateRange ? getFormatDate(dateRange[1]) : ''const tnMapping = typeNameMapping(t)+ const rotateXAxis = useMemo(() => size.width > 0 && size.width < 500, [size])++ // Error filters state+ const [errorOptions, setErrorOptions] = useState<Record<string, boolean>>({+ [ERROR_FILTERS_MAPPING.showResolved]: false,+ })// Overview stateconst [overviewLoading, setOverviewLoading] = useState<boolean | null>(null)@@ -392,7 +425,30 @@ const ErrorsView = () => {const [canLoadMoreErrors, setCanLoadMoreErrors] = useState(false)const errorsRequestIdRef = useRef(0)- const ERRORS_TAKE = 30+ // Error detail state+ const activeEID = useMemo(() => searchParams.get('eid'), [searchParams])+ const prevActiveEIDRef = useRef<string | null>(activeEID)+ const [activeError, setActiveError] = useState<{ details: SwetrixErrorDetails; [key: string]: any } | null>(null)+ const [errorLoading, setErrorLoading] = useState(false)+ const [errorStatusUpdating, setErrorStatusUpdating] = useState(false)++ // Error detail panel tabs+ const [errorsActiveTabs, setErrorsActiveTabs] = useState<{+ location: 'cc' | 'rg' | 'ct' | 'lc' | 'map'+ page: 'pg' | 'host'+ device: 'br' | 'os' | 'dv'+ }>({+ location: 'cc',+ page: 'pg',+ device: 'br',+ })++ // Pure search params (without eid) for back navigation+ const pureSearchParams = useMemo(() => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.delete('eid')+ return newSearchParams.toString()+ }, [searchParams])// Cleanup on unmountuseEffect(() => {@@ -412,7 +468,7 @@ const ErrorsView = () => {timeBucket,period,filters,- { showResolved: false },+ errorOptions,from,to,timezone || '',@@ -431,7 +487,7 @@ const ErrorsView = () => {setOverviewLoading(false)}}- }, [id, timeBucket, period, filters, from, to, timezone, projectPassword, overviewLoading, t])+ }, [id, timeBucket, period, filters, errorOptions, from, to, timezone, projectPassword, overviewLoading, t])const loadErrors = useCallback(async (forcedSkip?: number, override?: boolean) => {@@ -446,9 +502,9 @@ const ErrorsView = () => {const { errors: newErrors } = await getErrors(id,timeBucket,- period,+ period === 'custom' ? '' : period,filters,- { showResolved: false },+ errorOptions,from,to,ERRORS_TAKE,@@ -478,19 +534,142 @@ const ErrorsView = () => {}}},- [id, timeBucket, period, filters, from, to, timezone, projectPassword, errorsLoading, errorsSkip, t],+ [id, timeBucket, period, filters, errorOptions, from, to, timezone, projectPassword, errorsLoading, errorsSkip, t],+ )++ const loadError = useCallback(+ async (eid: string) => {+ setErrorLoading(true)++ try {+ let error+ if (period === 'custom' && dateRange) {+ error = await getError(id, eid, timeBucket, '', filters, from, to, timezone, projectPassword)+ } else {+ error = await getError(id, eid, timeBucket, period, filters, '', '', timezone, projectPassword)+ }++ setActiveError(error)+ } catch (reason: any) {+ if (reason?.status === 400) {+ setErrorLoading(false)+ setActiveError(null)+ return+ }++ const message = _isEmpty(reason.data?.message) ? reason.data : reason.data.message+ console.error('[ErrorsView] Failed to load error:', message)+ toast.error(message)+ }+ setErrorLoading(false)+ },+ [dateRange, id, period, timeBucket, projectPassword, timezone, filters, from, to],)- // Load data on mount and when params change+ const updateStatusInErrors = useCallback(+ (status: 'active' | 'resolved') => {+ if (!activeError?.details?.eid) return++ setErrors((prevErrors) => {+ return prevErrors.map((error) => {+ if (error.eid === activeError.details.eid) {+ return { ...error, status }+ }+ return error+ })+ })+ },+ [activeError?.details?.eid],+ )++ const markErrorAsResolved = async () => {+ if (errorStatusUpdating || !activeEID || !activeError?.details?.eid) return++ setErrorStatusUpdating(true)++ try {+ await updateErrorStatus(id, 'resolved', activeEID)+ await loadError(activeEID)+ updateStatusInErrors('resolved')+ } catch (reason) {+ console.error('[markErrorAsResolved]', reason)+ toast.error(t('apiNotifications.updateErrorStatusFailed'))+ setErrorStatusUpdating(false)+ return+ }++ toast.success(t('apiNotifications.errorStatusUpdated'))+ setErrorStatusUpdating(false)+ }++ const markErrorAsActive = async () => {+ if (errorStatusUpdating || !activeEID || !activeError?.details?.eid) return++ setErrorStatusUpdating(true)++ try {+ await updateErrorStatus(id, 'active', activeEID)+ await loadError(activeEID)+ updateStatusInErrors('active')+ } catch (reason) {+ console.error('[markErrorAsActive]', reason)+ toast.error(t('apiNotifications.updateErrorStatusFailed'))+ setErrorStatusUpdating(false)+ return+ }++ toast.success(t('apiNotifications.errorStatusUpdated'))+ setErrorStatusUpdating(false)+ }++ const switchActiveErrorFilter = useMemo(+ () =>+ _debounce((pairID: string) => {+ setErrorOptions((prev) => ({ ...prev, [pairID]: !prev[pairID] }))+ setErrorsSkip(0)+ }, 0),+ [],+ )++ // Error filters dropdown items+ const errorFilters = useMemo(() => {+ return [+ {+ id: ERROR_FILTERS_MAPPING.showResolved,+ label: t('project.showResolved'),+ active: errorOptions[ERROR_FILTERS_MAPPING.showResolved],+ },+ ]+ }, [t, errorOptions])++ // Load data on mount and when params change (only for list view)useEffect(() => {- // Don't load until we have valid context values- if (!id || !timeBucket || !period) return+ if (!id || !timeBucket || !period || activeEID) returnloadOverview()setErrorsSkip(0)loadErrors(0, true)// eslint-disable-next-line react-hooks/exhaustive-deps- }, [id, period, from, to, timeBucket, timezone, filters])+ }, [id, period, from, to, timeBucket, timezone, filters, errorOptions])++ // Handle activeEID changes+ useEffect(() => {+ if (!activeEID) {+ setActiveError(null)+ // Coming back from error detail to list: reset and reload+ if (prevActiveEIDRef.current) {+ setErrorsSkip(0)+ loadErrors(0, true)+ loadOverview()+ }+ prevActiveEIDRef.current = null+ return+ }++ loadError(activeEID)+ prevActiveEIDRef.current = activeEID+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [period, dateRange, timeBucket, activeEID, filters])const chartOptions = useMemo(() => {if (!overview?.chart || !overview.chart.x || overview.chart.x.length === 0) return null@@ -502,7 +681,354 @@ const ErrorsView = () => {const hasErrors = !_isEmpty(errors) || overview?.stats?.totalErrors- // Initial loading state+ // Filter link helper+ const getFilterLink = useCallback(+ (column: string, value: string | null): LinkProps['to'] => {+ const isFilterActive = filters.findIndex((filter) => filter.column === column && filter.filter === value) >= 0+ const newSearchParams = new URLSearchParams(searchParams.toString())++ if (isFilterActive) {+ newSearchParams.delete(column)+ } else {+ if (value === null) {+ newSearchParams.set(column, 'null')+ } else {+ newSearchParams.set(column, value)+ }+ }++ return { search: newSearchParams.toString() }+ },+ [filters, searchParams],+ )++ const getVersionFilterLink = useCallback(+ (parent: string | null, version: string | null, panelType: 'br' | 'os') => {+ const filterParams = new URLSearchParams(searchParams.toString())++ if (panelType === 'br') {+ filterParams.set('br', parent ?? 'null')+ filterParams.set('brv', version ?? 'null')+ } else if (panelType === 'os') {+ filterParams.set('os', parent ?? 'null')+ filterParams.set('osv', version ?? 'null')+ }++ return `?${filterParams.toString()}`+ },+ [searchParams],+ )++ // Version data mapping for browser/OS versions+ const createVersionDataMapping = useMemo(() => {+ const browserDataSource = activeError?.params?.brv+ const osDataSource = activeError?.params?.osv++ const browserVersions: { [key: string]: Entry[] } = {}+ const osVersions: { [key: string]: Entry[] } = {}++ if (browserDataSource) {+ browserDataSource.forEach((entry: any) => {+ const { br, name, count } = entry+ if (!browserVersions[br]) {+ browserVersions[br] = []+ }+ browserVersions[br].push({ name, count })+ })+ }++ if (osDataSource) {+ osDataSource.forEach((entry: any) => {+ const { os, name, count } = entry+ if (!osVersions[os]) {+ osVersions[os] = []+ }+ osVersions[os].push({ name, count })+ })+ }++ return { browserVersions, osVersions }+ }, [activeError?.params?.brv, activeError?.params?.osv])++ // Data names for chart+ const dataNames = useMemo(+ () => ({+ occurrences: t('project.totalErrors'),+ affectedUsers: t('project.affectedUsers'),+ }),+ [t],+ )++ // If viewing error detail+ if (activeEID) {+ return (+ <div>+ {/* Loading bar for refreshes */}+ {errorLoading && activeError ? <LoadingBar /> : null}++ {/* Back link and action buttons */}+ <div className='mx-auto mt-2 mb-3 flex max-w-max items-center justify-between gap-4 lg:mx-0 lg:max-w-none'>+ <Link+ to={{ search: pureSearchParams }}+ className='flex items-center text-sm text-gray-900 underline decoration-dashed hover:decoration-solid dark:text-gray-100'+ >+ <ChevronLeftIcon className='mr-1 size-3' />+ {t('project.backToErrors')}+ </Link>++ {/* Status action buttons */}+ {allowedToManage && activeError && activeError?.details?.status !== 'resolved' ? (+ <button+ type='button'+ disabled={errorStatusUpdating}+ onClick={markErrorAsResolved}+ className={cx(+ 'rounded-md bg-gray-100 px-3 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-200 dark:bg-slate-700 dark:text-gray-50 dark:hover:bg-slate-600',+ {+ 'cursor-not-allowed opacity-50': errorLoading && !errorStatusUpdating,+ 'animate-pulse cursor-not-allowed': errorStatusUpdating,+ },+ )}+ >+ {t('project.resolve')}+ </button>+ ) : null}+ {allowedToManage && activeError && activeError?.details?.status === 'resolved' ? (+ <button+ type='button'+ disabled={errorStatusUpdating}+ onClick={markErrorAsActive}+ className={cx(+ 'rounded-md bg-gray-100 px-3 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-200 dark:bg-slate-700 dark:text-gray-50 dark:hover:bg-slate-600',+ {+ 'cursor-not-allowed opacity-50': errorLoading && !errorStatusUpdating,+ 'animate-pulse cursor-not-allowed': errorStatusUpdating,+ },+ )}+ >+ {t('project.markAsActive')}+ </button>+ ) : null}+ </div>++ {/* Error details */}+ {activeError?.details ? (+ <ErrorDetails+ details={activeError.details}+ period={period}+ from={dateRange ? getFormatDate(dateRange[0]) : undefined}+ to={dateRange ? getFormatDate(dateRange[1]) : undefined}+ timeBucket={timeBucket}+ projectPassword={projectPassword}+ />+ ) : null}++ {/* Error chart */}+ {activeError?.chart ? (+ <div className='mt-4'>+ <ErrorChart+ chart={activeError?.chart}+ timeBucket={activeError?.timeBucket}+ timeFormat={timeFormat}+ rotateXAxis={rotateXAxis}+ chartType={chartTypes.line}+ dataNames={dataNames}+ />+ </div>+ ) : null}++ {/* Filters */}+ <Filters tnMapping={tnMapping} />++ {/* Panels */}+ <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>+ {!_isEmpty(activeError?.params)+ ? _map(ERROR_PANELS_ORDER, (type: keyof typeof tnMapping) => {+ if (type === 'location') {+ const locationTabs = [+ { id: 'cc', label: t('project.mapping.cc') },+ { id: 'rg', label: t('project.mapping.rg') },+ { id: 'ct', label: t('project.mapping.ct') },+ { id: 'lc', label: t('project.mapping.lc') },+ { id: 'map', label: 'Map' },+ ]++ const rowMapper = (entry: CountryEntry) => {+ const { name: entryName, cc } = entry++ if (errorsActiveTabs.location === 'lc') {+ if (entryName === null) {+ return <CCRow cc={null} language={language} />+ }+ const entryNameArray = entryName.split('-')+ const displayName = getLocaleDisplayName(entryName, language)++ return (+ <CCRow cc={entryNameArray[entryNameArray.length - 1]} name={displayName} language={language} />+ )+ }++ if (cc !== undefined) {+ return <CCRow cc={cc} name={entryName || undefined} language={language} />+ }++ return <CCRow cc={entryName} language={language} />+ }++ return (+ <Panel+ key={errorsActiveTabs.location}+ icon={panelIconMapping.cc}+ id={errorsActiveTabs.location}+ getFilterLink={getFilterLink}+ name={t('project.location')}+ tabs={locationTabs}+ onTabChange={(tab) =>+ setErrorsActiveTabs({+ ...errorsActiveTabs,+ location: tab as 'cc' | 'rg' | 'ct' | 'lc' | 'map',+ })+ }+ activeTabId={errorsActiveTabs.location}+ data={activeError?.params?.[errorsActiveTabs.location] || []}+ rowMapper={rowMapper}+ customRenderer={+ errorsActiveTabs.location === 'map'+ ? () => {+ const countryData = activeError?.params?.cc || []+ const regionData = activeError?.params?.rg || []+ // @ts-expect-error+ const total = countryData.reduce((acc, curr) => acc + curr.count, 0)++ return (+ <Suspense+ fallback={+ <div className='flex h-full items-center justify-center'>+ <div className='flex flex-col items-center gap-2'>+ <div className='h-8 w-8 animate-spin rounded-full border-2 border-blue-400 border-t-transparent'></div>+ <span className='text-sm text-neutral-600 dark:text-neutral-300'>+ Loading map...+ </span>+ </div>+ </div>+ }+ >+ <InteractiveMap+ data={countryData}+ regionData={regionData}+ total={total}+ onClick={(type, key) => {+ const link = getFilterLink(type, key)+ navigate(link)+ }}+ />+ </Suspense>+ )+ }+ : undefined+ }+ valuesHeaderName={t('project.occurrences')}+ highlightColour='red'+ />+ )+ }++ if (type === 'devices') {+ const deviceTabs = [+ { id: 'br', label: t('project.mapping.br') },+ { id: 'os', label: t('project.mapping.os') },+ { id: 'dv', label: t('project.mapping.dv') },+ ]++ return (+ <Panel+ key={errorsActiveTabs.device}+ icon={panelIconMapping.os}+ id={errorsActiveTabs.device}+ getFilterLink={getFilterLink}+ name={t('project.devices')}+ tabs={deviceTabs}+ onTabChange={(tab) =>+ setErrorsActiveTabs({ ...errorsActiveTabs, device: tab as 'br' | 'os' | 'dv' })+ }+ activeTabId={errorsActiveTabs.device}+ data={activeError?.params?.[errorsActiveTabs.device] || []}+ rowMapper={getDeviceRowMapper(errorsActiveTabs.device, theme, t)}+ capitalize={errorsActiveTabs.device === 'dv'}+ versionData={+ errorsActiveTabs.device === 'br'+ ? createVersionDataMapping.browserVersions+ : errorsActiveTabs.device === 'os'+ ? createVersionDataMapping.osVersions+ : undefined+ }+ getVersionFilterLink={(parent, version) =>+ getVersionFilterLink(parent, version, errorsActiveTabs.device === 'br' ? 'br' : 'os')+ }+ valuesHeaderName={t('project.occurrences')}+ highlightColour='red'+ />+ )+ }++ if (type === 'pg') {+ const pageTabs = [+ { id: 'pg', label: t('project.mapping.pg') },+ { id: 'host', label: t('project.mapping.host') },+ ]++ return (+ <Panel+ key={errorsActiveTabs.page}+ icon={panelIconMapping.pg}+ id={errorsActiveTabs.page}+ getFilterLink={getFilterLink}+ rowMapper={({ name: entryName }) => {+ if (!entryName) {+ return (+ <span className='italic'>+ {errorsActiveTabs.page === 'pg' ? t('common.notSet') : t('project.unknownHost')}+ </span>+ )+ }++ let decodedUri = entryName as string++ try {+ decodedUri = decodeURIComponent(entryName)+ } catch {+ // do nothing+ }++ return decodedUri+ }}+ name={t('project.pages')}+ tabs={pageTabs}+ onTabChange={(tab) => setErrorsActiveTabs({ ...errorsActiveTabs, page: tab as 'pg' | 'host' })}+ activeTabId={errorsActiveTabs.page}+ data={activeError?.params?.[errorsActiveTabs.page] || []}+ valuesHeaderName={t('project.occurrences')}+ highlightColour='red'+ />+ )+ }++ return null+ })+ : null}+ {activeError?.metadata ? <MetadataPanel metadata={activeError.metadata} /> : null}+ </div>++ {/* Loading state */}+ {_isEmpty(activeError) && errorLoading ? <Loader /> : null}++ {/* No error details */}+ {!errorLoading && _isEmpty(activeError) ? <NoErrorDetails /> : null}+ </div>+ )+ }++ // List view - Initial loading stateif ((overviewLoading === null || overviewLoading) && !overview && _isEmpty(errors)) {return <Loader />}@@ -510,10 +1036,40 @@ const ErrorsView = () => {return (<div>{/* Loading bar for refreshes */}- {overviewLoading && overview ? <LoadingBar /> : null}+ {(overviewLoading || errorsLoading) && (overview || !_isEmpty(errors)) ? <LoadingBar /> : null}- {/* Filters */}- {hasErrors ? <Filters className='mt-0 mb-4' tnMapping={tnMapping} /> : null}+ {/* Controls row - Filters dropdown */}+ {hasErrors ? (+ <div className='mb-4 flex items-center justify-between'>+ <Filters className='mt-0 mb-0' tnMapping={tnMapping} />+ <Dropdown+ items={errorFilters}+ title={t('project.filters')}+ labelExtractor={(pair) => {+ const { label, active, id: pairID } = pair++ return (+ <Checkbox+ classes={{+ label: 'px-4 py-2',+ }}+ label={label}+ checked={active}+ onChange={() => switchActiveErrorFilter(pairID)}+ />+ )+ }}+ buttonClassName='!px-2.5'+ selectItemClassName='p-0'+ keyExtractor={(pair) => pair.id}+ onSelect={({ id: pairID }) => {+ switchActiveErrorFilter(pairID)+ }}+ chevron='mini'+ headless+ />+ </div>+ ) : null}{/* No errors state */}{!hasErrors && errorsLoading === false && overviewLoading === false ? <NoEvents filters={filters} /> : null}diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 6aa71cccd..24825f363 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -2,7 +2,6 @@ import SwetrixSDK from '@swetrix/sdk'import cx from 'clsx'import dayjs from 'dayjs'import { AnimatePresence, motion } from 'framer-motion'-import _debounce from 'lodash/debounce'import _filter from 'lodash/filter'import _find from 'lodash/find'import _findIndex from 'lodash/findIndex'@@ -75,9 +74,6 @@ import {getPerformanceOverallStats,getSessions,getSession,- getErrors,- getError,- updateErrorStatus,getPropertyMetadata,getProjectViews,deleteProjectView,@@ -116,7 +112,6 @@ import {TITLE_SUFFIX,MARKETPLACE_URL,TBPeriodPairsProps,- ERROR_PANELS_ORDER,ERROR_PERIOD_PAIRS,FUNNELS_PERIOD_PAIRS,type Period,@@ -133,8 +128,6 @@ import {AnalyticsFunnel,OverallObject,OverallPerformanceObject,- SwetrixError,- SwetrixErrorDetails,SessionDetails as SessionDetailsModel,Session,Annotation,@@ -180,8 +173,6 @@ import { ChartContextMenu } from './components/ChartContextMenu'import { ChartManagerProvider } from './components/ChartManager'import CustomEventsSubmenu from './components/CustomEventsSubmenu'import CustomMetrics from './components/CustomMetrics'-import { ErrorChart } from './components/ErrorChart'-import { ErrorDetails } from './components/ErrorDetails'import Filters from './components/Filters'const CaptchaView = lazy(() => import('./components/CaptchaView'))import { FunnelChart } from './components/FunnelChart'@@ -191,7 +182,6 @@ const InteractiveMap = lazy(() => import('./components/InteractiveMap'))import LiveVisitorsDropdown from './components/LiveVisitorsDropdown'import LockedDashboard from './components/LockedDashboard'import { MetricCard, MetricCards, PerformanceMetricCards } from './components/MetricCards'-import NoErrorDetails from './components/NoErrorDetails'import NoEvents from './components/NoEvents'import NoSessionDetails from './components/NoSessionDetails'import { Pageflow } from './components/Pageflow'@@ -220,8 +210,8 @@ import {Properties,TrafficLogResponse,} from './interfaces/traffic'-import { Panel, Metadata as MetadataGeneric, MetadataPanel, type CustomTab } from './Panels'-import { FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, ERROR_FILTERS_MAPPING, parseFilters } from './utils/filters'+import { Panel, Metadata as MetadataGeneric, type CustomTab } from './Panels'+import { FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, parseFilters } from './utils/filters'import {onCSVExportClick,getFormatDate,@@ -239,7 +229,6 @@ import {} from './ViewProject.helpers'const SESSIONS_TAKE = 30-const ERRORS_TAKE = 30/*** Pixel distance threshold for snapping to nearby annotations when clicking on the chart.@@ -561,9 +550,6 @@ const ViewProjectContent = () => {[CHART_METRICS_MAPPING.customEvents]: false,...(preferences.metricsVisualisation || {}),})- const [errorOptions, setErrorOptions] = useState<Record<string, boolean>>({- [ERROR_FILTERS_MAPPING.showResolved]: false,- })const [activeChartMetricsPerf, setActiveChartMetricsPerf] = useState(CHART_METRICS_MAPPING_PERF.timing)const [activePerfMeasure, setActivePerfMeasure] = useState(CHART_MEASURES_MAPPING_PERF.median)const checkIfAllMetricsAreDisabled = useMemo(@@ -725,21 +711,6 @@ const ViewProjectContent = () => {const profilesRequestIdRef = useRef(0)const skipNextProfilesAutoLoadRef = useRef(false)- // errors- const [errorsSkip, setErrorsSkip] = useState(0)- const [canLoadMoreErrors, setCanLoadMoreErrors] = useState(false)- const [errors, setErrors] = useState<SwetrixError[]>([])- const [errorsLoading, setErrorsLoading] = useState<boolean | null>(null) // null - not loaded, true - loading, false - loaded- const [activeError, setActiveError] = useState<{ details: SwetrixErrorDetails; [key: string]: any } | null>(null)- const [errorLoading, setErrorLoading] = useState(false)- const [errorStatusUpdating, setErrorStatusUpdating] = useState(false)- const activeEID = useMemo(() => {- return searchParams.get('eid')- }, [searchParams])- const prevActiveEIDRef = useRef<string | null>(activeEID)- const errorsRequestIdRef = useRef(0)- const skipNextErrorsAutoLoadRef = useRef(false)-const [funnelToEdit, setFunnelToEdit] = useState<Funnel | undefined>(undefined)const [funnelActionLoading, setFunnelActionLoading] = useState(false)const [funnelAnalytics, setFunnelAnalytics] = useState<{@@ -789,17 +760,12 @@ const ViewProjectContent = () => {annotation: null,})- // Reset sessions and errors when filters change so lists reload with correct pagination+ // Reset sessions when filters change so lists reload with correct paginationuseEffect(() => {sessionsRequestIdRef.current += 1- errorsRequestIdRef.current += 1setSessionsSkip(0)setSessions([])setSessionsLoading(null)-- setErrorsSkip(0)- setErrors([])- setErrorsLoading(null)}, [filters])const mode = activeChartMetrics[CHART_METRICS_MAPPING.cumulativeMode] ? 'cumulative' : 'periodical'@@ -1098,16 +1064,6 @@ const ViewProjectContent = () => {device: 'br',})- const [errorsActiveTabs, setErrorsActiveTabs] = useState<{- location: 'cc' | 'rg' | 'ct' | 'lc' | 'map'- page: 'pg' | 'host'- device: 'br' | 'os' | 'dv'- }>({- location: 'cc',- page: 'pg',- device: 'br',- })-const setPanelTab = (panel: keyof typeof panelsActiveTabs,tab: (typeof panelsActiveTabs)[keyof typeof panelsActiveTabs],@@ -1193,18 +1149,8 @@ const ViewProjectContent = () => {}, [isActiveCompare, period, dateRange, periodPairs])const createVersionDataMapping = useMemo(() => {- const browserDataSource =- activeTab === PROJECT_TABS.errors- ? activeError?.params?.brv- : activeTab === PROJECT_TABS.performance- ? panelsDataPerf.data?.brv- : panelsData.data?.brv- const osDataSource =- activeTab === PROJECT_TABS.errors- ? activeError?.params?.osv- : activeTab === PROJECT_TABS.performance- ? panelsDataPerf.data?.osv- : panelsData.data?.osv+ const browserDataSource = activeTab === PROJECT_TABS.performance ? panelsDataPerf.data?.brv : panelsData.data?.brv+ const osDataSource = activeTab === PROJECT_TABS.performance ? panelsDataPerf.data?.osv : panelsData.data?.osvconst browserVersions: { [key: string]: Entry[] } = {}const osVersions: { [key: string]: Entry[] } = {}@@ -1230,15 +1176,7 @@ const ViewProjectContent = () => {}return { browserVersions, osVersions }- }, [- panelsData.data?.brv,- panelsData.data?.osv,- activeTab,- activeError?.params?.brv,- activeError?.params?.osv,- panelsDataPerf.data?.brv,- panelsDataPerf.data?.osv,- ])+ }, [panelsData.data?.brv, panelsData.data?.osv, activeTab, panelsDataPerf.data?.brv, panelsDataPerf.data?.osv])useEffect(() => {if (!project) {@@ -1344,16 +1282,6 @@ const ViewProjectContent = () => {]}, [t, activeChartMetrics])- const errorFilters = useMemo(() => {- return [- {- id: ERROR_FILTERS_MAPPING.showResolved,- label: t('project.showResolved'),- active: errorOptions[ERROR_FILTERS_MAPPING.showResolved],- },- ]- }, [t, errorOptions])-const chartMetricsPerf = useMemo(() => {return [{@@ -1594,72 +1522,6 @@ const ViewProjectContent = () => {})}- const switchActiveErrorFilter = _debounce((pairID: string) => {- setErrorOptions((prev) => ({ ...prev, [pairID]: !prev[pairID] }))- setErrorsSkip(0)- }, 0)-- const updateStatusInErrors = (status: 'active' | 'resolved') => {- if (!activeError?.details?.eid) {- return- }-- const index = _findIndex(errors, (error) => error.eid === activeEID)-- if (index === -1) {- return- }-- errors[index] = {- ...errors[index],- status,- }- }-- const markErrorAsResolved = async () => {- if (errorStatusUpdating || !activeEID || !activeError?.details?.eid) {- return- }-- setErrorStatusUpdating(true)-- try {- await updateErrorStatus(id, 'resolved', activeEID)- await loadError(activeEID)- updateStatusInErrors('resolved')- } catch (reason) {- console.error('[markErrorAsResolved]', reason)- toast.error(t('apiNotifications.updateErrorStatusFailed'))- setErrorStatusUpdating(false)- return- }-- toast.success(t('apiNotifications.errorStatusUpdated'))- setErrorStatusUpdating(false)- }-- const markErrorAsActive = async () => {- if (errorStatusUpdating || !activeEID || !activeError?.details?.eid) {- return- }-- setErrorStatusUpdating(true)-- try {- await updateErrorStatus(id, 'active', activeEID)- await loadError(activeEID)- updateStatusInErrors('active')- } catch (reason) {- console.error('[markErrorAsResolved]', reason)- toast.error(t('apiNotifications.updateErrorStatusFailed'))- setErrorStatusUpdating(false)- return- }-- toast.success(t('apiNotifications.errorStatusUpdated'))- setErrorStatusUpdating(false)- }-const loadCustomEvents = async () => {if (_isEmpty(panelsData.customs)) {return@@ -1983,44 +1845,6 @@ const ViewProjectContent = () => {return getPropertyMetadata(id, event, timeBucket, period, '', '', filters, timezone, projectPassword)}- const loadError = useCallback(- async (eid: string) => {- setErrorLoading(true)-- try {- let error- let from- let to-- if (dateRange) {- from = getFormatDate(dateRange[0])- to = getFormatDate(dateRange[1])- }-- if (period === 'custom' && dateRange) {- error = await getError(id, eid, timeBucket, '', filters, from, to, timezone, projectPassword)- } else {- error = await getError(id, eid, timeBucket, period, filters, '', '', timezone, projectPassword)- }-- setActiveError(error)- } catch (reason: any) {- if (reason?.status === 400) {- setErrorLoading(false)- setActiveError(null)- return- }-- const message = _isEmpty(reason.data?.message) ? reason.data : reason.data.message-- console.error('[ERROR] (loadError)(getError)', message)- toast.error(message)- }- setErrorLoading(false)- },- [dateRange, id, period, timeBucket, projectPassword, timezone, filters],- )-const loadSession = async (psid: string) => {if (sessionLoading) {return@@ -2058,24 +1882,6 @@ const ViewProjectContent = () => {// eslint-disable-next-line react-hooks/exhaustive-deps}, [period, dateRange, timeBucket, activePSID])- useEffect(() => {- if (!activeEID) {- setActiveError(null)- // Coming back from an error detail to the list: reset pagination and reload first page- if (prevActiveEIDRef.current) {- skipNextErrorsAutoLoadRef.current = true- setErrorsSkip(0)- loadErrors(0, true)- }- prevActiveEIDRef.current = null- return- }-- loadError(activeEID)- prevActiveEIDRef.current = activeEID- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [period, dateRange, timeBucket, activeEID, filters])-const loadSessions = async (forcedSkip?: number, override?: boolean) => {if (sessionsLoading) {return@@ -2306,84 +2112,6 @@ const ViewProjectContent = () => {}}- const loadErrors = async (forcedSkip?: number, override?: boolean) => {- if (errorsLoading) {- return- }-- const requestId = errorsRequestIdRef.current- setErrorsLoading(true)-- try {- // If errors list is empty (e.g., after navigating back), default to first page- const skip = typeof forcedSkip === 'number' ? forcedSkip : _isEmpty(errors) ? 0 : errorsSkip- let dataErrors: { errors: SwetrixError[] }- let from- let to-- if (dateRange) {- from = getFormatDate(dateRange[0])- to = getFormatDate(dateRange[1])- }-- if (period === 'custom' && dateRange) {- dataErrors = await getErrors(- id,- '',- filters,- errorOptions,- from,- to,- ERRORS_TAKE,- skip,- timezone,- projectPassword,- )- } else {- dataErrors = await getErrors(- id,- period,- filters,- errorOptions,- '',- '',- ERRORS_TAKE,- skip,- timezone,- projectPassword,- )- }-- if (requestId === errorsRequestIdRef.current) {- if (override) {- setErrors(dataErrors?.errors || [])- } else {- setErrors((prev) => [...prev, ...(dataErrors?.errors || [])])- }-- setErrorsSkip((prev) => {- if (typeof forcedSkip === 'number') {- return ERRORS_TAKE + forcedSkip- }-- return ERRORS_TAKE + prev- })-- if (dataErrors?.errors?.length < ERRORS_TAKE) {- setCanLoadMoreErrors(false)- } else {- setCanLoadMoreErrors(true)- }- }- } catch (reason) {- console.error('[ERROR](loadErrors) Loading errors data failed:', reason)- } finally {- if (requestId === errorsRequestIdRef.current) {- setErrorsLoading(false)- }- }- }-const loadAnalyticsPerf = async () => {setDataLoading(true)@@ -2656,17 +2384,6 @@ const ViewProjectContent = () => {return}- if (activeTab === PROJECT_TABS.errors) {- if (activeEID) {- await loadError(activeEID)- return- }-- setErrorsSkip(0)- loadErrors(0, true)- return- }-if (activeTab === PROJECT_TABS.profiles) {if (activeProfileId) {await loadProfile(activeProfileId)@@ -2697,7 +2414,7 @@ const ViewProjectContent = () => {}},// eslint-disable-next-line react-hooks/exhaustive-deps- [authLoading, dataLoading, activeTab, activePSID, activeEID, activeProfileId],+ [authLoading, dataLoading, activeTab, activePSID, activeProfileId],)useEffect(() => {@@ -2865,32 +2582,6 @@ const ViewProjectContent = () => {// eslint-disable-next-line react-hooks/exhaustive-deps}, [activeProfileId])- useEffect(() => {- if (authLoading || activeTab !== PROJECT_TABS.errors || authLoading || !project || activeEID) {- return- }-- if (skipNextErrorsAutoLoadRef.current) {- skipNextErrorsAutoLoadRef.current = false- return- }-- loadErrors()- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [- activeTab,- errorOptions,- dateRange,- filters,- id,- period,- projectPassword,- timezone,- authLoading,- project,- activeEID,- ])-useEffect(() => {let sdk: SwetrixSDK | null = null@@ -3043,7 +2734,6 @@ const ViewProjectContent = () => {newSearchParams.set('period', newPeriod)setSessionsSkip(0)- setErrorsSkip(0)updatePreferences({period: newPeriod,@@ -3448,7 +3138,6 @@ const ViewProjectContent = () => {<>{(dataLoading && !isAutoRefreshing) ||(sessionsLoading && !_isEmpty(sessions)) ||- (errorsLoading && !_isEmpty(errors)) ||(profilesLoading && !_isEmpty(profiles)) ? (<LoadingBar />) : null}@@ -3512,7 +3201,7 @@ const ViewProjectContent = () => {className={cx('border-gray-200 dark:border-gray-600', {// @ts-expect-error'lg:border-r': activeTab === PROJECT_TABS.funnels,- hidden: activeTab === PROJECT_TABS.errors && activeError,+ hidden: activeTab === PROJECT_TABS.errors,})}><button@@ -3679,75 +3368,13 @@ const ViewProjectContent = () => {) : null}</>) : null}- {activeTab === PROJECT_TABS.errors &&- allowedToManage &&- activeError &&- activeError?.details?.status !== 'resolved' ? (- <button- type='button'- disabled={errorStatusUpdating}- onClick={markErrorAsResolved}- className={cx('p-2 text-sm font-medium text-gray-700 dark:text-gray-50', {- 'cursor-not-allowed': authLoading || errorLoading,- 'opacity-50': errorLoading && !errorStatusUpdating,- 'animate-pulse cursor-not-allowed': errorStatusUpdating,- })}- >- {t('project.resolve')}- </button>- ) : null}- {activeTab === PROJECT_TABS.errors &&- allowedToManage &&- activeError &&- activeError?.details?.status === 'resolved' ? (- <button- type='button'- disabled={errorStatusUpdating}- onClick={markErrorAsActive}- className={cx('p-2 text-sm font-medium text-gray-700 dark:text-gray-50', {- 'cursor-not-allowed': authLoading || errorLoading,- 'opacity-50': errorLoading && !errorStatusUpdating,- 'animate-pulse cursor-not-allowed': errorStatusUpdating,- })}- >- {t('project.markAsActive')}- </button>- ) : null}- {activeTab === PROJECT_TABS.errors && !activeError ? (- <Dropdown- items={errorFilters}- title={t('project.filters')}- labelExtractor={(pair) => {- const { label, active, id: pairID } = pair-- return (- <Checkbox- classes={{- label: 'px-4 py-2',- }}- label={label}- checked={active}- onChange={() => switchActiveErrorFilter(pairID)}- />- )- }}- buttonClassName='!px-2.5'- selectItemClassName='p-0'- keyExtractor={(pair) => pair.id}- onSelect={({ id: pairID }) => {- switchActiveErrorFilter(pairID)- }}- chevron='mini'- headless- />- ) : null}{activeTab === PROJECT_TABS.funnels ? (<RefreshStatsButton onRefresh={refreshStats} />) : null}<div className='flex items-center'><TBPeriodSelectorclasses={{- timeBucket: activeTab === PROJECT_TABS.errors && !activeEID ? 'hidden' : '',+ timeBucket: activeTab === PROJECT_TABS.errors ? 'hidden' : '',}}activePeriod={activePeriod}items={timeBucketSelectorItems}@@ -4071,243 +3698,7 @@ const ViewProjectContent = () => {) : null}</>) : null}- {activeTab === PROJECT_TABS.errors && !activeEID ? <ErrorsView /> : null}- {activeTab === PROJECT_TABS.errors && activeEID ? (- <>- <div className='mx-auto mt-2 mb-3 flex max-w-max items-center space-x-4 lg:mx-0'>- <Link- to={{- search: pureSearchParams,- }}- className='flex items-center text-sm text-gray-900 underline decoration-dashed hover:decoration-solid dark:text-gray-100'- >- <ChevronLeftIcon className='mr-1 size-3' />- {t('project.backToErrors')}- </Link>- </div>- {activeError?.details ? (- <ErrorDetails- details={activeError.details}- period={period}- from={dateRange ? getFormatDate(dateRange[0]) : undefined}- to={dateRange ? getFormatDate(dateRange[1]) : undefined}- timeBucket={timeBucket}- projectPassword={projectPassword}- />- ) : null}- {activeError?.chart ? (- <div- onContextMenu={(e) => handleChartContextMenu(e, activeError?.chart?.x)}- className='relative'- >- <ErrorChart- chart={activeError?.chart}- timeBucket={activeError?.timeBucket}- timeFormat={timeFormat}- rotateXAxis={rotateXAxis}- chartType={chartType}- dataNames={dataNames}- annotations={annotations}- />- </div>- ) : null}- <Filters tnMapping={tnMapping} />- <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>- {!_isEmpty(activeError?.params)- ? _map(ERROR_PANELS_ORDER, (type: keyof typeof tnMapping) => {- if (type === 'location') {- const locationTabs = [- { id: 'cc', label: t('project.mapping.cc') },- { id: 'rg', label: t('project.mapping.rg') },- { id: 'ct', label: t('project.mapping.ct') },- { id: 'lc', label: t('project.mapping.lc') },- { id: 'map', label: 'Map' },- ]-- const rowMapper = (entry: CountryEntry) => {- const { name: entryName, cc } = entry-- if (errorsActiveTabs.location === 'lc') {- if (entryName === null) {- return <CCRow cc={null} language={language} />- }- const entryNameArray = entryName.split('-')- const displayName = getLocaleDisplayName(entryName, language)-- return (- <CCRow- cc={entryNameArray[entryNameArray.length - 1]}- name={displayName}- language={language}- />- )- }-- if (cc !== undefined) {- return <CCRow cc={cc} name={entryName || undefined} language={language} />- }-- return <CCRow cc={entryName} language={language} />- }-- return (- <Panel- key={errorsActiveTabs.location}- icon={panelIconMapping.cc}- id={errorsActiveTabs.location}- getFilterLink={getFilterLink}- name={t('project.location')}- tabs={locationTabs}- onTabChange={(tab) =>- setErrorsActiveTabs({- ...errorsActiveTabs,- location: tab as 'cc' | 'rg' | 'ct' | 'lc' | 'map',- })- }- activeTabId={errorsActiveTabs.location}- data={activeError?.params?.[errorsActiveTabs.location] || []}- rowMapper={rowMapper}- customRenderer={- errorsActiveTabs.location === 'map'- ? () => {- const countryData = activeError?.params?.cc || []- const regionData = activeError?.params?.rg || []- // @ts-expect-error- const total = countryData.reduce((acc, curr) => acc + curr.count, 0)-- return (- <Suspense- fallback={- <div className='flex h-full items-center justify-center'>- <div className='flex flex-col items-center gap-2'>- <div className='h-8 w-8 animate-spin rounded-full border-2 border-blue-400 border-t-transparent'></div>- <span className='text-sm text-neutral-600 dark:text-neutral-300'>- Loading map...- </span>- </div>- </div>- }- >- <InteractiveMap- data={countryData}- regionData={regionData}- total={total}- onClick={(type, key) => {- const link = getFilterLink(type, key)- navigate(link)- }}- />- </Suspense>- )- }- : undefined- }- valuesHeaderName={t('project.occurrences')}- highlightColour='red'- />- )- }-- if (type === 'devices') {- const deviceTabs = [- { id: 'br', label: t('project.mapping.br') },- { id: 'os', label: t('project.mapping.os') },- { id: 'dv', label: t('project.mapping.dv') },- ]-- return (- <Panel- key={errorsActiveTabs.device}- icon={panelIconMapping.os}- id={errorsActiveTabs.device}- getFilterLink={getFilterLink}- name={t('project.devices')}- tabs={deviceTabs}- onTabChange={(tab) =>- setErrorsActiveTabs({ ...errorsActiveTabs, device: tab as 'br' | 'os' | 'dv' })- }- activeTabId={errorsActiveTabs.device}- data={activeError?.params?.[errorsActiveTabs.device] || []}- rowMapper={getDeviceRowMapper(errorsActiveTabs.device, theme, t)}- capitalize={errorsActiveTabs.device === 'dv'}- versionData={- errorsActiveTabs.device === 'br'- ? createVersionDataMapping.browserVersions- : errorsActiveTabs.device === 'os'- ? createVersionDataMapping.osVersions- : undefined- }- getVersionFilterLink={(parent, version) =>- getVersionFilterLink(- parent,- version,- errorsActiveTabs.device === 'br' ? 'br' : 'os',- )- }- valuesHeaderName={t('project.occurrences')}- highlightColour='red'- />- )- }-- if (type === 'pg') {- const pageTabs = [- { id: 'pg', label: t('project.mapping.pg') },- {- id: 'host',- label: t('project.mapping.host'),- },- ]-- return (- <Panel- key={errorsActiveTabs.page}- icon={panelIconMapping.pg}- id={errorsActiveTabs.page}- getFilterLink={getFilterLink}- rowMapper={({ name: entryName }) => {- if (!entryName) {- return (- <span className='italic'>- {panelsActiveTabs.page === 'pg'- ? t('common.notSet')- : t('project.unknownHost')}- </span>- )- }-- let decodedUri = entryName as string-- try {- decodedUri = decodeURIComponent(entryName)- } catch {- // do nothing- }-- return decodedUri- }}- name={t('project.pages')}- tabs={pageTabs}- onTabChange={(tab) =>- setErrorsActiveTabs({ ...errorsActiveTabs, page: tab as 'pg' | 'host' })- }- activeTabId={errorsActiveTabs.page}- data={activeError?.params?.[errorsActiveTabs.page] || []}- valuesHeaderName={t('project.occurrences')}- highlightColour='red'- />- )- }-- return null- })- : null}- {activeError?.metadata ? <MetadataPanel metadata={activeError.metadata} /> : null}- </div>- {_isEmpty(activeError) && errorLoading ? <Loader /> : null}- {!errorLoading && _isEmpty(activeError) ? <NoErrorDetails /> : null}- </>- ) : null}+ {activeTab === PROJECT_TABS.errors ? <ErrorsView /> : null}{activeTab === PROJECT_TABS.alerts && project.role === 'owner' && isAuthenticated ? (<ProjectAlertsView />) : null}