📈 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
Improve navigation
Blue Mouse62e3cd822e77
diff --git a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsxindex e218af3b6..e0daab217 100644--- a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx+++ b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx@@ -10,14 +10,13 @@ import _toNumber from 'lodash/toNumber'import _values from 'lodash/values'import React, { useEffect, useMemo, useState } from 'react'import { useTranslation, Trans } from 'react-i18next'-import { useNavigate, Link } from 'react-router'+import { Link } from 'react-router'import { toast } from 'sonner'import { createAlert, updateAlert, deleteAlert, CreateAlert, getAlert } from '~/api'-import { withAuthentication, auth } from '~/hoc/protected'-import { useRequiredParams } from '~/hooks/useRequiredParams'-import { PROJECT_TABS, QUERY_CONDITION, QUERY_METRIC, QUERY_TIME } from '~/lib/constants'+import { QUERY_CONDITION, QUERY_METRIC, QUERY_TIME } from '~/lib/constants'import { Alerts } from '~/lib/models/Alerts'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { useAuth } from '~/providers/AuthProvider'import Button from '~/ui/Button'import Checkbox from '~/ui/Checkbox'@@ -25,22 +24,33 @@ import Input from '~/ui/Input'import Loader from '~/ui/Loader'import Modal from '~/ui/Modal'import Select from '~/ui/Select'+import { Text } from '~/ui/Text'import routes from '~/utils/routes'const INTEGRATIONS_LINK = `${routes.user_settings}#integrations`interface ProjectAlertsSettingsProps {+ alertId?: string | null+ projectId: stringisSettings?: boolean+ onClose?: () => void+ onSave?: () => void+ backLink?: string}-const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {+const ProjectAlertsSettings = ({+ alertId,+ projectId,+ isSettings,+ onClose,+ onSave,+ backLink,+}: ProjectAlertsSettingsProps) => {const { user, isLoading: authLoading } = useAuth()- const navigate = useNavigate()- const { id, pid } = useRequiredParams<{ id: string; pid: string }>()const { t } = useTranslation('common')const [form, setForm] = useState<Partial<Alerts>>({- pid,+ pid: projectId,name: '',queryTime: QUERY_TIME.LAST_1_HOUR,queryCondition: QUERY_CONDITION.GREATER_THAN,@@ -70,7 +80,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {)}, [user])- const loadAlert = async (alertId: string) => {+ const loadAlert = async (id: string) => {if (!isSettings) {setIsLoading(false)return@@ -83,7 +93,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {setIsLoading(true)try {- const result = await getAlert(alertId)+ const result = await getAlert(id)setAlert(result)setForm(result)} catch (reason: any) {@@ -98,10 +108,14 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {return}- loadAlert(id)+ if (alertId) {+ loadAlert(alertId)+ } else {+ setIsLoading(false)+ }// eslint-disable-next-line react-hooks/exhaustive-deps- }, [authLoading, id, isSettings])+ }, [authLoading, alertId, isSettings])const queryTimeTMapping: Record<string, string> = useMemo(() => {const values = _values(QUERY_TIME)@@ -231,12 +245,12 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {}}- if (isSettings) {- updateAlert(id as string, submissionData)+ if (isSettings && alertId) {+ updateAlert(alertId, submissionData).then((res) => {- navigate(`/projects/${pid}?tab=${PROJECT_TABS.alerts}`)setAlert(res)toast.success(t('alertsSettings.alertUpdated'))+ onSave?.()}).catch((reason) => {toast.error(reason.message || reason || 'Something went wrong')@@ -244,8 +258,8 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {} else {createAlert(submissionData as CreateAlert).then(() => {- navigate(`/projects/${pid}?tab=${PROJECT_TABS.alerts}`)toast.success(t('alertsSettings.alertCreated'))+ onSave?.()}).catch((reason) => {toast.error(reason.message || reason || 'Something went wrong')@@ -253,16 +267,16 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {}}- const onDelete = () => {- if (!id) {+ const onDeleteAlert = () => {+ if (!alertId) {toast.error('Something went wrong')return}- deleteAlert(id)+ deleteAlert(alertId).then(() => {- navigate(`/projects/${pid}?tab=${PROJECT_TABS.alerts}`)toast.success(t('alertsSettings.alertDeleted'))+ onSave?.()}).catch((reason) => {toast.error(reason.message || reason || 'Something went wrong')@@ -317,7 +331,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {if (isLoading || isLoading === null) {return (- <div className='flex min-h-min-footer flex-col bg-gray-50 px-4 py-6 sm:px-6 lg:px-8 dark:bg-slate-900'>+ <div className='mt-4'><Loader /></div>)@@ -325,7 +339,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {if (error && !isLoading) {return (- <div className='min-h-page bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'>+ <div className='px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'><div className='mx-auto max-w-max'><main className='sm:flex'><XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />@@ -361,13 +375,20 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {}return (- <div- className={cx('flex min-h-min-footer flex-col bg-gray-50 dark:bg-slate-900', {- 'pb-40': isSettings,- })}- >- <form className='mx-auto w-full max-w-7xl px-4 py-6 sm:px-6 lg:px-8' onSubmit={handleSubmit}>- <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>{title}</h2>+ <div>+ <DashboardHeader+ backLink={backLink}+ showLiveVisitors={false}+ showSearchButton={false}+ showRefreshButton={false}+ showPeriodSelector={false}+ leftContent={+ <Text as='h2' size='xl' weight='bold' className='wrap-break-word break-all'>+ {title}+ </Text>+ }+ />+ <form className='w-full py-4' onSubmit={handleSubmit}>{!authLoading && !isIntegrationLinked ? (<div className='mt-2 flex items-center rounded-sm bg-blue-50 px-5 py-3 text-base whitespace-pre-wrap dark:bg-slate-800 dark:text-gray-50'><ExclamationTriangleIcon className='mr-1 h-5 w-5' />@@ -531,9 +552,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {<div className='flex items-center justify-between'><ButtonclassName='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'- as={Link}- // @ts-expect-error- to={`/projects/${pid}?tab=${PROJECT_TABS.alerts}`}+ onClick={onClose}secondaryregular>@@ -548,9 +567,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {<div className='mt-5 flex items-center justify-between'><ButtonclassName='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'- as={Link}- // @ts-expect-error- to={`/projects/${pid}?tab=${PROJECT_TABS.alerts}`}+ onClick={onClose}secondaryregular>@@ -564,7 +581,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {</form><ModalonClose={() => setShowModal(false)}- onSubmit={onDelete}+ onSubmit={onDeleteAlert}submitText={t('alert.delete')}closeText={t('common.close')}title={t('alert.qDelete')}@@ -577,4 +594,4 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {)}-export default withAuthentication(ProjectAlertsSettings, auth.authenticated)+export default ProjectAlertsSettingsdiff --git a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsxindex 458cbdc84..7bbb4df6f 100644--- a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx+++ b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx@@ -4,18 +4,18 @@ import dayjs from 'dayjs'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import _reduce from 'lodash/reduce'-import _replace from 'lodash/replace'import _values from 'lodash/values'import { Settings2Icon, Trash2Icon, BellRingIcon, DollarSignIcon, TriangleAlertIcon, BellPlusIcon } from 'lucide-react'import { useMemo, useState, useEffect } from 'react'import { useTranslation } from 'react-i18next'-import { useNavigate, Link } from 'react-router'+import { Link, useSearchParams } from 'react-router'import { toast } from 'sonner'import { deleteAlert as deleteAlertApi, getProjectAlerts } from '~/api'import { QUERY_METRIC, PLAN_LIMITS, DEFAULT_ALERTS_TAKE } from '~/lib/constants'import { Alerts } from '~/lib/models/Alerts'import PaidFeature from '~/modals/PaidFeature'+import ProjectAlertsSettings from '~/pages/Project/Alerts/Settings/ProjectAlertsSettings'import { useAuth } from '~/providers/AuthProvider'import { useCurrentProject } from '~/providers/CurrentProjectProvider'import { Badge, type BadgeProps } from '~/ui/Badge'@@ -191,10 +191,11 @@ const AddAlert = ({ handleNewAlert, isLimitReached }: AddAlertProps) => {}const ProjectAlerts = () => {- const { id } = useCurrentProject()+ const { id, project } = useCurrentProject()const { t } = useTranslation()const { user, isAuthenticated } = useAuth()const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)+ const [searchParams, setSearchParams] = useSearchParams()const [isLoading, setIsLoading] = useState<boolean | null>(null)const [total, setTotal] = useState(0)@@ -205,11 +206,24 @@ const ProjectAlerts = () => {const pageAmount = Math.ceil(total / DEFAULT_ALERTS_TAKE)- const navigate = useNavigate()-const limits = PLAN_LIMITS[user?.planCode || 'trial']const isLimitReached = isAuthenticated && total >= limits?.maxAlerts+ // Check if user has permission to view alerts+ const canManageAlerts = project?.role === 'owner' && isAuthenticated++ // Get active alert from URL params+ const activeAlertId = searchParams.get('alertId')+ const isCreatingAlert = searchParams.get('newAlert') === 'true'++ // Search params without the alert params. Needed for the back button.+ const pureSearchParams = useMemo(() => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.delete('alertId')+ newSearchParams.delete('newAlert')+ return newSearchParams.toString()+ }, [searchParams])+const loadAlerts = async (take: number, skip: number) => {if (isLoading) {return@@ -228,10 +242,14 @@ const ProjectAlerts = () => {}useEffect(() => {+ if (!canManageAlerts) {+ return+ }+loadAlerts(DEFAULT_ALERTS_TAKE, (page - 1) * DEFAULT_ALERTS_TAKE)// eslint-disable-next-line react-hooks/exhaustive-deps- }, [page])+ }, [page, canManageAlerts])const queryMetricTMapping: Record<string, string> = useMemo(() => {const values = _values(QUERY_METRIC)@@ -262,7 +280,28 @@ const ProjectAlerts = () => {return}- navigate(_replace(routes.create_alert, ':pid', id))+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.set('newAlert', 'true')+ setSearchParams(newSearchParams)+ }++ const openAlert = (alertId: string) => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.set('alertId', alertId)+ setSearchParams(newSearchParams)+ }++ const closeAlertSettings = () => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.delete('alertId')+ newSearchParams.delete('newAlert')+ setSearchParams(newSearchParams)+ }++ const handleAlertSaved = () => {+ closeAlertSettings()+ // Reload alerts after saving+ loadAlerts(DEFAULT_ALERTS_TAKE, (page - 1) * DEFAULT_ALERTS_TAKE)}const onDelete = async (id: string) => {@@ -319,6 +358,40 @@ const ProjectAlerts = () => {)}+ // Show signup prompt for non-owners or unauthenticated users+ if (!canManageAlerts) {+ return (+ <div className='mt-5 rounded-xl bg-gray-700 p-5'>+ <div className='flex items-center text-gray-50'>+ <BellRingIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <p className='text-3xl font-bold'>{t('dashboard.alerts')}</p>+ </div>+ <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('dashboard.alertsDesc')}</p>+ <Link+ to={routes.signup}+ className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-slate-900 hover:bg-indigo-50 md:px-4'+ aria-label={t('titles.signup')}+ >+ {t('header.startForFree')}+ </Link>+ </div>+ )+ }++ // Show alert settings view when editing or creating an alert+ if (activeAlertId || isCreatingAlert) {+ return (+ <ProjectAlertsSettings+ alertId={activeAlertId}+ projectId={id}+ isSettings={!!activeAlertId}+ onClose={closeAlertSettings}+ onSave={handleAlertSaved}+ backLink={`?${pureSearchParams}`}+ />+ )+ }+return (<><div className='mt-4'>@@ -347,9 +420,7 @@ const ProjectAlerts = () => {<AlertCardkey={alert.id}{...alert}- openAlert={(alertId) => {- navigate(_replace(_replace(routes.alert_settings, ':pid', id), ':id', alertId))- }}+ openAlert={openAlert}deleteAlert={onDelete}queryMetricTMapping={queryMetricTMapping}/>diff --git a/web/app/pages/Project/Errors/View/ErrorsView.tsx b/web/app/pages/Project/Errors/View/ErrorsView.tsxindex cfa3e3e6f..83d204afd 100644--- a/web/app/pages/Project/Errors/View/ErrorsView.tsx+++ b/web/app/pages/Project/Errors/View/ErrorsView.tsx@@ -13,7 +13,6 @@ import {UsersIcon,MonitorIcon,ChevronRightIcon,- ChevronLeftIcon,AlertTriangleIcon,UserIcon,} from 'lucide-react'@@ -56,6 +55,7 @@ import { getRelativeDateIfPossible } from '~/utils/date'import { getLocaleDisplayName, nFormatter } from '~/utils/generic'import CCRow from '../../View/components/CCRow'+import DashboardHeader from '../../View/components/DashboardHeader'import { ErrorChart } from '../../View/components/ErrorChart'import { ErrorDetails } from '../../View/components/ErrorDetails'import Filters from '../../View/components/Filters'@@ -767,55 +767,51 @@ const ErrorsView = () => {// If viewing error detailif (activeEID) {+ const resolveButton =+ 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>+ ) : 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+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>+ <DashboardHeader+ backLink={`?${pureSearchParams}`}+ showLiveVisitors={false}+ showSearchButton={false}+ hideTimeBucket+ rightContent={resolveButton}+ />{/* Error details */}{activeError?.details ? (@@ -1041,6 +1037,8 @@ const ErrorsView = () => {return (<div>+ <DashboardHeader showLiveVisitors showSearchButton={false} hideTimeBucket />+{/* Loading bar for refreshes */}{(overviewLoading || errorsLoading) && (overview || !_isEmpty(errors)) ? <LoadingBar /> : null}diff --git a/web/app/pages/Project/Experiments/View/ExperimentResults.tsx b/web/app/pages/Project/Experiments/View/ExperimentResults.tsxindex 937ae338b..3243bcf4a 100644--- a/web/app/pages/Project/Experiments/View/ExperimentResults.tsx+++ b/web/app/pages/Project/Experiments/View/ExperimentResults.tsx@@ -1,7 +1,6 @@import cx from 'clsx'import _map from 'lodash/map'import {- ArrowLeftIcon,TrophyIcon,UsersIcon,TargetIcon,@@ -22,8 +21,7 @@ import {type ExperimentResults as ExperimentResultsType,type ExperimentVariantResult,} from '~/api'-import Button from '~/ui/Button'-import Loader from '~/ui/Loader'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { Text } from '~/ui/Text'import Tooltip from '~/ui/Tooltip'import { nFormatter } from '~/utils/generic'@@ -523,133 +521,121 @@ const ExperimentResults = ({ experimentId, period, from, to, timezone, onBack }:if (error || !experiment || !results) {return (- <div className='mt-4'>- <Button onClick={onBack} secondary small className='mb-4'>- <ArrowLeftIcon className='mr-1 size-4' />- {t('common.back')}- </Button>+ <>+ <DashboardHeader onBack={onBack} showLiveVisitors={false} /><div className='rounded-xl border border-red-200 bg-red-50 p-4 dark:border-red-800 dark:bg-red-900/20'><Text colour='muted'>{error || t('experiments.loadError')}</Text></div>- </div>+ </>)}return (- <div className='mt-4 space-y-6'>- {/* Header */}- <div className='flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between'>- <div className='flex items-center gap-4'>- <Button onClick={onBack} secondary small>- <ArrowLeftIcon className='mr-1 size-4' />- {t('common.back')}- </Button>- <div className='min-w-0'>- <div className='flex items-center gap-2'>- <FlaskConicalIcon className='size-5 text-purple-500' strokeWidth={1.5} />- <Text as='h2' size='xl' weight='bold' truncate>- {experiment.name}- </Text>+ <>+ <DashboardHeader+ onBack={onBack}+ showLiveVisitors={false}+ leftContent={+ <div className='flex items-center gap-2'>+ <FlaskConicalIcon className='size-5 text-purple-500' strokeWidth={1.5} />+ <Text as='h2' size='xl' weight='bold' truncate>+ {experiment.name}+ </Text>+ <div+ className={cx('inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium', {+ 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400': results.status === 'draft',+ 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400': results.status === 'running',+ 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-400': results.status === 'paused',+ 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-400': results.status === 'completed',+ })}+ >+ {t(`experiments.status.${results.status}`)}+ </div>+ </div>+ }+ />+ <div className='mt-4 space-y-6'>+ {/* Winner announcement */}+ {results.hasWinner && results.winnerKey && (+ <div className='flex items-center gap-4 rounded-xl border border-green-300 bg-linear-to-r from-green-50 to-emerald-50 p-4 dark:border-green-700 dark:bg-green-900/20'>+ <div className='flex size-12 shrink-0 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/50'>+ <TrophyIcon className='size-6 text-green-600 dark:text-green-400' /></div>- {experiment.description && (- <Text size='sm' colour='muted' className='mt-0.5'>- {experiment.description}+ <div>+ <Text weight='bold' size='lg' className='text-green-800 dark:text-green-200'>+ {t('experiments.winnerFound')}</Text>- )}+ <Text size='sm' className='text-green-700 dark:text-green-300'>+ {t('experiments.winnerDescription', {+ variant: results.variants.find((v) => v.key === results.winnerKey)?.name || results.winnerKey,+ })}+ </Text>+ </div></div>- </div>- <div- className={cx('inline-flex items-center self-start rounded-full px-3 py-1 text-sm font-medium', {- 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400': results.status === 'draft',- 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400': results.status === 'running',- 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-400': results.status === 'paused',- 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-400': results.status === 'completed',- })}- >- {t(`experiments.status.${results.status}`)}- </div>- </div>+ )}- {/* Winner announcement */}- {results.hasWinner && results.winnerKey && (- <div className='flex items-center gap-4 rounded-xl border border-green-300 bg-linear-to-r from-green-50 to-emerald-50 p-4 dark:border-green-700 dark:bg-green-900/20'>- <div className='flex size-12 shrink-0 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/50'>- <TrophyIcon className='size-6 text-green-600 dark:text-green-400' />- </div>- <div>- <Text weight='bold' size='lg' className='text-green-800 dark:text-green-200'>- {t('experiments.winnerFound')}- </Text>- <Text size='sm' className='text-green-700 dark:text-green-300'>- {t('experiments.winnerDescription', {- variant: results.variants.find((v) => v.key === results.winnerKey)?.name || results.winnerKey,- })}+ {/* No data message */}+ {results.totalExposures === 0 && (+ <div className='rounded-xl border border-yellow-300 bg-yellow-50 p-4 dark:border-yellow-700 dark:bg-yellow-900/20'>+ <Text weight='semibold'>{t('experiments.noDataYet')}</Text>+ <Text colour='muted' size='sm' className='mt-1'>+ {t('experiments.noDataDescription')}</Text></div>+ )}++ {/* Stats Grid - 2x2 layout */}+ <div className='grid grid-cols-2 gap-3 lg:grid-cols-4'>+ <StatCard+ icon={UsersIcon}+ label={t('experiments.totalExposures')}+ value={nFormatter(results.totalExposures, 1)}+ iconClassName='bg-blue-100 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400'+ />+ <StatCard+ icon={TargetIcon}+ label={t('experiments.totalConversions')}+ value={nFormatter(results.totalConversions, 1)}+ subValue={`${overallConversionRate}%`}+ iconClassName='bg-green-100 dark:bg-green-900/30 text-green-600 dark:text-green-400'+ />+ <StatCard+ icon={FlaskConicalIcon}+ label={t('experiments.variantsCount')}+ value={results.variants.length}+ iconClassName='bg-purple-100 dark:bg-purple-900/30 text-purple-600 dark:text-purple-400'+ />+ <StatCard+ icon={PercentIcon}+ label={t('experiments.confidenceLevel')}+ value={`${results.confidenceLevel}%`}+ iconClassName='bg-amber-100 dark:bg-amber-900/30 text-amber-600 dark:text-amber-400'+ /></div>- )}-- {/* No data message */}- {results.totalExposures === 0 && (- <div className='rounded-xl border border-yellow-300 bg-yellow-50 p-4 dark:border-yellow-700 dark:bg-yellow-900/20'>- <Text weight='semibold'>{t('experiments.noDataYet')}</Text>- <Text colour='muted' size='sm' className='mt-1'>- {t('experiments.noDataDescription')}- </Text>- </div>- )}-- {/* Stats Grid - 2x2 layout */}- <div className='grid grid-cols-2 gap-3 lg:grid-cols-4'>- <StatCard- icon={UsersIcon}- label={t('experiments.totalExposures')}- value={nFormatter(results.totalExposures, 1)}- iconClassName='bg-blue-100 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400'- />- <StatCard- icon={TargetIcon}- label={t('experiments.totalConversions')}- value={nFormatter(results.totalConversions, 1)}- subValue={`${overallConversionRate}%`}- iconClassName='bg-green-100 dark:bg-green-900/30 text-green-600 dark:text-green-400'- />- <StatCard- icon={FlaskConicalIcon}- label={t('experiments.variantsCount')}- value={results.variants.length}- iconClassName='bg-purple-100 dark:bg-purple-900/30 text-purple-600 dark:text-purple-400'- />- <StatCard- icon={PercentIcon}- label={t('experiments.confidenceLevel')}- value={`${results.confidenceLevel}%`}- iconClassName='bg-amber-100 dark:bg-amber-900/30 text-amber-600 dark:text-amber-400'- />- </div>- {/* Metrics Table */}- <MetricsTable variants={sortedVariants} winnerKey={results.winnerKey} hasWinner={results.hasWinner} />+ {/* Metrics Table */}+ <MetricsTable variants={sortedVariants} winnerKey={results.winnerKey} hasWinner={results.hasWinner} />- {/* Exposures Table */}- <ExposuresTable variants={sortedVariants} totalExposures={results.totalExposures} />+ {/* Exposures Table */}+ <ExposuresTable variants={sortedVariants} totalExposures={results.totalExposures} />- {/* Hypothesis */}- {experiment.hypothesis && (- <CollapsibleSection title={t('experiments.hypothesisLabel')}>- <Text className='italic' colour='muted'>- "{experiment.hypothesis}"- </Text>- </CollapsibleSection>- )}+ {/* Hypothesis */}+ {experiment.hypothesis && (+ <CollapsibleSection title={t('experiments.hypothesisLabel')}>+ <Text className='italic' colour='muted'>+ "{experiment.hypothesis}"+ </Text>+ </CollapsibleSection>+ )}- {/* Statistical note */}- <div className='rounded-xl border border-gray-200 bg-gray-50 px-4 py-3 dark:border-slate-700 dark:bg-slate-800/50'>- <Text size='xs' colour='muted'>- {t('experiments.statisticalNote')}- </Text>+ {/* Statistical note */}+ <div className='rounded-xl border border-gray-200 bg-gray-50 px-4 py-3 dark:border-slate-700 dark:bg-slate-800/50'>+ <Text size='xs' colour='muted'>+ {t('experiments.statisticalNote')}+ </Text>+ </div></div>- </div>+ </>)}diff --git a/web/app/pages/Project/Experiments/View/ExperimentsView.tsx b/web/app/pages/Project/Experiments/View/ExperimentsView.tsxindex 1add8caac..e04b68861 100644--- a/web/app/pages/Project/Experiments/View/ExperimentsView.tsx+++ b/web/app/pages/Project/Experiments/View/ExperimentsView.tsx@@ -30,6 +30,7 @@ import {type Experiment,type ExperimentStatus,} from '~/api'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { useViewProjectContext } from '~/pages/Project/View/ViewProject'import { useCurrentProject } from '~/providers/CurrentProjectProvider'import { Badge } from '~/ui/Badge'@@ -470,73 +471,76 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsVi}return (- <div className='mt-4'>- {isLoading && !_isEmpty(experiments) ? <LoadingBar /> : null}- {_isEmpty(experiments) ? (- <div className='mt-5 rounded-xl bg-gray-700 p-5'>- <div className='flex items-center text-gray-50'>- <FlaskConicalIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />- <p className='text-3xl font-bold'>{t('experiments.title')}</p>- </div>- <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('experiments.description')}</p>- <Button- onClick={handleNewExperiment}- className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-indigo-50 md:px-4'- secondary- large- >- {t('experiments.create')}- </Button>- </div>- ) : (- <>- {/* Header with add button */}- <div className='mb-4 flex items-center justify-between'>- <Text as='h2' size='lg' weight='semibold'>- {t('experiments.title')}- </Text>- <Button onClick={handleNewExperiment} primary regular>- <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ <>+ <DashboardHeader showLiveVisitors />+ <div className='mt-4'>+ {isLoading && !_isEmpty(experiments) ? <LoadingBar /> : null}+ {_isEmpty(experiments) ? (+ <div className='mt-5 rounded-xl bg-gray-700 p-5'>+ <div className='flex items-center text-gray-50'>+ <FlaskConicalIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <p className='text-3xl font-bold'>{t('experiments.title')}</p>+ </div>+ <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('experiments.description')}</p>+ <Button+ onClick={handleNewExperiment}+ className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-indigo-50 md:px-4'+ secondary+ large+ >{t('experiments.create')}</Button></div>+ ) : (+ <>+ {/* Header with add button */}+ <div className='mb-4 flex items-center justify-between'>+ <Text as='h2' size='lg' weight='semibold'>+ {t('experiments.title')}+ </Text>+ <Button onClick={handleNewExperiment} primary regular>+ <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ {t('experiments.create')}+ </Button>+ </div>- {/* Experiments list */}- <ul className='mt-4'>- {_map(experiments, (experiment) => (- <ExperimentRow- key={experiment.id}- experiment={experiment}- onDelete={handleDeleteExperiment}- onEdit={handleEditExperiment}- onStart={handleStartExperiment}- onPause={handlePauseExperiment}- onComplete={handleCompleteExperiment}- onViewResults={handleViewResults}- />- ))}- </ul>- </>- )}- {pageAmount > 1 ? (- <Pagination- className='mt-4'- page={page}- pageAmount={pageAmount}- setPage={setPage}- total={total}- pageSize={DEFAULT_EXPERIMENTS_TAKE}+ {/* Experiments list */}+ <ul className='mt-4'>+ {_map(experiments, (experiment) => (+ <ExperimentRow+ key={experiment.id}+ experiment={experiment}+ onDelete={handleDeleteExperiment}+ onEdit={handleEditExperiment}+ onStart={handleStartExperiment}+ onPause={handlePauseExperiment}+ onComplete={handleCompleteExperiment}+ onViewResults={handleViewResults}+ />+ ))}+ </ul>+ </>+ )}+ {pageAmount > 1 ? (+ <Pagination+ className='mt-4'+ page={page}+ pageAmount={pageAmount}+ setPage={setPage}+ total={total}+ pageSize={DEFAULT_EXPERIMENTS_TAKE}+ />+ ) : null}++ <ExperimentSettingsModal+ isOpen={isModalOpen}+ onClose={handleCloseModal}+ onSuccess={handleModalSuccess}+ projectId={id}+ experimentId={editingExperimentId}/>- ) : null}-- <ExperimentSettingsModal- isOpen={isModalOpen}- onClose={handleCloseModal}- onSuccess={handleModalSuccess}- projectId={id}- experimentId={editingExperimentId}- />- </div>+ </div>+ </>)}diff --git a/web/app/pages/Project/FeatureFlags/View/FeatureFlagsView.tsx b/web/app/pages/Project/FeatureFlags/View/FeatureFlagsView.tsxindex 8b693fc49..cfdfe060e 100644--- a/web/app/pages/Project/FeatureFlags/View/FeatureFlagsView.tsx+++ b/web/app/pages/Project/FeatureFlags/View/FeatureFlagsView.tsx@@ -37,6 +37,7 @@ import {type FeatureFlagStats,type FeatureFlagProfile,} from '~/api'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { useViewProjectContext } from '~/pages/Project/View/ViewProject'import { useCurrentProject } from '~/providers/CurrentProjectProvider'import { Badge } from '~/ui/Badge'@@ -782,100 +783,106 @@ const FeatureFlagsView = ({ period, from = '', to = '', timezone }: FeatureFlags}return (- <div className='mt-4'>- {isLoading && !_isEmpty(flags) ? <LoadingBar /> : null}- {_isEmpty(flags) ? (- <div className='mt-5 rounded-xl bg-gray-700 p-5'>- <div className='flex items-center text-gray-50'>- <FlagIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />- <p className='text-3xl font-bold'>{t('featureFlags.title')}</p>- </div>- <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('featureFlags.description')}</p>- <Button- onClick={handleNewFlag}- className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-indigo-50 md:px-4'- secondary- large- >- {t('featureFlags.add')}- </Button>- </div>- ) : (- <>- {/* Header with filter and add button */}- <div className='mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between'>- <div className='relative'>- <SearchIcon className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400' strokeWidth={1.5} />- <input- type='text'- placeholder={t('featureFlags.filterFlags')}- value={filterQuery}- onChange={handleSearchChange}- className='w-full rounded-lg border border-gray-300 bg-white py-2 pr-4 pl-9 text-sm text-gray-900 placeholder-gray-500 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-none sm:w-64 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-100 dark:placeholder-gray-400 dark:focus:border-indigo-400 dark:focus:ring-indigo-400'- />+ <>+ <DashboardHeader showLiveVisitors />+ <div className='mt-4'>+ {isLoading && !_isEmpty(flags) ? <LoadingBar /> : null}+ {_isEmpty(flags) ? (+ <div className='mt-5 rounded-xl bg-gray-700 p-5'>+ <div className='flex items-center text-gray-50'>+ <FlagIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <p className='text-3xl font-bold'>{t('featureFlags.title')}</p></div>- <Button onClick={handleNewFlag} primary regular>- <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />- {t('featureFlags.addFlag')}+ <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('featureFlags.description')}</p>+ <Button+ onClick={handleNewFlag}+ className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-indigo-50 md:px-4'+ secondary+ large+ >+ {t('featureFlags.add')}</Button></div>-- {/* Flags list */}- <ul className='mt-4'>- {_map(flags, (flag) => {- const profiles = flagProfiles[flag.id] || []- const profilesTotal = flagProfilesTotal[flag.id] || 0- const canLoadMore = profiles.length < profilesTotal-- return (- <FeatureFlagRow- key={flag.id}- flag={flag}- stats={flagStats[flag.id] || null}- statsLoading={statsLoading[flag.id] || false}- isExpanded={expandedFlagId === flag.id}- profiles={profiles}- profilesLoading={profilesLoading[flag.id] || false}- canLoadMoreProfiles={canLoadMore}- resultFilter={flagResultFilters[flag.id] ?? true}- onDelete={handleDeleteFlag}- onEdit={handleEditFlag}- onToggle={handleToggleFlag}- onToggleExpand={handleToggleExpand}- onLoadMoreProfiles={handleLoadMoreProfiles}- onResultFilterChange={handleResultFilterChange}- timeFormat={timeFormat}+ ) : (+ <>+ {/* Header with filter and add button */}+ <div className='mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between'>+ <div className='relative'>+ <SearchIcon+ className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400'+ strokeWidth={1.5}+ />+ <input+ type='text'+ placeholder={t('featureFlags.filterFlags')}+ value={filterQuery}+ onChange={handleSearchChange}+ className='w-full rounded-lg border border-gray-300 bg-white py-2 pr-4 pl-9 text-sm text-gray-900 placeholder-gray-500 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-none sm:w-64 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-100 dark:placeholder-gray-400 dark:focus:border-indigo-400 dark:focus:ring-indigo-400'/>- )- })}- </ul>+ </div>+ <Button onClick={handleNewFlag} primary regular>+ <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ {t('featureFlags.addFlag')}+ </Button>+ </div>- {flags.length === 0 && filterQuery ? (- <p className='py-8 text-center text-sm text-gray-500 dark:text-gray-400'>- {t('featureFlags.noFlagsMatchFilter')}- </p>- ) : null}- </>- )}- {pageAmount > 1 ? (- <Pagination- className='mt-4'- page={page}- pageAmount={pageAmount}- setPage={setPage}- total={total}- pageSize={DEFAULT_FEATURE_FLAGS_TAKE}+ {/* Flags list */}+ <ul className='mt-4'>+ {_map(flags, (flag) => {+ const profiles = flagProfiles[flag.id] || []+ const profilesTotal = flagProfilesTotal[flag.id] || 0+ const canLoadMore = profiles.length < profilesTotal++ return (+ <FeatureFlagRow+ key={flag.id}+ flag={flag}+ stats={flagStats[flag.id] || null}+ statsLoading={statsLoading[flag.id] || false}+ isExpanded={expandedFlagId === flag.id}+ profiles={profiles}+ profilesLoading={profilesLoading[flag.id] || false}+ canLoadMoreProfiles={canLoadMore}+ resultFilter={flagResultFilters[flag.id] ?? true}+ onDelete={handleDeleteFlag}+ onEdit={handleEditFlag}+ onToggle={handleToggleFlag}+ onToggleExpand={handleToggleExpand}+ onLoadMoreProfiles={handleLoadMoreProfiles}+ onResultFilterChange={handleResultFilterChange}+ timeFormat={timeFormat}+ />+ )+ })}+ </ul>++ {flags.length === 0 && filterQuery ? (+ <p className='py-8 text-center text-sm text-gray-500 dark:text-gray-400'>+ {t('featureFlags.noFlagsMatchFilter')}+ </p>+ ) : null}+ </>+ )}+ {pageAmount > 1 ? (+ <Pagination+ className='mt-4'+ page={page}+ pageAmount={pageAmount}+ setPage={setPage}+ total={total}+ pageSize={DEFAULT_FEATURE_FLAGS_TAKE}+ />+ ) : null}++ <FeatureFlagSettingsModal+ isOpen={isModalOpen}+ onClose={handleCloseModal}+ onSuccess={handleModalSuccess}+ projectId={id}+ flagId={editingFlagId}/>- ) : null}-- <FeatureFlagSettingsModal- isOpen={isModalOpen}- onClose={handleCloseModal}- onSuccess={handleModalSuccess}- projectId={id}- flagId={editingFlagId}- />- </div>+ </div>+ </>)}diff --git a/web/app/pages/Project/Funnels/View/FunnelsView.tsx b/web/app/pages/Project/Funnels/View/FunnelsView.tsxindex 1d9c3f3b7..0328e72a2 100644--- a/web/app/pages/Project/Funnels/View/FunnelsView.tsx+++ b/web/app/pages/Project/Funnels/View/FunnelsView.tsx@@ -3,25 +3,23 @@ import _filter from 'lodash/filter'import _find from 'lodash/find'import _includes from 'lodash/includes'import _isEmpty from 'lodash/isEmpty'-import { ChevronLeftIcon, FilterIcon } from 'lucide-react'+import { FilterIcon } from 'lucide-react'import { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'import { Link, useSearchParams } from 'react-router'import { toast } from 'sonner'import { addFunnel, updateFunnel, deleteFunnel, getFunnelData, getFunnels } from '~/api'-import { MAX_MONTHS_IN_PAST, FUNNELS_PERIOD_PAIRS } from '~/lib/constants'+import { FUNNELS_PERIOD_PAIRS } from '~/lib/constants'import { Funnel, AnalyticsFunnel } from '~/lib/models/Project'import NewFunnel from '~/modals/NewFunnel'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { FunnelChart } from '~/pages/Project/View/components/FunnelChart'import FunnelsList from '~/pages/Project/View/components/FunnelsList'-import { RefreshStatsButton } from '~/pages/Project/View/components/RefreshStatsButton'-import TBPeriodSelector from '~/pages/Project/View/components/TBPeriodSelector'import { useViewProjectContext } from '~/pages/Project/View/ViewProject'import { getFormatDate } from '~/pages/Project/View/ViewProject.helpers'import { useAuth } from '~/providers/AuthProvider'import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'-import DatePicker from '~/ui/Datepicker'import Loader from '~/ui/Loader'import { Text } from '~/ui/Text'import { nLocaleFormatter } from '~/utils/generic'@@ -256,64 +254,18 @@ const FunnelsView = () => {if (activeFunnel) {return (<>- {/* Funnel Header */}- <div className='relative top-0 z-20 -mt-2 flex flex-col items-center justify-between bg-gray-50/50 py-2 backdrop-blur-md lg:sticky lg:flex-row dark:bg-slate-900/50'>- <div className='flex flex-wrap items-center justify-center gap-2'>- <Text as='h2' size='xl' weight='bold' className='break-words break-all'>+ <DashboardHeader+ backLink={`?${pureSearchParams}`}+ showLiveVisitors={false}+ showSearchButton={false}+ hideTimeBucket+ timeBucketSelectorItems={timeBucketSelectorItems}+ leftContent={+ <Text as='h2' size='xl' weight='bold' className='wrap-break-word break-all'>{activeFunnel?.name}</Text>- </div>- <div className='mx-auto mt-3 flex w-full max-w-[420px] flex-wrap items-center justify-center gap-x-2 gap-y-1 sm:mx-0 sm:w-auto sm:max-w-none sm:flex-nowrap sm:justify-between lg:mt-0'>- <RefreshStatsButton onRefresh={refreshStats} />- <div className='flex items-center'>- <TBPeriodSelector- activePeriod={activePeriod}- items={timeBucketSelectorItems}- title={activePeriod?.label}- onSelect={(pair) => {- if (dataLoading) {- return- }-- if (pair.isCustomDate) {- setTimeout(() => {- refCalendar.current?.openCalendar?.()- }, 100)- } else {- resetDateRange()- updatePeriod(pair)- }- }}- />- <DatePicker- ref={refCalendar}- onChange={([from, to]) => {- const newSearchParams = new URLSearchParams(searchParams.toString())- newSearchParams.set('from', from.toISOString())- newSearchParams.set('to', to.toISOString())- newSearchParams.set('period', 'custom')- setSearchParams(newSearchParams)- }}- value={dateRange || []}- maxDateMonths={MAX_MONTHS_IN_PAST}- maxRange={0}- />- </div>- </div>- </div>-- {/* Back to funnels link */}- <div className='mx-auto mt-2 mb-4 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.backToFunnels')}- </Link>- </div>+ }+ />{/* Funnel Chart */}<divdiff --git a/web/app/pages/Project/Goals/View/GoalsView.tsx b/web/app/pages/Project/Goals/View/GoalsView.tsxindex 985a0bca4..9a2bf97b0 100644--- a/web/app/pages/Project/Goals/View/GoalsView.tsx+++ b/web/app/pages/Project/Goals/View/GoalsView.tsx@@ -40,6 +40,7 @@ import {tbsFormatMapperTooltip24h,chartTypes,} from '~/lib/constants'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { useViewProjectContext } from '~/pages/Project/View/ViewProject'import { useCurrentProject } from '~/providers/CurrentProjectProvider'import BillboardChart from '~/ui/BillboardChart'@@ -663,88 +664,96 @@ const GoalsView = ({ period, from = '', to = '', timezone }: GoalsViewProps) =>}return (- <div className='mt-4'>- {isLoading && !_isEmpty(goals) ? <LoadingBar /> : null}- {_isEmpty(goals) ? (- <div className='mt-5 rounded-xl bg-gray-700 p-5'>- <div className='flex items-center text-gray-50'>- <TargetIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />- <p className='text-3xl font-bold'>{t('goals.title')}</p>- </div>- <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('goals.description')}</p>- <Button- onClick={handleNewGoal}- className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-indigo-50 md:px-4'- secondary- large- >- {t('goals.add')}- </Button>- </div>- ) : (- <>- {/* Header with filter and add button */}- <div className='mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between'>- <div className='relative'>- <SearchIcon className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400' strokeWidth={1.5} />- <input- type='text'- placeholder={t('goals.filterGoals')}- value={filterQuery}- onChange={(e) => setFilterQuery(e.target.value)}- className='w-full rounded-lg border border-gray-300 bg-white py-2 pr-4 pl-9 text-sm text-gray-900 placeholder-gray-500 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-none sm:w-64 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-100 dark:placeholder-gray-400 dark:focus:border-indigo-400 dark:focus:ring-indigo-400'- />+ <>+ <DashboardHeader showLiveVisitors />+ <div className='mt-4'>+ {isLoading && !_isEmpty(goals) ? <LoadingBar /> : null}+ {_isEmpty(goals) ? (+ <div className='mt-5 rounded-xl bg-gray-700 p-5'>+ <div className='flex items-center text-gray-50'>+ <TargetIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <p className='text-3xl font-bold'>{t('goals.title')}</p></div>- <Button onClick={handleNewGoal} primary regular>- <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />- {t('goals.addGoal')}+ <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('goals.description')}</p>+ <Button+ onClick={handleNewGoal}+ className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-indigo-50 md:px-4'+ secondary+ large+ >+ {t('goals.add')}</Button></div>+ ) : (+ <>+ {/* Header with filter and add button */}+ <div className='mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between'>+ <div className='relative'>+ <SearchIcon+ className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400'+ strokeWidth={1.5}+ />+ <input+ type='text'+ placeholder={t('goals.filterGoals')}+ value={filterQuery}+ onChange={(e) => setFilterQuery(e.target.value)}+ className='w-full rounded-lg border border-gray-300 bg-white py-2 pr-4 pl-9 text-sm text-gray-900 placeholder-gray-500 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-none sm:w-64 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-100 dark:placeholder-gray-400 dark:focus:border-indigo-400 dark:focus:ring-indigo-400'+ />+ </div>+ <Button onClick={handleNewGoal} primary regular>+ <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ {t('goals.addGoal')}+ </Button>+ </div>- {/* Goals list */}- <ul className='mt-4'>- {_map(filteredGoals, (goal) => (- <GoalRow- key={goal.id}- goal={goal}- stats={goalStats[goal.id] || null}- statsLoading={statsLoading[goal.id] || false}- isExpanded={expandedGoalId === goal.id}- chartData={goalChartData[goal.id] || null}- chartLoading={chartLoading[goal.id] || false}- timeBucket={timeBucket}- timeFormat={timeFormat}- onDelete={handleDeleteGoal}- onEdit={handleEditGoal}- onToggleExpand={handleToggleExpand}- />- ))}- </ul>-- {filteredGoals.length === 0 && filterQuery ? (- <p className='py-8 text-center text-sm text-gray-500 dark:text-gray-400'>{t('goals.noGoalsMatchFilter')}</p>- ) : null}- </>- )}- {pageAmount > 1 && !filterQuery ? (- <Pagination- className='mt-4'- page={page}- pageAmount={pageAmount}- setPage={setPage}- total={total}- pageSize={DEFAULT_GOALS_TAKE}+ {/* Goals list */}+ <ul className='mt-4'>+ {_map(filteredGoals, (goal) => (+ <GoalRow+ key={goal.id}+ goal={goal}+ stats={goalStats[goal.id] || null}+ statsLoading={statsLoading[goal.id] || false}+ isExpanded={expandedGoalId === goal.id}+ chartData={goalChartData[goal.id] || null}+ chartLoading={chartLoading[goal.id] || false}+ timeBucket={timeBucket}+ timeFormat={timeFormat}+ onDelete={handleDeleteGoal}+ onEdit={handleEditGoal}+ onToggleExpand={handleToggleExpand}+ />+ ))}+ </ul>++ {filteredGoals.length === 0 && filterQuery ? (+ <p className='py-8 text-center text-sm text-gray-500 dark:text-gray-400'>+ {t('goals.noGoalsMatchFilter')}+ </p>+ ) : null}+ </>+ )}+ {pageAmount > 1 && !filterQuery ? (+ <Pagination+ className='mt-4'+ page={page}+ pageAmount={pageAmount}+ setPage={setPage}+ total={total}+ pageSize={DEFAULT_GOALS_TAKE}+ />+ ) : null}++ <GoalSettingsModal+ isOpen={isModalOpen}+ onClose={handleCloseModal}+ onSuccess={handleModalSuccess}+ projectId={id}+ goalId={editingGoalId}/>- ) : null}-- <GoalSettingsModal- isOpen={isModalOpen}- onClose={handleCloseModal}- onSuccess={handleModalSuccess}- projectId={id}- goalId={editingGoalId}- />- </div>+ </div>+ </>)}diff --git a/web/app/pages/Project/Performance/View/PerformanceView.tsx b/web/app/pages/Project/Performance/View/PerformanceView.tsxindex 271526a21..6751d19d1 100644--- a/web/app/pages/Project/Performance/View/PerformanceView.tsx+++ b/web/app/pages/Project/Performance/View/PerformanceView.tsx@@ -18,6 +18,7 @@ import { CountryEntry } from '~/lib/models/Entry'import { OverallPerformanceObject } from '~/lib/models/Project'import AnnotationModal from '~/modals/AnnotationModal'import CCRow from '~/pages/Project/View/components/CCRow'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { ChartContextMenu } from '~/pages/Project/View/components/ChartContextMenu'import Filters from '~/pages/Project/View/components/Filters'import { PerformanceMetricCards } from '~/pages/Project/View/components/MetricCards'@@ -542,271 +543,274 @@ const PerformanceView = ({ tnMapping }: PerformanceViewProps) => {}return (- <div className={cx('pt-2', { hidden: isPanelsDataEmpty || analyticsLoading })}>- <div className='relative overflow-hidden rounded-lg border border-gray-300 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>- <div className='mb-3 flex w-full items-center justify-end gap-2 lg:absolute lg:top-2 lg:right-2 lg:mb-0 lg:w-auto lg:justify-normal'>- <Dropdown- items={chartMetrics}- className='xs:min-w-0'- header={t('main.metric')}- title={[<EyeIcon key='eye-icon' aria-label={t('project.metricVis')} className='h-5 w-5' />]}- labelExtractor={(pair) => pair.label}- keyExtractor={(pair) => pair.id}- onSelect={({ id: pairID }) => {- setActiveChartMetrics(pairID)- }}- buttonClassName='!px-2 bg-gray-50 rounded-md border border-transparent hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'- chevron='mini'- headless- />- <Dropdown- disabled={activeChartMetrics === CHART_METRICS_MAPPING_PERF.quantiles}- items={chartMeasures}- className='xs:min-w-0'- header={t('project.aggregation')}- title={[<PercentIcon key='percent-icon' aria-label={t('project.aggregation')} className='h-5 w-5' />]}- labelExtractor={(pair) => pair.label}- keyExtractor={(pair) => pair.id}- onSelect={({ id: pairID }) => {- setActiveMeasure(pairID)- }}- buttonClassName='!px-2 bg-gray-50 rounded-md border border-transparent hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'- chevron='mini'- headless- />- <ChartTypeSwitcher onSwitch={setChartTypeOnClick} type={chartType} />- </div>-- {!_isEmpty(overall) ? (- <PerformanceMetricCards- overall={overall}- overallCompare={overallCompare}- activePeriodCompare={activePeriodCompare}- />- ) : null}- {!checkIfAllMetricsAreDisabled && !_isEmpty(chartData) ? (- <div onContextMenu={(e) => handleChartContextMenu(e, chartData?.x)} className='relative'>- <PerformanceChart- chart={chartData}- timeBucket={timeBucket}- activeChartMetrics={activeChartMetrics}- rotateXAxis={rotateXAxis}- chartType={chartType}- timeFormat={timeFormat}- compareChart={chartDataCompare}- onZoom={onMainChartZoom}- enableZoom={shouldEnableZoom}- dataNames={dataNames}- className='mt-5 h-80 md:mt-0 [&_svg]:overflow-visible!'- annotations={annotations}+ <>+ <DashboardHeader />+ <div className={cx('pt-2', { hidden: isPanelsDataEmpty || analyticsLoading })}>+ <div className='relative overflow-hidden rounded-lg border border-gray-300 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>+ <div className='mb-3 flex w-full items-center justify-end gap-2 lg:absolute lg:top-2 lg:right-2 lg:mb-0 lg:w-auto lg:justify-normal'>+ <Dropdown+ items={chartMetrics}+ className='xs:min-w-0'+ header={t('main.metric')}+ title={[<EyeIcon key='eye-icon' aria-label={t('project.metricVis')} className='h-5 w-5' />]}+ labelExtractor={(pair) => pair.label}+ keyExtractor={(pair) => pair.id}+ onSelect={({ id: pairID }) => {+ setActiveChartMetrics(pairID)+ }}+ buttonClassName='!px-2 bg-gray-50 rounded-md border border-transparent hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ chevron='mini'+ headless+ />+ <Dropdown+ disabled={activeChartMetrics === CHART_METRICS_MAPPING_PERF.quantiles}+ items={chartMeasures}+ className='xs:min-w-0'+ header={t('project.aggregation')}+ title={[<PercentIcon key='percent-icon' aria-label={t('project.aggregation')} className='h-5 w-5' />]}+ labelExtractor={(pair) => pair.label}+ keyExtractor={(pair) => pair.id}+ onSelect={({ id: pairID }) => {+ setActiveMeasure(pairID)+ }}+ buttonClassName='!px-2 bg-gray-50 rounded-md border border-transparent hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ chevron='mini'+ headless/>+ <ChartTypeSwitcher onSwitch={setChartTypeOnClick} type={chartType} /></div>- ) : null}- </div>- {!isPanelsDataEmpty ? <Filters tnMapping={tnMapping} /> : null}- <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>- {!_isEmpty(panelsData.types)- ? _map(PERFORMANCE_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: 'map', label: 'Map' },- ]-- const rowMapper = (entry: CountryEntry) => {- const { name: entryName, cc } = entry-- if (cc !== undefined) {- return <CCRow cc={cc} name={entryName || undefined} language={language} />- }- return <CCRow cc={entryName} language={language} />- }-- return (- <Panel- key={activeTabs.location}- icon={panelIconMapping.cc}- id={activeTabs.location}- getFilterLink={getFilterLink}- name={t('project.location')}- tabs={locationTabs}- onTabChange={(tab) =>- setActiveTabs({- ...activeTabs,- location: tab as 'cc' | 'rg' | 'ct' | 'map',- })+ {!_isEmpty(overall) ? (+ <PerformanceMetricCards+ overall={overall}+ overallCompare={overallCompare}+ activePeriodCompare={activePeriodCompare}+ />+ ) : null}+ {!checkIfAllMetricsAreDisabled && !_isEmpty(chartData) ? (+ <div onContextMenu={(e) => handleChartContextMenu(e, chartData?.x)} className='relative'>+ <PerformanceChart+ chart={chartData}+ timeBucket={timeBucket}+ activeChartMetrics={activeChartMetrics}+ rotateXAxis={rotateXAxis}+ chartType={chartType}+ timeFormat={timeFormat}+ compareChart={chartDataCompare}+ onZoom={onMainChartZoom}+ enableZoom={shouldEnableZoom}+ dataNames={dataNames}+ className='mt-5 h-80 md:mt-0 [&_svg]:overflow-visible!'+ annotations={annotations}+ />+ </div>+ ) : null}+ </div>+ {!isPanelsDataEmpty ? <Filters tnMapping={tnMapping} /> : null}+ <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>+ {!_isEmpty(panelsData.types)+ ? _map(PERFORMANCE_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: 'map', label: 'Map' },+ ]++ const rowMapper = (entry: CountryEntry) => {+ const { name: entryName, cc } = entry++ if (cc !== undefined) {+ return <CCRow cc={cc} name={entryName || undefined} language={language} />}- activeTabId={activeTabs.location}- data={panelsData.data[activeTabs.location]}- rowMapper={rowMapper}- // @ts-expect-error- valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}- customRenderer={- activeTabs.location === 'map'- ? () => {- const countryData = panelsData.data?.cc || []- const regionData = panelsData.data?.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>++ return <CCRow cc={entryName} language={language} />+ }++ return (+ <Panel+ key={activeTabs.location}+ icon={panelIconMapping.cc}+ id={activeTabs.location}+ getFilterLink={getFilterLink}+ name={t('project.location')}+ tabs={locationTabs}+ onTabChange={(tab) =>+ setActiveTabs({+ ...activeTabs,+ location: tab as 'cc' | 'rg' | 'ct' | 'map',+ })+ }+ activeTabId={activeTabs.location}+ data={panelsData.data[activeTabs.location]}+ rowMapper={rowMapper}+ // @ts-expect-error+ valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}+ customRenderer={+ activeTabs.location === 'map'+ ? () => {+ const countryData = panelsData.data?.cc || []+ const regionData = panelsData.data?.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>- </div>- }- >- <InteractiveMap- data={countryData}- regionData={regionData}- total={total}- onClick={(type, key) => {- const link = getFilterLink(type, key)- navigate(link)- }}- />- </Suspense>- )- }- : undefined- }- valuesHeaderName={t('project.loadTime')}- highlightColour='orange'- />- )- }-- if (type === 'devices') {- const deviceTabs = [- { id: 'br', label: t('project.mapping.br') },- { id: 'dv', label: t('project.mapping.dv') },- ]-- return (- <Panel- key={activeTabs.device}- icon={panelIconMapping.os}- id={activeTabs.device}- getFilterLink={getFilterLink}- name={t('project.devices')}- tabs={deviceTabs}- onTabChange={(tab) =>- setActiveTabs({- ...activeTabs,- device: tab as 'br' | 'dv',- })- }- activeTabId={activeTabs.device}- data={panelsData.data[activeTabs.device]}- rowMapper={getDeviceRowMapper(activeTabs.device, theme, t)}- capitalize={activeTabs.device === 'dv'}- // @ts-expect-error- valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}- valuesHeaderName={t('project.loadTime')}- highlightColour='orange'- />- )- }-- if (type === 'pg') {- const pageTabs = [- { id: 'pg', label: t('project.mapping.pg') },- {- id: 'host',- label: t('project.mapping.host'),- },- ]-- return (- <Panel- key={activeTabs.page}- icon={panelIconMapping.pg}- id={activeTabs.page}- getFilterLink={getFilterLink}- rowMapper={({ name: entryName }) => {- if (!entryName) {- return (- <span className='italic'>- {activeTabs.page === 'pg' ? t('common.notSet') : t('project.unknownHost')}- </span>- )+ }+ >+ <InteractiveMap+ data={countryData}+ regionData={regionData}+ total={total}+ onClick={(type, key) => {+ const link = getFilterLink(type, key)+ navigate(link)+ }}+ />+ </Suspense>+ )+ }+ : undefined}+ valuesHeaderName={t('project.loadTime')}+ highlightColour='orange'+ />+ )+ }- let decodedUri = entryName as string+ if (type === 'devices') {+ const deviceTabs = [+ { id: 'br', label: t('project.mapping.br') },+ { id: 'dv', label: t('project.mapping.dv') },+ ]++ return (+ <Panel+ key={activeTabs.device}+ icon={panelIconMapping.os}+ id={activeTabs.device}+ getFilterLink={getFilterLink}+ name={t('project.devices')}+ tabs={deviceTabs}+ onTabChange={(tab) =>+ setActiveTabs({+ ...activeTabs,+ device: tab as 'br' | 'dv',+ })+ }+ activeTabId={activeTabs.device}+ data={panelsData.data[activeTabs.device]}+ rowMapper={getDeviceRowMapper(activeTabs.device, theme, t)}+ capitalize={activeTabs.device === 'dv'}+ // @ts-expect-error+ valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}+ valuesHeaderName={t('project.loadTime')}+ highlightColour='orange'+ />+ )+ }- try {- decodedUri = decodeURIComponent(entryName)- } catch {- // do nothing+ if (type === 'pg') {+ const pageTabs = [+ { id: 'pg', label: t('project.mapping.pg') },+ {+ id: 'host',+ label: t('project.mapping.host'),+ },+ ]++ return (+ <Panel+ key={activeTabs.page}+ icon={panelIconMapping.pg}+ id={activeTabs.page}+ getFilterLink={getFilterLink}+ rowMapper={({ name: entryName }) => {+ if (!entryName) {+ return (+ <span className='italic'>+ {activeTabs.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) =>+ setActiveTabs({+ ...activeTabs,+ page: tab as 'pg' | 'host',+ })}+ activeTabId={activeTabs.page}+ data={panelsData.data[activeTabs.page]}+ // @ts-expect-error+ valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}+ valuesHeaderName={t('project.loadTime')}+ highlightColour='orange'+ />+ )+ }- return decodedUri- }}- name={t('project.pages')}- tabs={pageTabs}- onTabChange={(tab) =>- setActiveTabs({- ...activeTabs,- page: tab as 'pg' | 'host',- })- }- activeTabId={activeTabs.page}- data={panelsData.data[activeTabs.page]}- // @ts-expect-error- valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}- valuesHeaderName={t('project.loadTime')}- highlightColour='orange'- />- )- }-- return null- })- : null}+ return null+ })+ : null}+ </div>+ <AnnotationModal+ isOpened={isAnnotationModalOpen}+ onClose={closeAnnotationModal}+ onSubmit={annotationToEdit ? onAnnotationUpdate : onAnnotationCreate}+ onDelete={annotationToEdit ? onAnnotationDelete : undefined}+ loading={annotationActionLoading}+ annotation={annotationToEdit}+ defaultDate={annotationModalDate}+ allowedToManage={allowedToManage}+ />+ <ChartContextMenu+ isOpen={contextMenu.isOpen}+ x={contextMenu.x}+ y={contextMenu.y}+ onClose={closeContextMenu}+ onAddAnnotation={() => {+ openAnnotationModal(contextMenu.date || undefined)+ }}+ onEditAnnotation={+ contextMenu.annotation+ ? () => openAnnotationModal(contextMenu.annotation?.date, contextMenu.annotation!)+ : undefined+ }+ onDeleteAnnotation={+ contextMenu.annotation+ ? () => {+ onAnnotationDelete(contextMenu.annotation!)+ }+ : undefined+ }+ existingAnnotation={contextMenu.annotation}+ allowedToManage={allowedToManage}+ /></div>- <AnnotationModal- isOpened={isAnnotationModalOpen}- onClose={closeAnnotationModal}- onSubmit={annotationToEdit ? onAnnotationUpdate : onAnnotationCreate}- onDelete={annotationToEdit ? onAnnotationDelete : undefined}- loading={annotationActionLoading}- annotation={annotationToEdit}- defaultDate={annotationModalDate}- allowedToManage={allowedToManage}- />- <ChartContextMenu- isOpen={contextMenu.isOpen}- x={contextMenu.x}- y={contextMenu.y}- onClose={closeContextMenu}- onAddAnnotation={() => {- openAnnotationModal(contextMenu.date || undefined)- }}- onEditAnnotation={- contextMenu.annotation- ? () => openAnnotationModal(contextMenu.annotation?.date, contextMenu.annotation!)- : undefined- }- onDeleteAnnotation={- contextMenu.annotation- ? () => {- onAnnotationDelete(contextMenu.annotation!)- }- : undefined- }- existingAnnotation={contextMenu.annotation}- allowedToManage={allowedToManage}- />- </div>+ </>)}diff --git a/web/app/pages/Project/Profiles/View/ProfilesView.tsx b/web/app/pages/Project/Profiles/View/ProfilesView.tsxindex 4cc9ea0e5..cbc10badc 100644--- a/web/app/pages/Project/Profiles/View/ProfilesView.tsx+++ b/web/app/pages/Project/Profiles/View/ProfilesView.tsx@@ -1,14 +1,14 @@import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'-import { ChevronLeftIcon, DownloadIcon } from 'lucide-react'+import { DownloadIcon } from 'lucide-react'import { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'-import { Link, useSearchParams } from 'react-router'+import { useSearchParams } from 'react-router'import { getProfiles, getProfile, getProfileSessions } from '~/api'import { Profile, ProfileDetails, Session } from '~/lib/models/Project'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import NoEvents from '~/pages/Project/View/components/NoEvents'-import { RefreshStatsButton } from '~/pages/Project/View/components/RefreshStatsButton'import { UserDetails } from '~/pages/Project/View/components/UserDetails'import { Users, UsersFilter } from '~/pages/Project/View/components/Users'import { useViewProjectContext } from '~/pages/Project/View/ViewProject'@@ -313,24 +313,15 @@ const ProfilesView = ({ chartType }: ProfilesViewProps) => {// Profile detail viewif (activeProfileId) {+ const backSearchParams = (() => {+ const params = new URLSearchParams(searchParams)+ params.delete('profileId')+ return params.toString()+ })()+return (<>- <div className='mx-auto mt-2 mb-4 flex max-w-max items-center space-x-4 lg:mx-0'>- <Link- to={{- search: (() => {- const params = new URLSearchParams(searchParams)- params.delete('profileId')- return params.toString()- })(),- }}- 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.backToUsers')}- </Link>- <RefreshStatsButton onRefresh={() => loadProfile(activeProfileId)} />- </div>+ <DashboardHeader backLink={`?${backSearchParams}`} showLiveVisitors={false} />{profileLoading ? (<Loader />) : (@@ -355,6 +346,7 @@ const ProfilesView = ({ chartType }: ProfilesViewProps) => {// Profiles list viewreturn (<>+ <DashboardHeader showLiveVisitors /><UsersFilterprofileType={profileTypeFilter}onProfileTypeChange={(type) => {diff --git a/web/app/pages/Project/Sessions/View/SessionsView.tsx b/web/app/pages/Project/Sessions/View/SessionsView.tsxindex 76e9e3c30..6a50e0647 100644--- a/web/app/pages/Project/Sessions/View/SessionsView.tsx+++ b/web/app/pages/Project/Sessions/View/SessionsView.tsx@@ -1,16 +1,16 @@import { XCircleIcon } from '@heroicons/react/24/outline'import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'-import { ChevronLeftIcon, DownloadIcon } from 'lucide-react'+import { DownloadIcon } from 'lucide-react'import { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'import { Link, useSearchParams } from 'react-router'import { getSessions, getSession } from '~/api'import { Session, SessionDetails as SessionDetailsType } from '~/lib/models/Project'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import Filters from '~/pages/Project/View/components/Filters'import NoEvents from '~/pages/Project/View/components/NoEvents'-import { RefreshStatsButton } from '~/pages/Project/View/components/RefreshStatsButton'import { SessionDetailView } from '~/pages/Project/View/components/SessionDetailView'import { Sessions } from '~/pages/Project/View/components/Sessions'import { useViewProjectContext } from '~/pages/Project/View/ViewProject'@@ -284,19 +284,8 @@ const SessionsView = ({ tnMapping, chartType, rotateXAxis }: SessionsViewProps)// Session Detail Viewif (activePSID) {return (- <div className='mt-4'>- <div className='mx-auto mt-2 mb-4 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.backToSessions')}- </Link>- <RefreshStatsButton onRefresh={refreshStats} />- </div>+ <>+ <DashboardHeader backLink={`?${pureSearchParams}`} showLiveVisitors={false} /><SessionDetailViewactiveSession={activeSession}sessionLoading={sessionLoading}@@ -305,41 +294,44 @@ const SessionsView = ({ tnMapping, chartType, rotateXAxis }: SessionsViewProps)rotateXAxis={rotateXAxis}dataNames={dataNames}/>- </div>+ </>)}// Sessions List Viewreturn (- <div className='mt-4'>- {!_isEmpty(sessions) ? <Filters tnMapping={tnMapping} /> : null}- {(sessionsLoading === null || sessionsLoading) && _isEmpty(sessions) ? <Loader /> : null}- {typeof sessionsLoading === 'boolean' && !sessionsLoading && _isEmpty(sessions) ? (- <NoEvents filters={filters} />- ) : null}- <Sessions sessions={sessions} timeFormat={timeFormat} />- {canLoadMoreSessions ? (- <button- type='button'- title={t('project.loadMore')}- onClick={() => loadSessions()}- className={cx(- 'relative mx-auto mt-2 flex items-center rounded-md border border-transparent p-2 text-sm font-medium text-gray-700 hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:bg-slate-900 dark:text-gray-50 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200',- {- 'cursor-not-allowed opacity-50': sessionsLoading || sessionsLoading === null,- hidden: sessionsLoading && _isEmpty(sessions),- },- )}- >- {sessionsLoading ? (- <Spin className='mr-2 size-5' />- ) : (- <DownloadIcon className='mr-2 h-5 w-5' strokeWidth={1.5} />- )}- {t('project.loadMore')}- </button>- ) : null}- </div>+ <>+ <DashboardHeader showLiveVisitors />+ <div className='mt-4'>+ {!_isEmpty(sessions) ? <Filters tnMapping={tnMapping} /> : null}+ {(sessionsLoading === null || sessionsLoading) && _isEmpty(sessions) ? <Loader /> : null}+ {typeof sessionsLoading === 'boolean' && !sessionsLoading && _isEmpty(sessions) ? (+ <NoEvents filters={filters} />+ ) : null}+ <Sessions sessions={sessions} timeFormat={timeFormat} />+ {canLoadMoreSessions ? (+ <button+ type='button'+ title={t('project.loadMore')}+ onClick={() => loadSessions()}+ className={cx(+ 'relative mx-auto mt-2 flex items-center rounded-md border border-transparent p-2 text-sm font-medium text-gray-700 hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:bg-slate-900 dark:text-gray-50 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200',+ {+ 'cursor-not-allowed opacity-50': sessionsLoading || sessionsLoading === null,+ hidden: sessionsLoading && _isEmpty(sessions),+ },+ )}+ >+ {sessionsLoading ? (+ <Spin className='mr-2 size-5' />+ ) : (+ <DownloadIcon className='mr-2 h-5 w-5' strokeWidth={1.5} />+ )}+ {t('project.loadMore')}+ </button>+ ) : null}+ </div>+ </>)}diff --git a/web/app/pages/Project/Traffic/View/TrafficView.tsx b/web/app/pages/Project/Traffic/View/TrafficView.tsxindex 1d2889833..7e6e72c7f 100644--- a/web/app/pages/Project/Traffic/View/TrafficView.tsx+++ b/web/app/pages/Project/Traffic/View/TrafficView.tsx@@ -28,6 +28,7 @@ import { CountryEntry, Entry } from '~/lib/models/Entry'import { OverallObject } from '~/lib/models/Project'import AnnotationModal from '~/modals/AnnotationModal'import CCRow from '~/pages/Project/View/components/CCRow'+import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'import { ChartContextMenu } from '~/pages/Project/View/components/ChartContextMenu'import CustomMetrics from '~/pages/Project/View/components/CustomMetrics'import Filters from '~/pages/Project/View/components/Filters'@@ -86,6 +87,7 @@ interface TrafficViewProps {resetCustomMetrics: () => voidmode: 'periodical' | 'cumulative'sdkInstance: any+ headerRightContent?: React.ReactNode}const TrafficView = ({@@ -96,6 +98,7 @@ const TrafficView = ({resetCustomMetrics,mode,sdkInstance,+ headerRightContent,}: TrafficViewProps) => {const { id, project, allowedToManage } = useCurrentProject()const projectPassword = useProjectPassword(id)@@ -745,455 +748,462 @@ const TrafficView = ({}return (- <div className={cx({ hidden: isPanelsDataEmpty || analyticsLoading })}>- <div className='relative overflow-hidden rounded-lg border border-gray-300 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>- <div className='mb-3 flex w-full items-center justify-end gap-2 lg:absolute lg:top-2 lg:right-2 lg:mb-0 lg:w-auto lg:justify-normal'>- <Dropdown- header={t('project.metricVis')}- items={- isActiveCompare- ? _filter(chartMetrics, (el) => !_includes(FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, el.id))- : chartMetrics- }- title={[<EyeIcon key='eye-icon' aria-label={t('project.metricVis')} className='h-5 w-5' />]}- labelExtractor={(pair) => {- const { label, id: pairID, active, conflicts } = pair-- const conflicted = isConflicted(conflicts)-- if (pairID === CHART_METRICS_MAPPING.customEvents) {- if (_isEmpty(panelsData.customs)) {+ <>+ <DashboardHeader rightContent={headerRightContent} />+ <div className={cx({ hidden: isPanelsDataEmpty || analyticsLoading })}>+ <div className='relative overflow-hidden rounded-lg border border-gray-300 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>+ <div className='mb-3 flex w-full items-center justify-end gap-2 lg:absolute lg:top-2 lg:right-2 lg:mb-0 lg:w-auto lg:justify-normal'>+ <Dropdown+ header={t('project.metricVis')}+ items={+ isActiveCompare+ ? _filter(chartMetrics, (el) => !_includes(FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, el.id))+ : chartMetrics+ }+ title={[<EyeIcon key='eye-icon' aria-label={t('project.metricVis')} className='h-5 w-5' />]}+ labelExtractor={(pair) => {+ const { label, id: pairID, active, conflicts } = pair++ const conflicted = isConflicted(conflicts)++ if (pairID === CHART_METRICS_MAPPING.customEvents) {+ if (_isEmpty(panelsData.customs)) {+ return (+ <span className='flex cursor-not-allowed items-center p-2'>+ <BanIcon className='mr-2 h-4 w-4' strokeWidth={1.5} />+ {label}+ </span>+ )+ }+return (- <span className='flex cursor-not-allowed items-center p-2'>- <BanIcon className='mr-2 h-4 w-4' strokeWidth={1.5} />- {label}- </span>+ <CustomEventsSubmenu+ label={label}+ chartMetricsCustomEvents={chartMetricsCustomEvents}+ switchCustomEventChart={switchCustomEventChart}+ />)}return (- <CustomEventsSubmenu+ <Checkbox+ classes={{+ label: cx('p-2', { hidden: analyticsLoading }),+ }}label={label}- chartMetricsCustomEvents={chartMetricsCustomEvents}- switchCustomEventChart={switchCustomEventChart}+ disabled={conflicted}+ checked={active}+ onChange={() => {+ switchTrafficChartMetric(pairID, conflicts)+ }}/>)- }-- return (- <Checkbox- classes={{- label: cx('p-2', { hidden: analyticsLoading }),- }}- label={label}- disabled={conflicted}- checked={active}- onChange={() => {- switchTrafficChartMetric(pairID, conflicts)- }}- />- )- }}- buttonClassName='!px-2 bg-gray-50 rounded-md border border-transparent hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'- selectItemClassName='p-0'- keyExtractor={(pair) => pair.id}- onSelect={({ id: pairID, conflicts }, e) => {- e?.stopPropagation()- e?.preventDefault()-- if (pairID !== CHART_METRICS_MAPPING.customEvents) {- switchTrafficChartMetric(pairID, conflicts)- }- }}- chevron='mini'- headless- />- <ChartTypeSwitcher onSwitch={setChartTypeOnClick} type={chartType} />- </div>- {!_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>- ))- : null}- </div>- ) : null}- {!checkIfAllMetricsAreDisabled && !_isEmpty(chartData) ? (- <div onContextMenu={(e) => handleChartContextMenu(e, chartData.x)} className='relative'>- <TrafficChart- chartData={chartData}- timeBucket={timeBucket}- activeChartMetrics={activeChartMetrics}- applyRegions={!_includes(noRegionPeriods, activePeriod?.period)}- timeFormat={timeFormat}- rotateXAxis={rotateXAxis}- chartType={chartType}- customEventsChartData={customEventsChartData}- dataChartCompare={dataChartCompare}- onZoom={onMainChartZoom}- enableZoom={shouldEnableZoom}- dataNames={dataNames}- className='mt-5 h-80 md:mt-0 [&_svg]:overflow-visible!'- annotations={annotations}+ }}+ buttonClassName='!px-2 bg-gray-50 rounded-md border border-transparent hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ selectItemClassName='p-0'+ keyExtractor={(pair) => pair.id}+ onSelect={({ id: pairID, conflicts }, e) => {+ e?.stopPropagation()+ e?.preventDefault()++ if (pairID !== CHART_METRICS_MAPPING.customEvents) {+ switchTrafficChartMetric(pairID, conflicts)+ }+ }}+ chevron='mini'+ headless/>+ <ChartTypeSwitcher onSwitch={setChartTypeOnClick} type={chartType} /></div>- ) : null}- </div>- {!isPanelsDataEmpty ? <Filters tnMapping={tnMapping} /> : null}- <CustomMetrics- metrics={customMetrics}- onRemoveMetric={(metricId) => onRemoveCustomMetric(metricId)}- resetMetrics={resetCustomMetrics}- />- <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>- {!_isEmpty(panelsData.types)- ? _map(TRAFFIC_PANELS_ORDER, (type: string) => {- 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 (panelsActiveTabs.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} />- )- }+ {!_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>+ ))+ : null}+ </div>+ ) : null}+ {!checkIfAllMetricsAreDisabled && !_isEmpty(chartData) ? (+ <div onContextMenu={(e) => handleChartContextMenu(e, chartData.x)} className='relative'>+ <TrafficChart+ chartData={chartData}+ timeBucket={timeBucket}+ activeChartMetrics={activeChartMetrics}+ applyRegions={!_includes(noRegionPeriods, activePeriod?.period)}+ timeFormat={timeFormat}+ rotateXAxis={rotateXAxis}+ chartType={chartType}+ customEventsChartData={customEventsChartData}+ dataChartCompare={dataChartCompare}+ onZoom={onMainChartZoom}+ enableZoom={shouldEnableZoom}+ dataNames={dataNames}+ className='mt-5 h-80 md:mt-0 [&_svg]:overflow-visible!'+ annotations={annotations}+ />+ </div>+ ) : null}+ </div>+ {!isPanelsDataEmpty ? <Filters tnMapping={tnMapping} /> : null}+ <CustomMetrics+ metrics={customMetrics}+ onRemoveMetric={(metricId) => onRemoveCustomMetric(metricId)}+ resetMetrics={resetCustomMetrics}+ />+ <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>+ {!_isEmpty(panelsData.types)+ ? _map(TRAFFIC_PANELS_ORDER, (type: string) => {+ 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 (panelsActiveTabs.location === 'lc') {+ if (entryName === null) {+ return <CCRow cc={null} language={language} />+ }- if (cc !== undefined) {- return <CCRow cc={cc} name={entryName || undefined} language={language} />- }+ const entryNameArray = entryName.split('-')+ const displayName = getLocaleDisplayName(entryName, language)- return <CCRow cc={entryName} language={language} />- }+ return (+ <CCRow cc={entryNameArray[entryNameArray.length - 1]} name={displayName} language={language} />+ )+ }- return (- <Panel- key={panelsActiveTabs.location}- icon={panelIconMapping.cc}- id={panelsActiveTabs.location}- getFilterLink={getFilterLink}- name={t('project.location')}- tabs={locationTabs}- onTabChange={(tab) => setPanelTab('location', tab)}- activeTabId={panelsActiveTabs.location}- data={panelsData.data[panelsActiveTabs.location]}- rowMapper={rowMapper}- customRenderer={- panelsActiveTabs.location === 'map'- ? () => {- const countryData = panelsData.data?.cc || []- const regionData = panelsData.data?.rg || []- 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={(mapType, key) => {- const link = getFilterLink(mapType, key)- navigate(link)- }}- />- </Suspense>- )- }- : undefined+ if (cc !== undefined) {+ return <CCRow cc={cc} name={entryName || undefined} language={language} />}- />- )- }- 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 <CCRow cc={entryName} language={language} />+ }- return (- <Panel- key={panelsActiveTabs.device}- icon={panelIconMapping.os}- id={panelsActiveTabs.device}- getFilterLink={getFilterLink}- name={t('project.devices')}- tabs={deviceTabs}- onTabChange={(tab) => setPanelTab('device', tab)}- activeTabId={panelsActiveTabs.device}- data={panelsData.data[panelsActiveTabs.device]}- rowMapper={getDeviceRowMapper(panelsActiveTabs.device, theme, t)}- capitalize={panelsActiveTabs.device === 'dv'}- versionData={- panelsActiveTabs.device === 'br'- ? createVersionDataMapping.browserVersions- : panelsActiveTabs.device === 'os'- ? createVersionDataMapping.osVersions+ return (+ <Panel+ key={panelsActiveTabs.location}+ icon={panelIconMapping.cc}+ id={panelsActiveTabs.location}+ getFilterLink={getFilterLink}+ name={t('project.location')}+ tabs={locationTabs}+ onTabChange={(tab) => setPanelTab('location', tab)}+ activeTabId={panelsActiveTabs.location}+ data={panelsData.data[panelsActiveTabs.location]}+ rowMapper={rowMapper}+ customRenderer={+ panelsActiveTabs.location === 'map'+ ? () => {+ const countryData = panelsData.data?.cc || []+ const regionData = panelsData.data?.rg || []+ 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={(mapType, key) => {+ const link = getFilterLink(mapType, key)+ navigate(link)+ }}+ />+ </Suspense>+ )+ }: undefined- }- getVersionFilterLink={(parent, version) =>- getVersionFilterLink(parent, version, panelsActiveTabs.device === 'br' ? 'br' : 'os')- }- />- )- }+ }+ />+ )+ }- if (type === 'pg') {- const pageTabs = [- { id: 'pg', label: t('project.mapping.pg') },- { id: 'entryPage', label: t('project.entryPages') },- { id: 'exitPage', label: t('project.exitPages') },- { id: 'userFlow', label: t('project.mapping.userFlow') },- {- id: 'host',- label: t('project.mapping.host'),- },- ]+ 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={panelsActiveTabs.page}- icon={panelIconMapping.pg}- id={panelsActiveTabs.page}- getFilterLink={getFilterLink}- rowMapper={({ name: entryName }) => {- if (!entryName) {- return (- <span className='italic'>- {panelsActiveTabs.page === 'host' ? t('project.unknownHost') : t('common.notSet')}- </span>- )+ return (+ <Panel+ key={panelsActiveTabs.device}+ icon={panelIconMapping.os}+ id={panelsActiveTabs.device}+ getFilterLink={getFilterLink}+ name={t('project.devices')}+ tabs={deviceTabs}+ onTabChange={(tab) => setPanelTab('device', tab)}+ activeTabId={panelsActiveTabs.device}+ data={panelsData.data[panelsActiveTabs.device]}+ rowMapper={getDeviceRowMapper(panelsActiveTabs.device, theme, t)}+ capitalize={panelsActiveTabs.device === 'dv'}+ versionData={+ panelsActiveTabs.device === 'br'+ ? createVersionDataMapping.browserVersions+ : panelsActiveTabs.device === 'os'+ ? createVersionDataMapping.osVersions+ : undefined+ }+ getVersionFilterLink={(parent, version) =>+ getVersionFilterLink(parent, version, panelsActiveTabs.device === 'br' ? 'br' : 'os')}+ />+ )+ }- let decodedUri = entryName as string+ if (type === 'pg') {+ const pageTabs = [+ { id: 'pg', label: t('project.mapping.pg') },+ { id: 'entryPage', label: t('project.entryPages') },+ { id: 'exitPage', label: t('project.exitPages') },+ { id: 'userFlow', label: t('project.mapping.userFlow') },+ {+ id: 'host',+ label: t('project.mapping.host'),+ },+ ]- try {- decodedUri = decodeURIComponent(entryName)- } catch {- // do nothing+ return (+ <Panel+ key={panelsActiveTabs.page}+ icon={panelIconMapping.pg}+ id={panelsActiveTabs.page}+ getFilterLink={getFilterLink}+ rowMapper={({ name: entryName }) => {+ if (!entryName) {+ return (+ <span className='italic'>+ {panelsActiveTabs.page === 'host' ? t('project.unknownHost') : t('common.notSet')}+ </span>+ )+ }++ let decodedUri = entryName as string++ try {+ decodedUri = decodeURIComponent(entryName)+ } catch {+ // do nothing+ }++ return decodedUri+ }}+ name={t('project.pages')}+ tabs={pageTabs}+ onTabChange={(tab) => setPanelTab('page', tab)}+ activeTabId={panelsActiveTabs.page}+ data={panelsData.data[panelsActiveTabs.page]}+ customRenderer={+ panelsActiveTabs.page === 'userFlow'+ ? () => <UserFlow isReversed={false} setReversed={() => {}} />+ : undefined}+ />+ )+ }- return decodedUri- }}- name={t('project.pages')}- tabs={pageTabs}- onTabChange={(tab) => setPanelTab('page', tab)}- activeTabId={panelsActiveTabs.page}- data={panelsData.data[panelsActiveTabs.page]}- customRenderer={- panelsActiveTabs.page === 'userFlow'- ? () => <UserFlow isReversed={false} setReversed={() => {}} />- : undefined+ if (type === 'traffic-sources') {+ const hasRefNameFilter = filters.some((f) => f.column === 'refn')+ const trafficSourcesTabs = [+ { id: 'ref', label: t('project.mapping.ref') },+ !isSelfhosted && { id: 'keywords', label: t('project.mapping.keywords') },+ [+ { id: 'so', label: t('project.mapping.so') },+ { id: 'me', label: t('project.mapping.me') },+ { id: 'ca', label: t('project.mapping.ca') },+ { id: 'te', label: t('project.mapping.te') },+ { id: 'co', label: t('project.mapping.co') },+ ],+ ].filter((x) => !!x)++ const getTrafficSourcesRowMapper = (activeTab: string) => {+ if (activeTab === 'ref') {+ // eslint-disable-next-line+ return ({ name: entryName }: any) => <RefRow rowName={entryName} />}- />- )- }-- if (type === 'traffic-sources') {- const hasRefNameFilter = filters.some((f) => f.column === 'refn')- const trafficSourcesTabs = [- { id: 'ref', label: t('project.mapping.ref') },- !isSelfhosted && { id: 'keywords', label: t('project.mapping.keywords') },- [- { id: 'so', label: t('project.mapping.so') },- { id: 'me', label: t('project.mapping.me') },- { id: 'ca', label: t('project.mapping.ca') },- { id: 'te', label: t('project.mapping.te') },- { id: 'co', label: t('project.mapping.co') },- ],- ].filter((x) => !!x)-- const getTrafficSourcesRowMapper = (activeTab: string) => {- if (activeTab === 'ref') {- // eslint-disable-next-line- return ({ name: entryName }: any) => <RefRow rowName={entryName} />+ return ({ name: entryName }: any) => decodeURIComponent(entryName)}- return ({ name: entryName }: any) => decodeURIComponent(entryName)- }- return (- <Panel- key={panelsActiveTabs.source}- icon={panelIconMapping.ref}- id={panelsActiveTabs.source}- getFilterLink={(column: string, value: string | null) => {- if (panelsActiveTabs.source === 'ref') {- // If grouped by name/domain (no refn filter active) -> filter by refn- return getFilterLink(hasRefNameFilter || value === null ? 'ref' : 'refn', value)+ return (+ <Panel+ key={panelsActiveTabs.source}+ icon={panelIconMapping.ref}+ id={panelsActiveTabs.source}+ getFilterLink={(column: string, value: string | null) => {+ if (panelsActiveTabs.source === 'ref') {+ // If grouped by name/domain (no refn filter active) -> filter by refn+ return getFilterLink(hasRefNameFilter || value === null ? 'ref' : 'refn', value)+ }+ return getFilterLink(column, value)+ }}+ name={t('project.trafficSources')}+ tabs={trafficSourcesTabs}+ onTabChange={(tab) => setPanelTab('source', tab)}+ activeTabId={panelsActiveTabs.source}+ data={+ panelsActiveTabs.source === 'keywords'+ ? keywords+ : panelsActiveTabs.source === 'ref'+ ? (() => {+ const raw = panelsData.data?.ref || []+ return hasRefNameFilter+ ? (raw as unknown as Entry[])+ : (groupRefEntries(raw as any) as unknown as Entry[])+ })()+ : (panelsData.data[panelsActiveTabs.source] as unknown as Entry[])}- return getFilterLink(column, value)- }}- name={t('project.trafficSources')}- tabs={trafficSourcesTabs}- onTabChange={(tab) => setPanelTab('source', tab)}- activeTabId={panelsActiveTabs.source}- data={- panelsActiveTabs.source === 'keywords'- ? keywords- : panelsActiveTabs.source === 'ref'- ? (() => {- const raw = panelsData.data?.ref || []- return hasRefNameFilter- ? (raw as unknown as Entry[])- : (groupRefEntries(raw as any) as unknown as Entry[])- })()- : (panelsData.data[panelsActiveTabs.source] as unknown as Entry[])- }- valuesHeaderName={panelsActiveTabs.source === 'keywords' ? t('project.clicks') : undefined}- rowMapper={getTrafficSourcesRowMapper(panelsActiveTabs.source)}- disableRowClick={panelsActiveTabs.source === 'keywords'}- hidePercentageInDetails={panelsActiveTabs.source === 'keywords'}- detailsExtraColumns={- panelsActiveTabs.source === 'keywords'- ? [- {- header: t('project.impressions'),- render: (entry: any) => entry.impressions,- sortLabel: 'impressions',- getSortValue: (entry: any) => Number(entry.impressions || 0),- },- {- header: t('project.position'),- render: (entry: any) => entry.position,- sortLabel: 'position',- getSortValue: (entry: any) => Number(entry.position || 0),- },- {- header: t('project.ctr'),- render: (entry: any) => `${entry.ctr}%`,- sortLabel: 'ctr',- getSortValue: (entry: any) => Number(entry.ctr || 0),- },- ]- : undefined- }- customRenderer={- panelsActiveTabs.source === 'keywords'- ? keywordsLoading- ? () => <Loader />- : keywordsNotConnected- ? () => (- <div className='mt-4 text-center'>- <p className='text-sm text-gray-800 dark:text-gray-200'>- {['owner', 'admin'].includes(project?.role || '')- ? t('project.connectGsc')- : t('project.gscConnectionRequired')}- </p>- {['owner', 'admin'].includes(project?.role || '') ? (- <Link- to={`${routes.project_settings.replace(':id', id)}?tab=integrations`}- className='mt-2 inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-1 text-sm text-gray-800 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'- >- {t('project.goToProjectSettings')}- </Link>- ) : null}- </div>- )- : undefined- : undefined- }- />- )- }+ valuesHeaderName={panelsActiveTabs.source === 'keywords' ? t('project.clicks') : undefined}+ rowMapper={getTrafficSourcesRowMapper(panelsActiveTabs.source)}+ disableRowClick={panelsActiveTabs.source === 'keywords'}+ hidePercentageInDetails={panelsActiveTabs.source === 'keywords'}+ detailsExtraColumns={+ panelsActiveTabs.source === 'keywords'+ ? [+ {+ header: t('project.impressions'),+ render: (entry: any) => entry.impressions,+ sortLabel: 'impressions',+ getSortValue: (entry: any) => Number(entry.impressions || 0),+ },+ {+ header: t('project.position'),+ render: (entry: any) => entry.position,+ sortLabel: 'position',+ getSortValue: (entry: any) => Number(entry.position || 0),+ },+ {+ header: t('project.ctr'),+ render: (entry: any) => `${entry.ctr}%`,+ sortLabel: 'ctr',+ getSortValue: (entry: any) => Number(entry.ctr || 0),+ },+ ]+ : undefined+ }+ customRenderer={+ panelsActiveTabs.source === 'keywords'+ ? keywordsLoading+ ? () => <Loader />+ : keywordsNotConnected+ ? () => (+ <div className='mt-4 text-center'>+ <p className='text-sm text-gray-800 dark:text-gray-200'>+ {['owner', 'admin'].includes(project?.role || '')+ ? t('project.connectGsc')+ : t('project.gscConnectionRequired')}+ </p>+ {['owner', 'admin'].includes(project?.role || '') ? (+ <Link+ to={`${routes.project_settings.replace(':id', id)}?tab=integrations`}+ className='mt-2 inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-1 text-sm text-gray-800 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'+ >+ {t('project.goToProjectSettings')}+ </Link>+ ) : null}+ </div>+ )+ : undefined+ : undefined+ }+ />+ )+ }- return null- })- : null}- {!_isEmpty(panelsData.data) ? (- <MetadataGeneric- customs={panelsData.customs}- properties={panelsData.properties}- filters={filters}- getFilterLink={getFilterLink}- chartData={chartData}- getCustomEventMetadata={getCustomEventMetadata}- getPropertyMetadata={_getPropertyMetadata}- onTabChange={(tab) => setPanelTab('metadata', tab)}- activeTabId={panelsActiveTabs.metadata}- />- ) : null}+ return null+ })+ : null}+ {!_isEmpty(panelsData.data) ? (+ <MetadataGeneric+ customs={panelsData.customs}+ properties={panelsData.properties}+ filters={filters}+ getFilterLink={getFilterLink}+ chartData={chartData}+ getCustomEventMetadata={getCustomEventMetadata}+ getPropertyMetadata={_getPropertyMetadata}+ onTabChange={(tab) => setPanelTab('metadata', tab)}+ activeTabId={panelsActiveTabs.metadata}+ />+ ) : null}+ </div>+ <AnnotationModal+ isOpened={isAnnotationModalOpen}+ onClose={closeAnnotationModal}+ onSubmit={annotationToEdit ? onAnnotationUpdate : onAnnotationCreate}+ onDelete={annotationToEdit ? onAnnotationDelete : undefined}+ loading={annotationActionLoading}+ annotation={annotationToEdit}+ defaultDate={annotationModalDate}+ allowedToManage={allowedToManage}+ />+ <ChartContextMenu+ isOpen={contextMenu.isOpen}+ x={contextMenu.x}+ y={contextMenu.y}+ onClose={closeContextMenu}+ onAddAnnotation={() => {+ openAnnotationModal(contextMenu.date || undefined)+ }}+ onEditAnnotation={+ contextMenu.annotation+ ? () => openAnnotationModal(contextMenu.annotation?.date, contextMenu.annotation!)+ : undefined+ }+ onDeleteAnnotation={+ contextMenu.annotation+ ? () => {+ onAnnotationDelete(contextMenu.annotation!)+ }+ : undefined+ }+ existingAnnotation={contextMenu.annotation}+ allowedToManage={allowedToManage}+ /></div>- <AnnotationModal- isOpened={isAnnotationModalOpen}- onClose={closeAnnotationModal}- onSubmit={annotationToEdit ? onAnnotationUpdate : onAnnotationCreate}- onDelete={annotationToEdit ? onAnnotationDelete : undefined}- loading={annotationActionLoading}- annotation={annotationToEdit}- defaultDate={annotationModalDate}- allowedToManage={allowedToManage}- />- <ChartContextMenu- isOpen={contextMenu.isOpen}- x={contextMenu.x}- y={contextMenu.y}- onClose={closeContextMenu}- onAddAnnotation={() => {- openAnnotationModal(contextMenu.date || undefined)- }}- onEditAnnotation={- contextMenu.annotation- ? () => openAnnotationModal(contextMenu.annotation?.date, contextMenu.annotation!)- : undefined- }- onDeleteAnnotation={- contextMenu.annotation- ? () => {- onAnnotationDelete(contextMenu.annotation!)- }- : undefined- }- existingAnnotation={contextMenu.annotation}- allowedToManage={allowedToManage}- />- </div>+ </>)}diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex cab4804a2..b60da90ad 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -31,7 +31,7 @@ import {import React, { useState, useEffect, useMemo, useRef, useCallback, createContext, useContext, lazy } from 'react'import { useHotkeys } from 'react-hotkeys-hook'import { useTranslation } from 'react-i18next'-import { useNavigate, Link, useSearchParams, LinkProps } from 'react-router'+import { useNavigate, useSearchParams, LinkProps } from 'react-router'import { ClientOnly } from 'remix-utils/client-only'import { toast } from 'sonner'@@ -95,7 +95,6 @@ import TrafficView from '../Traffic/View/TrafficView'import AddAViewModal from './components/AddAViewModal'import { ChartManagerProvider } from './components/ChartManager'const CaptchaView = lazy(() => import('./components/CaptchaView'))-import DashboardHeader from './components/DashboardHeader'// Keywords list now reuses shared Panel UI; dedicated component removed from renderimport LockedDashboard from './components/LockedDashboard'import ProjectSidebar from './components/ProjectSidebar'@@ -157,6 +156,9 @@ interface ViewProjectContextType {setDateRangeCompare: (value: Date[] | null) => voidsetActivePeriodCompare: (value: string) => voidcompareDisable: () => void+ maxRangeCompare: number+ periodPairsCompare: { label: string; period: string }[]+ setPeriodPairsCompare: (value: { label: string; period: string }[]) => void// Chart statechartType: keyof typeof chartTypes@@ -174,9 +176,13 @@ interface ViewProjectContextType {// FunctionsupdatePeriod: (newPeriod: { period: Period; label?: string }) => voidupdateTimebucket: (newTimebucket: TimeBucket) => void+ setShowFiltersSearch: (value: boolean) => void+ resetDateRange: () => void+ refreshStats: (isManual?: boolean) => Promise<void>// RefsrefCalendar: React.RefObject<any>+ refCalendarCompare: React.RefObject<any>}const defaultViewProjectContext: ViewProjectContextType = {@@ -211,6 +217,9 @@ const defaultViewProjectContext: ViewProjectContextType = {setDateRangeCompare: () => {},setActivePeriodCompare: () => {},compareDisable: () => {},+ maxRangeCompare: 0,+ periodPairsCompare: [],+ setPeriodPairsCompare: () => {},// Chart state defaultschartType: chartTypes.line,@@ -227,7 +236,11 @@ const defaultViewProjectContext: ViewProjectContextType = {updatePeriod: () => {},updateTimebucket: (_newTimebucket) => {},+ setShowFiltersSearch: () => {},+ resetDateRange: () => {},+ refreshStats: async () => {},refCalendar: { current: null } as any,+ refCalendarCompare: { current: null } as any,}export const ViewProjectContext = createContext<ViewProjectContextType>(defaultViewProjectContext)@@ -243,7 +256,7 @@ const ViewProjectContent = () => {const { theme, setTheme } = useTheme()- const { isAuthenticated, user, isLoading: authLoading } = useAuth()+ const { user, isLoading: authLoading } = useAuth()const { timezone = DEFAULT_TIMEZONE } = user || {}@@ -419,7 +432,7 @@ const ViewProjectContent = () => {const [isHotkeysHelpOpened, setIsHotkeysHelpOpened] = useState(false)// Check if we're viewing a specific session detail- const activePSID = useMemo(() => {+ const _activePSID = useMemo(() => {return searchParams.get('psid')}, [searchParams])@@ -470,21 +483,24 @@ const ViewProjectContent = () => {setProjectViewDeleting(false)}- const getVersionFilterLink = (parent: string | null, version: string | null, panelType: 'br' | 'os') => {- const filterParams = new URLSearchParams(searchParams.toString())-- if (panelType === 'br') {- // Apply both browser and browser version filters together- filterParams.set('br', parent ?? 'null')- filterParams.set('brv', version ?? 'null')- } else if (panelType === 'os') {- // Apply both OS and OS version filters together- filterParams.set('os', parent ?? 'null')- filterParams.set('osv', version ?? 'null')- }+ const getVersionFilterLink = useCallback(+ (parent: string | null, version: string | null, panelType: 'br' | 'os') => {+ const filterParams = new URLSearchParams(searchParams.toString())++ if (panelType === 'br') {+ // Apply both browser and browser version filters together+ filterParams.set('br', parent ?? 'null')+ filterParams.set('brv', version ?? 'null')+ } else if (panelType === 'os') {+ // Apply both OS and OS version filters together+ filterParams.set('os', parent ?? 'null')+ filterParams.set('osv', version ?? 'null')+ }- return `?${filterParams.toString()}`- }+ return `?${filterParams.toString()}`+ },+ [searchParams],+ )const timeFormat = useMemo<'12-hour' | '24-hour'>(() => user?.timeFormat || TimeFormat['12-hour'], [user])const [ref, size] = useSize()@@ -531,7 +547,7 @@ const ViewProjectContent = () => {document.title = pageTitle}, [project, user, liveVisitors, t])- const timeBucketSelectorItems = useMemo(() => {+ const _timeBucketSelectorItems = useMemo(() => {if (activeTab === PROJECT_TABS.errors) {return _filter(periodPairs, (el) => {return _includes(ERROR_PERIOD_PAIRS, el.period)@@ -603,11 +619,6 @@ const ViewProjectContent = () => {label: t('dashboard.goals'),icon: TargetIcon,},- {- id: PROJECT_TABS.experiments,- label: t('dashboard.experiments'),- icon: FlaskConicalIcon,- },{id: PROJECT_TABS.featureFlags,label: t('dashboard.featureFlags'),@@ -646,6 +657,11 @@ const ViewProjectContent = () => {label: t('common.captcha'),icon: PuzzleIcon,},+ {+ id: PROJECT_TABS.experiments,+ label: t('dashboard.experiments'),+ icon: FlaskConicalIcon,+ },...adminTabs,].filter((x) => !!x)@@ -658,11 +674,11 @@ const ViewProjectContent = () => {const activeTabLabel = useMemo(() => _find(tabs, (tab) => tab.id === activeTab)?.label, [tabs, activeTab])- const compareDisable = () => {+ const compareDisable = useCallback(() => {setIsActiveCompare(false)setDateRangeCompare(null)setActivePeriodCompare(periodPairsCompare[0].period)- }+ }, [periodPairsCompare])const onCustomMetric = (metrics: ProjectViewCustomEvent[]) => {if (activeTab !== PROJECT_TABS.traffic) {@@ -897,69 +913,78 @@ const ViewProjectContent = () => {}, [dataLoading])// We can assume period provided is never custom, as it's handled separately in the Datepicker callback function- const updatePeriod = ({ period: newPeriod }: { period: Period }) => {- if (period === newPeriod) {- return- }+ const updatePeriod = useCallback(+ ({ period: newPeriod }: { period: Period }) => {+ if (period === newPeriod) {+ return+ }- const newSearchParams = new URLSearchParams(searchParams.toString())- newSearchParams.delete('from')- newSearchParams.delete('to')- newSearchParams.set('period', newPeriod)+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.delete('from')+ newSearchParams.delete('to')+ newSearchParams.set('period', newPeriod)- updatePreferences({- period: newPeriod,- rangeDate: undefined,- })+ updatePreferences({+ period: newPeriod,+ rangeDate: undefined,+ })- sdkInstance?._emitEvent('timeupdate', {- period: newPeriod,- dateRange: null,- })+ sdkInstance?._emitEvent('timeupdate', {+ period: newPeriod,+ dateRange: null,+ })- setSearchParams(newSearchParams)- }+ setSearchParams(newSearchParams)+ },+ [period, searchParams, setSearchParams, sdkInstance, updatePreferences],+ )- const updateTimebucket = (newTimebucket: TimeBucket) => {- if (dataLoading) {- return- }+ const updateTimebucket = useCallback(+ (newTimebucket: TimeBucket) => {+ if (dataLoading) {+ return+ }- const newSearchParams = new URLSearchParams(searchParams.toString())- newSearchParams.set('timeBucket', newTimebucket)- setSearchParams(newSearchParams)+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.set('timeBucket', newTimebucket)+ setSearchParams(newSearchParams)- updatePreferences({- timeBucket: newTimebucket,- })- sdkInstance?._emitEvent('timeupdate', {- period,- timeBucket: newTimebucket,- dateRange,- })- }+ updatePreferences({+ timeBucket: newTimebucket,+ })+ sdkInstance?._emitEvent('timeupdate', {+ period,+ timeBucket: newTimebucket,+ dateRange,+ })+ },+ [dataLoading, searchParams, setSearchParams, sdkInstance, period, dateRange, updatePreferences],+ )const openSettingsHandler = () => {navigate(_replace(routes.project_settings, ':id', id))}- const onMainChartZoom = (domain: [Date, Date] | null) => {- if (!domain) {- return- }+ const onMainChartZoom = useCallback(+ (domain: [Date, Date] | null) => {+ if (!domain) {+ return+ }- const [from, to] = domain- const newSearchParams = new URLSearchParams(searchParams.toString())+ const [from, to] = domain+ const newSearchParams = new URLSearchParams(searchParams.toString())- // Format dates based on time bucket precision- let fromFormatted = from.toISOString().split('T')[0] + 'T00:00:00.000Z'- let toFormatted = to.toISOString().split('T')[0] + 'T23:59:59.999Z'+ // Format dates based on time bucket precision+ let fromFormatted = from.toISOString().split('T')[0] + 'T00:00:00.000Z'+ let toFormatted = to.toISOString().split('T')[0] + 'T23:59:59.999Z'- newSearchParams.set('from', fromFormatted)- newSearchParams.set('to', toFormatted)- newSearchParams.set('period', 'custom')- setSearchParams(newSearchParams)- }+ newSearchParams.set('from', fromFormatted)+ newSearchParams.set('to', toFormatted)+ newSearchParams.set('period', 'custom')+ setSearchParams(newSearchParams)+ },+ [searchParams, setSearchParams],+ )// Detect touch-capable devices (mobile/tablets) to avoid accidental zoom while scrollingconst isTouchDevice = useMemo(() => {@@ -984,27 +1009,30 @@ const ViewProjectContent = () => {return daysDiff > 1}, [period, dateRange, isTouchDevice])- const getFilterLink = (column: string, value: string | null): LinkProps['to'] => {- const isFilterActive = filters.findIndex((filter) => filter.column === column && filter.filter === value) >= 0+ 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())- let searchString = ''-- if (isFilterActive) {- newSearchParams.delete(column, value ?? 'null')- newSearchParams.delete(`!${column}`, value ?? 'null')- newSearchParams.delete(`~${column}`, value ?? 'null')- newSearchParams.delete(`^${column}`, value ?? 'null')- searchString = newSearchParams.toString()- } else {- newSearchParams.append(column, value ?? 'null')- searchString = newSearchParams.toString()- }+ const newSearchParams = new URLSearchParams(searchParams.toString())+ let searchString = ''- return {- search: searchString,- }- }+ if (isFilterActive) {+ newSearchParams.delete(column, value ?? 'null')+ newSearchParams.delete(`!${column}`, value ?? 'null')+ newSearchParams.delete(`~${column}`, value ?? 'null')+ newSearchParams.delete(`^${column}`, value ?? 'null')+ searchString = newSearchParams.toString()+ } else {+ newSearchParams.append(column, value ?? 'null')+ searchString = newSearchParams.toString()+ }++ return {+ search: searchString,+ }+ },+ [filters, searchParams],+ )const exportTypes = [{@@ -1015,17 +1043,17 @@ const ViewProjectContent = () => {},]- const setChartTypeOnClick = (type: keyof typeof chartTypes) => {+ const setChartTypeOnClick = useCallback((type: keyof typeof chartTypes) => {setItem('chartType', type)setChartType(type)- }+ }, [])- const resetDateRange = () => {+ const resetDateRange = useCallback(() => {const newSearchParams = new URLSearchParams(searchParams.toString())newSearchParams.delete('from')newSearchParams.delete('to')setSearchParams(newSearchParams)- }+ }, [searchParams, setSearchParams])/* KEYBOARD SHORTCUTS */const generalShortcutsActions = {@@ -1172,6 +1200,9 @@ const ViewProjectContent = () => {setDateRangeCompare,setActivePeriodCompare,compareDisable,+ maxRangeCompare,+ periodPairsCompare,+ setPeriodPairsCompare,// Chart statechartType,@@ -1189,9 +1220,13 @@ const ViewProjectContent = () => {// FunctionsupdatePeriod,updateTimebucket,+ setShowFiltersSearch,+ resetDateRange,+ refreshStats,// RefsrefCalendar,+ refCalendarCompare,}),[timezone,@@ -1223,6 +1258,9 @@ const ViewProjectContent = () => {setDateRangeCompare,setActivePeriodCompare,compareDisable,+ maxRangeCompare,+ periodPairsCompare,+ setPeriodPairsCompare,chartType,setChartTypeOnClick,rotateXAxis,@@ -1232,7 +1270,11 @@ const ViewProjectContent = () => {getVersionFilterLink,updatePeriod,updateTimebucket,+ setShowFiltersSearch,+ resetDateRange,+ refreshStats,refCalendar,+ refCalendarCompare,],)@@ -1370,76 +1412,44 @@ const ViewProjectContent = () => {exit={{ opacity: 0 }}transition={{ duration: 0.15 }}>- {activeTab !== PROJECT_TABS.alerts &&- activeTab !== PROJECT_TABS.ai &&- activeTab !== PROJECT_TABS.funnels &&- (activeTab !== PROJECT_TABS.sessions || !activePSID) ? (- <DashboardHeader- refreshStats={refreshStats}- timeBucketSelectorItems={timeBucketSelectorItems}- isActiveCompare={isActiveCompare}- setIsActiveCompare={setIsActiveCompare}- compareDisable={compareDisable}- maxRangeCompare={maxRangeCompare}- dateRangeCompare={dateRangeCompare}- setDateRangeCompare={setDateRangeCompare}- activePeriodCompare={activePeriodCompare}- setActivePeriodCompare={setActivePeriodCompare}- periodPairsCompare={periodPairsCompare}- setPeriodPairsCompare={setPeriodPairsCompare}- setShowFiltersSearch={setShowFiltersSearch}- resetDateRange={resetDateRange}- refCalendar={refCalendar}- refCalendarCompare={refCalendarCompare}- showSearchButton={activeTab !== PROJECT_TABS.errors}- hideTimeBucket={activeTab === PROJECT_TABS.errors}- rightContent={- activeTab === PROJECT_TABS.traffic ? (- <TrafficHeaderActions- projectViews={projectViews}- projectViewsLoading={projectViewsLoading}- projectViewDeleting={projectViewDeleting}- loadProjectViews={loadProjectViews}- onProjectViewDelete={onProjectViewDelete}- setProjectViewToUpdate={setProjectViewToUpdate}- setIsAddAViewOpened={setIsAddAViewOpened}- onCustomMetric={onCustomMetric}- filters={filters}- allowedToManage={allowedToManage}- dataLoading={dataLoading}- exportTypes={exportTypes}- customExportTypes={customExportTypes}- panelsData={_panelsData}- />- ) : null+ {activeTab === PROJECT_TABS.ai ? <AskAIView projectId={id} /> : null}+ {activeTab === PROJECT_TABS.traffic ? (+ <TrafficView+ tnMapping={tnMapping}+ customMetrics={customMetrics}+ onCustomMetric={onCustomMetric}+ onRemoveCustomMetric={onRemoveCustomMetric}+ resetCustomMetrics={resetCustomMetrics}+ mode={mode}+ sdkInstance={sdkInstance}+ headerRightContent={+ <TrafficHeaderActions+ projectViews={projectViews}+ projectViewsLoading={projectViewsLoading}+ projectViewDeleting={projectViewDeleting}+ loadProjectViews={loadProjectViews}+ onProjectViewDelete={onProjectViewDelete}+ setProjectViewToUpdate={setProjectViewToUpdate}+ setIsAddAViewOpened={setIsAddAViewOpened}+ onCustomMetric={onCustomMetric}+ filters={filters}+ allowedToManage={allowedToManage}+ dataLoading={dataLoading}+ exportTypes={exportTypes}+ customExportTypes={customExportTypes}+ panelsData={_panelsData}+ />}/>) : null}- {activeTab === PROJECT_TABS.alerts && (project.role !== 'owner' || !isAuthenticated) ? (- <div className='mt-5 rounded-xl bg-gray-700 p-5'>- <div className='flex items-center text-gray-50'>- <BellRingIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />- <p className='text-3xl font-bold'>{t('dashboard.alerts')}</p>- </div>- <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>{t('dashboard.alertsDesc')}</p>- <Link- to={routes.signup}- className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-slate-900 hover:bg-indigo-50 md:px-4'- aria-label={t('titles.signup')}- >- {t('header.startForFree')}- </Link>- </div>- ) : null}+ {activeTab === PROJECT_TABS.performance ? <PerformanceView tnMapping={tnMapping} /> : null}{activeTab === PROJECT_TABS.funnels ? <FunnelsView /> : null}+ {activeTab === PROJECT_TABS.alerts ? <ProjectAlertsView /> : null}{activeTab === PROJECT_TABS.profiles ? <ProfilesView chartType={chartType} /> : null}{activeTab === PROJECT_TABS.sessions ? (<SessionsView tnMapping={tnMapping} chartType={chartType} rotateXAxis={rotateXAxis} />) : null}{activeTab === PROJECT_TABS.errors ? <ErrorsView /> : null}- {activeTab === PROJECT_TABS.alerts && project.role === 'owner' && isAuthenticated ? (- <ProjectAlertsView />- ) : null}{activeTab === PROJECT_TABS.goals ? (<GoalsViewperiod={period}@@ -1464,20 +1474,7 @@ const ViewProjectContent = () => {timezone={timezone}/>) : null}- {activeTab === PROJECT_TABS.ai ? <AskAIView projectId={id} /> : null}{activeTab === PROJECT_TABS.captcha ? <CaptchaView projectId={id} /> : null}- {activeTab === PROJECT_TABS.traffic ? (- <TrafficView- tnMapping={tnMapping}- customMetrics={customMetrics}- onCustomMetric={onCustomMetric}- onRemoveCustomMetric={onRemoveCustomMetric}- resetCustomMetrics={resetCustomMetrics}- mode={mode}- sdkInstance={sdkInstance}- />- ) : null}- {activeTab === PROJECT_TABS.performance ? <PerformanceView tnMapping={tnMapping} /> : null}</motion.div></AnimatePresence>diff --git a/web/app/pages/Project/View/components/BackButton.tsx b/web/app/pages/Project/View/components/BackButton.tsxnew file mode 100644index 000000000..d6ecbc39b--- /dev/null+++ b/web/app/pages/Project/View/components/BackButton.tsx@@ -0,0 +1,42 @@+import { ChevronLeftIcon } from 'lucide-react'+import { useTranslation } from 'react-i18next'+import { Link } from 'react-router'++import { cn } from '~/utils/generic'++interface BackButtonLinkProps {+ to: string+ onClick?: never+ className?: string+}++interface BackButtonCallbackProps {+ to?: never+ onClick: () => void+ className?: string+}++type BackButtonProps = BackButtonLinkProps | BackButtonCallbackProps++export const BackButton = ({ to, onClick, className }: BackButtonProps) => {+ const { t } = useTranslation('common')++ const buttonClasses = cn(+ 'rounded-md border border-transparent p-2 hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200',+ className,+ )++ if (onClick) {+ return (+ <button type='button' title={t('common.back')} onClick={onClick} className={buttonClasses}>+ <ChevronLeftIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ </button>+ )+ }++ return (+ <Link to={to!} title={t('common.back')} className={buttonClasses}>+ <ChevronLeftIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ </Link>+ )+}diff --git a/web/app/pages/Project/View/components/CaptchaView.tsx b/web/app/pages/Project/View/components/CaptchaView.tsxindex cfb3ca5c4..e2b8648dd 100644--- a/web/app/pages/Project/View/components/CaptchaView.tsx+++ b/web/app/pages/Project/View/components/CaptchaView.tsx@@ -22,6 +22,7 @@ import { deviceIconMapping } from '../ViewProject.helpers'import { CaptchaChart } from './CaptchaChart'import CCRow from './CCRow'+import DashboardHeader from './DashboardHeader'import Filters from './Filters'import NoEvents from './NoEvents'@@ -182,142 +183,158 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {}return (- <div ref={ref}>- {dataLoading && hasExistingData ? <LoadingBar /> : null}- <div className='mt-5'>- <Filters tnMapping={tnMapping} />- {chartData ? (- <div className='mt-4'>- <CaptchaChart- chart={chartData}- timeBucket={timeBucket}- timeFormat={timeFormat}- rotateXAxis={rotateXAxis}- chartType={chartTypes.line}- dataNames={dataNames}- />- </div>- ) : null}- <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>- {!_isEmpty(panelsData.types)- ? _map(PANELS_ORDER, (type: keyof typeof tnMapping) => {- const panelName = tnMapping[type]- const panelIcon = panelIconMapping[type]-- if (type === 'cc') {- const rowMapper = (entry: any) => {- const { name: entryName, cc } = entry- if (cc) {- return <CCRow cc={cc} name={entryName} language={language} />+ <>+ <DashboardHeader showLiveVisitors />+ <div ref={ref}>+ {dataLoading && hasExistingData ? <LoadingBar /> : null}+ <div className='mt-5'>+ <Filters tnMapping={tnMapping} />+ {chartData ? (+ <div className='mt-4'>+ <CaptchaChart+ chart={chartData}+ timeBucket={timeBucket}+ timeFormat={timeFormat}+ rotateXAxis={rotateXAxis}+ chartType={chartTypes.line}+ dataNames={dataNames}+ />+ </div>+ ) : null}+ <div className='mt-3 grid grid-cols-1 gap-3 sm:grid-cols-2'>+ {!_isEmpty(panelsData.types)+ ? _map(PANELS_ORDER, (type: keyof typeof tnMapping) => {+ const panelName = tnMapping[type]+ const panelIcon = panelIconMapping[type]++ if (type === 'cc') {+ const rowMapper = (entry: any) => {+ 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+ key={type}+ icon={panelIcon}+ id={type}+ getFilterLink={getFilterLink}+ name={panelName}+ data={panelsData.data[type]}+ rowMapper={rowMapper}+ activeTabId={type}+ />+ )}- return (- <Panel- key={type}- icon={panelIcon}- id={type}- getFilterLink={getFilterLink}- name={panelName}- data={panelsData.data[type]}- rowMapper={rowMapper}- activeTabId={type}- />- )- }+ if (type === 'dv') {+ return (+ <Panel+ key={type}+ icon={panelIcon}+ id={type}+ getFilterLink={getFilterLink}+ name={panelName}+ data={panelsData.data[type]}+ rowMapper={(entry: { name: keyof typeof deviceIconMapping }) => {+ const { name: entryName } = entry+ const icon = deviceIconMapping[entryName]+ if (!icon) {+ return entryName+ }+ return (+ <>+ {icon}+ + {entryName}+ </>+ )+ }}+ capitalize+ activeTabId={type}+ />+ )+ }- if (type === 'dv') {- return (- <Panel- key={type}- icon={panelIcon}- id={type}- getFilterLink={getFilterLink}- name={panelName}- data={panelsData.data[type]}- rowMapper={(entry: { name: keyof typeof deviceIconMapping }) => {- const { name: entryName } = entry- const icon = deviceIconMapping[entryName]- if (!icon) {- return entryName- }+ if (type === 'br') {+ const rowMapper = (entry: any) => {+ const { name: entryName } = entry+ // @ts-expect-error+ const logoUrl = BROWSER_LOGO_MAP[entryName]+ if (!logoUrl) {return (<>- {icon}+ <GlobeAltIcon className='h-5 w-5' /> {entryName}</>)- }}- capitalize- activeTabId={type}- />- )- }-- if (type === 'br') {- const rowMapper = (entry: any) => {- const { name: entryName } = entry- // @ts-expect-error- const logoUrl = BROWSER_LOGO_MAP[entryName]- if (!logoUrl) {+ }return (<>- <GlobeAltIcon className='h-5 w-5' />+ <img src={logoUrl} className='h-5 w-5' alt='' /> {entryName}</>)}+return (- <>- <img src={logoUrl} className='h-5 w-5' alt='' />- - {entryName}- </>+ <Panel+ key={type}+ icon={panelIcon}+ id={type}+ getFilterLink={getFilterLink}+ name={panelName}+ data={panelsData.data[type]}+ rowMapper={rowMapper}+ activeTabId={type}+ />)}- return (- <Panel- key={type}- icon={panelIcon}- id={type}- getFilterLink={getFilterLink}- name={panelName}- data={panelsData.data[type]}- rowMapper={rowMapper}- activeTabId={type}- />- )- }-- if (type === 'os') {- const rowMapper = (entry: any) => {- const { name: entryName } = entry- // @ts-expect-error- const logoPathLight = OS_LOGO_MAP[entryName]- // @ts-expect-error- const logoPathDark = OS_LOGO_MAP_DARK[entryName]- let logoPath = theme === 'dark' ? logoPathDark : logoPathLight- logoPath ||= logoPathLight- if (!logoPath) {+ if (type === 'os') {+ const rowMapper = (entry: any) => {+ const { name: entryName } = entry+ // @ts-expect-error+ const logoPathLight = OS_LOGO_MAP[entryName]+ // @ts-expect-error+ const logoPathDark = OS_LOGO_MAP_DARK[entryName]+ let logoPath = theme === 'dark' ? logoPathDark : logoPathLight+ logoPath ||= logoPathLight+ if (!logoPath) {+ return (+ <>+ <GlobeAltIcon className='h-5 w-5' />+ + {entryName}+ </>+ )+ }+ const logoUrl = `/${logoPath}`return (<>- <GlobeAltIcon className='h-5 w-5' />+ <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' /> {entryName}</>)}- const logoUrl = `/${logoPath}`+return (- <>- <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' />- - {entryName}- </>+ <Panel+ key={type}+ icon={panelIcon}+ id={type}+ getFilterLink={getFilterLink}+ name={panelName}+ data={panelsData.data[type]}+ rowMapper={rowMapper}+ activeTabId={type}+ />)}@@ -329,28 +346,15 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}- rowMapper={rowMapper}activeTabId={type}/>)- }-- return (- <Panel- key={type}- icon={panelIcon}- id={type}- getFilterLink={getFilterLink}- name={panelName}- data={panelsData.data[type]}- activeTabId={type}- />- )- })- : null}+ })+ : null}+ </div></div></div>- </div>+ </>)}diff --git a/web/app/pages/Project/View/components/DashboardHeader.tsx b/web/app/pages/Project/View/components/DashboardHeader.tsxindex c502c3398..aab9b5817 100644--- a/web/app/pages/Project/View/components/DashboardHeader.tsx+++ b/web/app/pages/Project/View/components/DashboardHeader.tsx@@ -6,81 +6,81 @@ import React from 'react'import { useTranslation } from 'react-i18next'import { useSearchParams } from 'react-router'-import { MAX_MONTHS_IN_PAST, PERIOD_PAIRS_COMPARE, TBPeriodPairsProps } from '~/lib/constants'+import { MAX_MONTHS_IN_PAST, PERIOD_PAIRS_COMPARE } from '~/lib/constants'import { useAuth } from '~/providers/AuthProvider'import DatePicker from '~/ui/Datepicker'import Dropdown from '~/ui/Dropdown'import { useViewProjectContext } from '../ViewProject'+import { BackButton } from './BackButton'import LiveVisitorsDropdown from './LiveVisitorsDropdown'import { RefreshStatsButton } from './RefreshStatsButton'import TBPeriodSelector from './TBPeriodSelector'interface DashboardHeaderProps {- // Required props- refreshStats: (isManual: boolean) => Promise<void>- timeBucketSelectorItems: TBPeriodPairsProps[]- isActiveCompare: boolean- setIsActiveCompare: (value: boolean) => void- compareDisable: () => void- maxRangeCompare: number- dateRangeCompare: Date[] | null- setDateRangeCompare: (value: Date[] | null) => void- activePeriodCompare: string- setActivePeriodCompare: (value: string) => void- periodPairsCompare: { label: string; period: string }[]- setPeriodPairsCompare: (value: { label: string; period: string }[]) => void- setShowFiltersSearch: (value: boolean) => void- resetDateRange: () => void-- // Refs- refCalendar: React.RefObject<any>- refCalendarCompare: React.RefObject<any>-// Optional propsshowLiveVisitors?: booleanshowRefreshButton?: booleanshowSearchButton?: booleanshowPeriodSelector?: booleanhideTimeBucket?: boolean+ timeBucketSelectorItems?: { period: string; label: string; tbs: string[] }[]++ // Back button link (when provided, shows a back button on the far left)+ backLink?: string+ onBack?: () => void++ // Left side content (displayed after back button, before live visitors)+ leftContent?: React.ReactNode- // Right side content (for segments/export dropdowns)+ // Right side content (for segments/export dropdowns or action buttons)rightContent?: React.ReactNode}export const DashboardHeader = ({- refreshStats,- timeBucketSelectorItems,- isActiveCompare,- setIsActiveCompare,- compareDisable,- maxRangeCompare,- dateRangeCompare,- setDateRangeCompare,- activePeriodCompare,- setActivePeriodCompare,- periodPairsCompare,- setPeriodPairsCompare,- setShowFiltersSearch,- resetDateRange,- refCalendar,- refCalendarCompare,showLiveVisitors = true,showRefreshButton = true,showSearchButton = true,showPeriodSelector = true,hideTimeBucket = false,+ timeBucketSelectorItems: customTimeBucketSelectorItems,+ backLink,+ onBack,+ leftContent,rightContent,}: DashboardHeaderProps) => {const { isLoading: authLoading } = useAuth()- const { dataLoading, activePeriod, dateRange, updatePeriod } = useViewProjectContext()+ const {+ dataLoading,+ activePeriod,+ dateRange,+ updatePeriod,+ periodPairs,+ isActiveCompare,+ setIsActiveCompare,+ compareDisable,+ maxRangeCompare,+ dateRangeCompare,+ setDateRangeCompare,+ activePeriodCompare,+ setActivePeriodCompare,+ periodPairsCompare,+ setPeriodPairsCompare,+ setShowFiltersSearch,+ resetDateRange,+ refCalendar,+ refCalendarCompare,+ refreshStats,+ } = useViewProjectContext()+const {t,i18n: { language },} = useTranslation('common')const [searchParams, setSearchParams] = useSearchParams()+ const timeBucketSelectorItems = customTimeBucketSelectorItems || periodPairsconst activeDropdownLabelCompare = _find(periodPairsCompare, (p) => p.period === activePeriodCompare)?.labelconst tbPeriodPairsCompare = (tFn: typeof t, customDateRange?: Date[], lng?: string) => {@@ -123,6 +123,9 @@ export const DashboardHeader = ({return (<div className='relative top-0 z-20 -mt-2 flex flex-col items-center justify-between bg-gray-50/50 py-2 backdrop-blur-md lg:sticky lg:flex-row dark:bg-slate-900/50'><div className='flex flex-wrap items-center justify-center gap-2'>+ {backLink ? <BackButton to={backLink} /> : null}+ {onBack ? <BackButton onClick={onBack} /> : null}+ {leftContent}{showLiveVisitors ? <LiveVisitorsDropdown /> : null}</div><div className='mx-auto mt-3 flex w-full max-w-[420px] flex-wrap items-center justify-center gap-x-2 gap-y-1 sm:mx-0 sm:w-auto sm:max-w-none sm:flex-nowrap sm:justify-between lg:mt-0'>diff --git a/web/app/pages/Project/View/components/ProjectSidebar.tsx b/web/app/pages/Project/View/components/ProjectSidebar.tsxindex 4fbef7725..e79af4d66 100644--- a/web/app/pages/Project/View/components/ProjectSidebar.tsx+++ b/web/app/pages/Project/View/components/ProjectSidebar.tsx@@ -20,12 +20,12 @@ const ICON_COLORS: Record<string, string> = {// Web Analyticstraffic: 'text-blue-500',performance: 'text-amber-500',+ funnels: 'text-teal-500',alerts: 'text-cyan-500',// Product Analyticsprofiles: 'text-indigo-500',sessions: 'text-indigo-500',errors: 'text-red-500',- funnels: 'text-teal-500',goals: 'text-purple-500',experiments: 'text-pink-500',featureFlags: 'text-orange-500',@@ -242,7 +242,9 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({const groups: TabGroup[] = []const webAnalyticsTabs = tabs.filter((tab) =>- [PROJECT_TABS.traffic, PROJECT_TABS.performance, PROJECT_TABS.alerts].includes(tab.id as any),+ [PROJECT_TABS.traffic, PROJECT_TABS.performance, PROJECT_TABS.funnels, PROJECT_TABS.alerts].includes(+ tab.id as any,+ ),)if (webAnalyticsTabs.length > 0) {groups.push({@@ -256,7 +258,6 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({[PROJECT_TABS.profiles,PROJECT_TABS.sessions,- PROJECT_TABS.funnels,PROJECT_TABS.errors,PROJECT_TABS.goals,PROJECT_TABS.experiments,diff --git a/web/app/routes/projects.$pid.alerts.create.tsx b/web/app/routes/projects.$pid.alerts.create.tsxdeleted file mode 100644index fb655e2bb..000000000--- a/web/app/routes/projects.$pid.alerts.create.tsx+++ /dev/null@@ -1,5 +0,0 @@-import ProjectAlertsSettings from '~/pages/Project/Alerts/Settings'--export default function Index() {- return <ProjectAlertsSettings />-}diff --git a/web/app/routes/projects.$pid.alerts.settings.$id.tsx b/web/app/routes/projects.$pid.alerts.settings.$id.tsxdeleted file mode 100644index cd63e20cf..000000000--- a/web/app/routes/projects.$pid.alerts.settings.$id.tsx+++ /dev/null@@ -1,5 +0,0 @@-import ProjectAlertsSettings from '~/pages/Project/Alerts/Settings'--export default function Index() {- return <ProjectAlertsSettings isSettings />-}diff --git a/web/app/utils/routes.ts b/web/app/utils/routes.tsindex b37df5675..b695c78d7 100644--- a/web/app/utils/routes.ts+++ b/web/app/utils/routes.ts@@ -22,8 +22,6 @@ const routes = Object.freeze({terms: '/terms',contact: '/contact',about: '/about',- create_alert: '/projects/:pid/alerts/create',- alert_settings: '/projects/:pid/alerts/settings/:id',transfer_confirm: '/project/transfer/confirm',transfer_reject: '/project/transfer/cancel',socialised: '/socialised',