📈 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
Migrate filters from state to URLs
Blue Moused5ebe012cb88
diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.tsindex 8efb7ed05..669d85b62 100644--- a/web/app/lib/constants/index.ts+++ b/web/app/lib/constants/index.ts@@ -32,8 +32,6 @@ const getCustomLabel = (dates: Date[], t: typeof i18nextT, language?: string): sreturn t('project.custom')}-export const ALL_PERIODS = ['minute', 'hour', 'day', 'month', 'year']-export interface TBPeriodPairsProps {label: stringperiod: Perioddiff --git a/web/app/pages/Captcha/View/ViewCaptcha.helpers.tsx b/web/app/pages/Captcha/View/ViewCaptcha.helpers.tsxindex ea27b4de5..f16587078 100644--- a/web/app/pages/Captcha/View/ViewCaptcha.helpers.tsx+++ b/web/app/pages/Captcha/View/ViewCaptcha.helpers.tsx@@ -157,10 +157,6 @@ const getSettings = (}}-const validTimeBacket = ['hour', 'day', 'week', 'month']-const validPeriods = ['custom', 'today', 'yesterday', '1d', '7d', '4w', '3M', '12M', '24M']-const validFilters = ['cc', 'pg', 'lc', 'ref', 'dv', 'br', 'os', 'so', 'me', 'ca', 'lt', 'ev']-const typeNameMapping = (t: typeof i18next.t) => ({cc: t('project.mapping.cc'),dv: t('project.mapping.dv'),@@ -189,15 +185,4 @@ const getFormatDate = (date: Date) => {return `${yyyy}-${mm}-${dd}`}-export {- getFormatDate,- panelIconMapping,- typeNameMapping,- validFilters,- validPeriods,- validTimeBacket,- noRegionPeriods,- getSettings,- getColumns,- PANELS_ORDER,-}+export { getFormatDate, panelIconMapping, typeNameMapping, noRegionPeriods, getSettings, getColumns, PANELS_ORDER }diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsxindex 2765db432..10428089a 100644--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx@@ -9,11 +9,10 @@ import _keys from 'lodash/keys'import _last from 'lodash/last'import _map from 'lodash/map'import _replace from 'lodash/replace'-import _startsWith from 'lodash/startsWith'import { DownloadIcon, RotateCw, SettingsIcon } from 'lucide-react'import { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'-import { useNavigate, useSearchParams } from 'react-router'+import { Link, LinkProps, useSearchParams } from 'react-router'import { ClientOnly } from 'remix-utils/client-only'import { getCaptchaData } from '~/api'@@ -30,9 +29,17 @@ import {OS_LOGO_MAP,OS_LOGO_MAP_DARK,DEFAULT_TIMEZONE,+ VALID_PERIODS,+ type Period,+ TBPeriodPairsProps,+ TimeBucket,+ VALID_TIME_BUCKETS,} from '~/lib/constants'+import Filters from '~/pages/Project/View/components/Filters'+import NoEvents from '~/pages/Project/View/components/NoEvents'+import { Filter } from '~/pages/Project/View/interfaces/traffic'import { Panel } from '~/pages/Project/View/Panels'-import { parseFiltersFromUrl } from '~/pages/Project/View/utils/filters'+import { parseFilters } from '~/pages/Project/View/utils/filters'import { ViewProjectContext } from '~/pages/Project/View/ViewProject'import { deviceIconMapping, onCSVExportClick } from '~/pages/Project/View/ViewProject.helpers'import { useAuth } from '~/providers/AuthProvider'@@ -48,16 +55,11 @@ import routes from '~/utils/routes'import CCRow from '../../Project/View/components/CCRow'-import Filters from './components/Filters'-import NoEvents from './components/NoEvents'import TBPeriodSelector from './components/TBPeriodSelector'import {getFormatDate,panelIconMapping,typeNameMapping,- validFilters,- validPeriods,- validTimeBacket,noRegionPeriods,getSettings,getColumns,@@ -76,44 +78,62 @@ const ViewCaptcha = () => {const { user, isLoading: authLoading } = useAuth()const { theme } = useTheme()+ const [searchParams, setSearchParams] = useSearchParams()+const {t,i18n: { language },} = useTranslation('common')- const [periodPairs, setPeriodPairs] = useState(captchaTbPeriodPairs(t, undefined, undefined, language))+ const [periodPairs, setPeriodPairs] = useState<TBPeriodPairsProps[]>(+ captchaTbPeriodPairs(t, undefined, undefined, language),+ )const dashboardRef = useRef(null)- const navigate = useNavigate()const [areFiltersParsed, setAreFiltersParsed] = useState(false)const [panelsData, setPanelsData] = useState<any>({})const [isPanelsDataEmpty, setIsPanelsDataEmpty] = useState(false)const [analyticsLoading, setAnalyticsLoading] = useState(true)- const [period, setPeriod] = useState<string>(preferences?.period || periodPairs[4].period)- const [timeBucket, setTimebucket] = useState<string>(preferences?.timeBucket || periodPairs[4].tbs[1])- const activePeriod: {- period: string- label: string- tbs: string[]- } = useMemo(- () =>- _find(periodPairs, (p) => p.period === period) || {- period: periodPairs[3].period,- tbs: periodPairs[3].tbs,- label: periodPairs[3].label,- },- [period, periodPairs],- )++ const period = useMemo<Period>(() => {+ const urlPeriod = searchParams.get('period') as Period++ if (VALID_PERIODS.includes(urlPeriod)) {+ return urlPeriod+ }++ return preferences.period || periodPairs[4].period+ }, [searchParams, preferences.period, periodPairs])++ const timeBucket = useMemo<TimeBucket>(() => {+ const urlTimeBucket = searchParams.get('timeBucket') as TimeBucket++ if (VALID_TIME_BUCKETS.includes(urlTimeBucket)) {+ const newPeriodFull = _find(periodPairs, (el) => el.period === period)++ // todo: if timebucket is invalid for the period, should we update the url right away here?+ if (newPeriodFull?.tbs?.includes(urlTimeBucket)) {+ return urlTimeBucket+ }+ }++ return preferences.timeBucket || periodPairs[4].tbs[1]+ }, [searchParams, preferences.timeBucket, periodPairs, period])++ const activePeriod = useMemo(() => _find(periodPairs, (p) => p.period === period), [period, periodPairs])+const [chartData, setChartData] = useState<any>({})const [dataLoading, setDataLoading] = useState(false)- const [filters, setFilters] = useState<any[]>([])++ const filters = useMemo<Filter[]>(() => {+ return parseFilters(searchParams)+ }, [searchParams])+const tnMapping = typeNameMapping(t)const refCalendar = useRef(null)const [dateRange, setDateRange] = useState<Date[] | null>(preferences?.rangeDate ? [new Date(preferences.rangeDate[0]), new Date(preferences.rangeDate[1])] : null,)- const [searchParams] = useSearchParams()-const timeFormat = useMemo<'12-hour' | '24-hour'>(() => user?.timeFormat || TimeFormat['12-hour'], [user])const [ref, size] = useSize() as anyconst rotateXAxias = useMemo(() => size.width > 0 && size.width < 500, [size])@@ -188,13 +208,16 @@ const ViewCaptcha = () => {})return newPeriodPairs})- setTimebucket(newTimebucket)++ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.set('timeBucket', newTimebucket)+ setSearchParams(newSearchParams)}if (_isEmpty(params)) {setIsPanelsDataEmpty(true)} else {- const applyRegions = !_includes(noRegionPeriods, activePeriod.period)+ const applyRegions = !_includes(noRegionPeriods, activePeriod?.period)const bbSettings: any = getSettings(chart,newTimebucket,@@ -245,60 +268,23 @@ const ViewCaptcha = () => {// eslint-disable-next-line react-hooks/exhaustive-deps}, [areFiltersParsed, filters, authLoading, project, dateRange, period, timeBucket])- // this funtion is used for requesting the data from the API when the filter is changed- const filterHandler = (column: any, filter: any, isExclusive = false) => {- let newFilters-- if (_find(filters, (f) => f.column === column) /* && f.filter === filter) */) {- // selected filter is already included into the filters array -> removing it- // removing filter from the state- newFilters = _filter(filters, (f) => f.column !== column)- setFilters(newFilters)-- // removing filter from the page URL- // @ts-expect-error- const url = new URL(window.location)- url.searchParams.delete(column)- const { pathname, search } = url- navigate(`${pathname}${search}`)- } else {- // selected filter is not present in the filters array -> applying it- // sroting filter in the state- newFilters = [...filters, { column, filter, isExclusive }]- setFilters(newFilters)-- // storing filter in the page URL- // @ts-expect-error- const url = new URL(window.location)- url.searchParams.append(column, filter)- const { pathname, search } = url- navigate(`${pathname}${search}`)- }- }-- // this function is used for requesting the data from the API when the exclusive filter is changed- const onChangeExclusive = (column: any, filter: any, isExclusive: boolean) => {- const newFilters = _map(filters, (f) => {- if (f.column === column && f.filter === filter) {- return {- ...f,- isExclusive,- }- }-- return f- })- setFilters(newFilters)+ const getFilterLink = (column: string, value: string): LinkProps['to'] => {+ const isFilterActive = filters.findIndex((filter) => filter.column === column && filter.filter === value) >= 0- // storing exclusive filter in the page URL- // @ts-expect-error- const url = new URL(window.location)+ const newSearchParams = new URLSearchParams(searchParams.toString())+ let searchString = ''- url.searchParams.delete(column)- url.searchParams.append(column, filter)+ if (isFilterActive) {+ newSearchParams.delete(column)+ searchString = newSearchParams.toString()+ } else {+ newSearchParams.append(column, value)+ searchString = newSearchParams.toString()+ }- const { pathname, search } = url- navigate(`${pathname}${search}`)+ return {+ search: searchString,+ }}const refreshStats = () => {@@ -309,91 +295,13 @@ const ViewCaptcha = () => {loadCaptcha()}- // Parsing initial filters from the address bar- useEffect(() => {- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const intialTimeBucket: string = searchParams.get('timeBucket') || ''- if (!_includes(validTimeBacket, intialTimeBucket)) {- return- }- const newPeriodFull = _find(periodPairs, (el) => el.period === period) || {- period: '',- tbs: [],- label: '',- }- if (!_includes(newPeriodFull.tbs, intialTimeBucket)) {- return- }- setTimebucket(intialTimeBucket)- } catch (reason) {- console.error('[ERROR](useEffect) Setting timebucket failed:', reason)- }-- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const initialPeriod = searchParams.get('period') || preferences?.period || '7d'- if (!_includes(validPeriods, initialPeriod)) {- return- }-- if (initialPeriod === 'custom') {- // @ts-expect-error- const from = new Date(searchParams.get('from'))- // @ts-expect-error- const to = new Date(searchParams.get('to'))- if (from.getDate() && to.getDate()) {- onRangeDateChange([from, to], true)- setDateRange([from, to])- }- return- }-- setPeriodPairs(captchaTbPeriodPairs(t, undefined, undefined, language))- setDateRange(null)- updatePeriod({ period: initialPeriod })- } catch (reason) {- console.error('[ERROR](useEffect) Setting period failed:', reason)- }-- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const initialFilters: any[] = []- searchParams.forEach((value, key) => {- if (!_includes(validFilters, key)) {- return- }-- const isExclusive = _startsWith(value, '!')- initialFilters.push({- column: key,- filter: isExclusive ? value.substring(1) : value,- isExclusive,- })- })- setFilters(initialFilters)- } catch (reason) {- console.error('[ERROR](useEffect) Setting filters failed:', reason)- }-- setAreFiltersParsed(true)- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [])-+ // TODO: DO WE NEED THIS?useEffect(() => {- parseFiltersFromUrl('', searchParams, setFilters)-const parsePeriodFilters = () => {try {const initialPeriod = searchParams.get('period') || preferences?.period || '7d'- if (!_includes(validPeriods, initialPeriod)) {+ if (!_includes(VALID_PERIODS, initialPeriod)) {return}@@ -421,27 +329,14 @@ const ViewCaptcha = () => {parsePeriodFilters()- try {- const initialTimeBucket = searchParams.get('timeBucket')-- if (_includes(validTimeBacket, initialTimeBucket)) {- const newPeriodFull = _find(periodPairs, (el) => el.period === period)- if (_includes(newPeriodFull?.tbs, initialTimeBucket)) {- setTimebucket(initialTimeBucket || periodPairs[3].tbs[1])- }- }- } catch {- //- }-setAreFiltersParsed(true)// eslint-disable-next-line react-hooks/exhaustive-deps}, [])const onRangeDateChange = (dates: Date[], onRender?: any) => {const days = Math.ceil(Math.abs(dates[1].getTime() - dates[0].getTime()) / (1000 * 3600 * 24))- // @ts-expect-error- const url = new URL(window.location)++ const newSearchParams = new URLSearchParams(searchParams.toString())// setting allowed time buckets for the specified date range (period)@@ -451,25 +346,16 @@ const ViewCaptcha = () => {if (!onRender && !_includes(timeBucketToDays[index].tb, timeBucket)) {eventEmitTimeBucket = timeBucketToDays[index].tb[0]- url.searchParams.delete('timeBucket')- url.searchParams.append('timeBucket', eventEmitTimeBucket)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setTimebucket(eventEmitTimeBucket)+ newSearchParams.set('timeBucket', eventEmitTimeBucket)+ setSearchParams(newSearchParams)}- url.searchParams.delete('period')- url.searchParams.delete('from')- url.searchParams.delete('to')- url.searchParams.append('period', 'custom')- url.searchParams.append('from', dates[0].toISOString())- url.searchParams.append('to', dates[1].toISOString())-- const { pathname, search } = url- navigate(`${pathname}${search}`)+ newSearchParams.set('period', 'custom')+ newSearchParams.set('from', dates[0].toISOString())+ newSearchParams.set('to', dates[1].toISOString())+ setSearchParams(newSearchParams)setPeriodPairs(captchaTbPeriodPairs(t, timeBucketToDays[index].tb, dates, language))- setPeriod('custom')updatePreferences({period: 'custom',@@ -491,66 +377,45 @@ const ViewCaptcha = () => {const updatePeriod = (newPeriod: any) => {const newPeriodFull = _find(periodPairs, (el) => el.period === newPeriod.period)let tb: any = timeBucket- // @ts-expect-error- const url = new URL(window.location)++ const newSearchParams = new URLSearchParams(searchParams.toString())+if (_isEmpty(newPeriodFull)) returnif (!_includes(newPeriodFull.tbs, timeBucket)) {tb = _last(newPeriodFull.tbs)- url.searchParams.delete('timeBucket')- url.searchParams.append('timeBucket', tb)- setTimebucket(tb)+ newSearchParams.set('timeBucket', tb)}if (newPeriod.period !== 'custom') {- url.searchParams.delete('period')- url.searchParams.delete('from')- url.searchParams.delete('to')- url.searchParams.append('period', newPeriod.period)+ newSearchParams.delete('from')+ newSearchParams.delete('to')+ newSearchParams.set('period', newPeriod.period)updatePreferences({period: newPeriod.period,timeBucket: tb,rangeDate: undefined,})- setPeriod(newPeriod.period)setDateRange(null)}- const { pathname, search } = url- navigate(`${pathname}${search}`)++ setSearchParams(newSearchParams)}- const updateTimebucket = (newTimebucket: string) => {- // @ts-expect-error- const url = new URL(window.location)- url.searchParams.delete('timeBucket')- url.searchParams.append('timeBucket', newTimebucket)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setTimebucket(newTimebucket)+ const updateTimebucket = (newTimebucket: TimeBucket) => {+ if (dataLoading) {+ return+ }++ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.set('timeBucket', newTimebucket)+ setSearchParams(newSearchParams)+updatePreferences({timeBucket: newTimebucket,})}- const openSettingsHandler = () => {- navigate(_replace(routes.captcha_settings, ':id', id))- }-- const resetFilters = () => {- // @ts-expect-error- const url: URL = new URL(window.location)- const { searchParams } = url- for (const [key] of Array.from(searchParams.entries())) {- if (!_includes(validFilters, key)) {- continue- }- searchParams.delete(key)- }- const { pathname, search } = url- navigate(`${pathname}${search}`)- setFilters([])- }-const exportTypes = [{label: t('project.asCSV'),@@ -696,16 +561,15 @@ const ViewCaptcha = () => {}}/>{project.role === 'admin' || project.role === 'owner' ? (- <button- type='button'- onClick={openSettingsHandler}+ <Link+ to={_replace(routes.captcha_settings, ':id', id)}className='flex px-3 text-sm font-medium text-gray-700 hover:text-gray-600 dark:text-gray-50 dark:hover:text-gray-200'><><SettingsIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />{t('common.settings')}</>- </button>+ </Link>) : null}<FlatPickerref={refCalendar}@@ -716,18 +580,12 @@ const ViewCaptcha = () => {</div></div>{analyticsLoading ? <Loader /> : null}- {isPanelsDataEmpty ? <NoEvents filters={filters} resetFilters={resetFilters} /> : null}+ {isPanelsDataEmpty ? <NoEvents filters={filters} /> : null}<div className={cx('pt-4', { hidden: isPanelsDataEmpty || analyticsLoading })}><div className='h-80'><div className='h-80 [&_svg]:!overflow-visible' id='captchaChart' /></div>- <Filters- filters={filters}- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetFilters}- />+ <Filters tnMapping={tnMapping} />{dataLoading ? (<div className='static mt-4 !bg-transparent' id='loader'><div className='loader-head dark:!bg-slate-800'>@@ -758,7 +616,7 @@ const ViewCaptcha = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}rowMapper={rowMapper}@@ -772,7 +630,7 @@ const ViewCaptcha = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}rowMapper={(entry: { name: keyof typeof deviceIconMapping }) => {@@ -827,7 +685,7 @@ const ViewCaptcha = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}rowMapper={rowMapper}@@ -872,7 +730,7 @@ const ViewCaptcha = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}rowMapper={rowMapper}@@ -885,7 +743,7 @@ const ViewCaptcha = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}/>diff --git a/web/app/pages/Captcha/View/components/Filters.tsx b/web/app/pages/Captcha/View/components/Filters.tsxdeleted file mode 100644index 4ea38e9fd..000000000--- a/web/app/pages/Captcha/View/components/Filters.tsx+++ /dev/null@@ -1,157 +0,0 @@-import { XMarkIcon } from '@heroicons/react/24/outline'-import cx from 'clsx'-import _isEmpty from 'lodash/isEmpty'-import _map from 'lodash/map'-import _replace from 'lodash/replace'-import _startsWith from 'lodash/startsWith'-import _truncate from 'lodash/truncate'-import { FilterIcon } from 'lucide-react'-import { memo } from 'react'-import { useTranslation } from 'react-i18next'--import { getLocaleDisplayName } from '~/utils/generic'-import countries from '~/utils/isoCountries'--interface FilterProps {- column: string- filter: string- isExclusive: boolean- onRemoveFilter: (column: string, filter: string) => void- onChangeExclusive: (column: string, filter: string, isExclusive: boolean) => void- tnMapping: Record<string, string>- canChangeExclusive?: boolean- removable?: boolean-}--const Filter = ({- column,- filter,- isExclusive,- onRemoveFilter,- onChangeExclusive,- tnMapping,- canChangeExclusive,- removable,-}: FilterProps) => {- const {- t,- i18n: { language },- } = useTranslation('common')-- let displayColumn = tnMapping[column]- let displayFilter = filter-- if (column === 'cc') {- displayFilter = countries.getName(filter, language) as string- }-- if (column === 'pg') {- displayFilter = filter || t('project.redactedPage')- }-- if (column === 'lc') {- displayFilter = getLocaleDisplayName(displayFilter, language)- }-- if (_startsWith(column, 'ev:key:')) {- const key = _replace(column, /^ev:key:/, '')- displayColumn = t('project.metamapping.ev.dynamicKey', {- key,- })- }-- if (_startsWith(column, 'tag:key:')) {- const key = _replace(column, /^tag:key:/, '')- displayColumn = t('project.metamapping.tag.dynamicKey', {- key,- })- }-- const truncatedFilter = _truncate(displayFilter)-- return (- <span- title={truncatedFilter === displayFilter ? undefined : displayFilter}- className={cx(- 'm-1 inline-flex items-center rounded-md bg-gray-50 py-0.5 pr-1 pl-2.5 text-sm font-medium text-gray-800 dark:bg-slate-800 dark:text-gray-50',- {- 'pr-2': !removable,- },- )}- >- {displayColumn}- - {canChangeExclusive ? (- <span- className='cursor-pointer border-b-2 border-dotted border-blue-400 text-blue-400'- onClick={() => onChangeExclusive(column, filter, !isExclusive)}- >- {t(`common.${isExclusive ? 'isNot' : 'is'}`)}- </span>- ) : (- <span>{t(`common.${isExclusive ? 'isNot' : 'is'}`)}</span>- )}- "- {truncatedFilter}- "- {removable ? (- <button- onClick={() => onRemoveFilter(column, filter)}- type='button'- className='ml-0.5 inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-800 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-300 focus:text-gray-900 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-gray-800 dark:hover:text-gray-300 dark:focus:bg-gray-800 dark:focus:text-gray-300'- >- <span className='sr-only'>Remove filter</span>- <svg className='h-2 w-2' stroke='currentColor' fill='none' viewBox='0 0 8 8'>- <path strokeLinecap='round' strokeWidth='1.5' d='M1 1l6 6m0-6L1 7' />- </svg>- </button>- ) : null}- </span>- )-}--interface FiltersProps {- onRemoveFilter: (column: string, filter: string) => void- onChangeExclusive: (column: string, filter: string, isExclusive: boolean) => void- tnMapping: Record<string, string>- resetFilters: () => void- filters: any-}--const Filters = ({ onRemoveFilter, onChangeExclusive, tnMapping, resetFilters, filters }: FiltersProps) => {- if (_isEmpty(filters)) {- return null- }-- return (- <div className='flex items-center justify-between rounded-md bg-slate-200 p-1 dark:border dark:border-slate-800/50 dark:bg-slate-800/25'>- <div className='flex items-center'>- <FilterIcon className='box-content size-6 shrink-0 px-1 text-gray-700 dark:text-gray-200' strokeWidth={1.5} />- <div className='flex flex-wrap'>- {_map(filters, (props) => {- const { column, filter } = props- const key = `${column}${filter}`-- return (- <Filter- key={key}- onRemoveFilter={onRemoveFilter}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- canChangeExclusive- removable- {...props}- />- )- })}- </div>- </div>- <XMarkIcon- className='box-content size-6 shrink-0 cursor-pointer stroke-2 px-1 text-gray-800 hover:text-gray-600 dark:text-gray-200 dark:hover:text-gray-300'- onClick={resetFilters}- />- </div>- )-}--export default memo(Filters)diff --git a/web/app/pages/Captcha/View/components/NoEvents.tsx b/web/app/pages/Captcha/View/components/NoEvents.tsxdeleted file mode 100644index 5573b38fb..000000000--- a/web/app/pages/Captcha/View/components/NoEvents.tsx+++ /dev/null@@ -1,49 +0,0 @@-import _isEmpty from 'lodash/isEmpty'-import { memo } from 'react'-import { useTranslation, Trans } from 'react-i18next'--import { DOCS_CAPTCHA_URL } from '~/lib/constants'-import { Filter } from '~/pages/Project/View/interfaces/traffic'-import Button from '~/ui/Button'--interface NoEventsProps {- filters: Filter[]- resetFilters: () => void-}--const NoEvents = ({ filters, resetFilters }: NoEventsProps) => {- const { t } = useTranslation('common')-- return (- <div className='mt-5 flex flex-col py-6 sm:px-6 lg:px-8'>- <div className='mx-auto w-full max-w-7xl text-gray-900 dark:text-gray-50'>- <h2 className='my-3 text-center text-4xl leading-tight'>{t('project.noEvTitle')}</h2>- <h2 className='mb-8 text-center text-2xl leading-snug'>- <Trans- t={t}- i18nKey='project.noCaptchaEv'- components={{- url: (- <a- href={DOCS_CAPTCHA_URL}- className='text-blue-600 hover:underline'- target='_blank'- rel='noreferrer noopener'- />- ),- }}- />- </h2>- {!_isEmpty(filters) ? (- <div className='!mx-auto !flex'>- <Button onClick={resetFilters} className='!mx-auto !flex' primary giant>- {t('project.resetFilters')}- </Button>- </div>- ) : null}- </div>- </div>- )-}--export default memo(NoEvents)diff --git a/web/app/pages/Captcha/View/components/TBPeriodSelector.tsx b/web/app/pages/Captcha/View/components/TBPeriodSelector.tsxindex 4cebddaf3..4c3b69214 100644--- a/web/app/pages/Captcha/View/components/TBPeriodSelector.tsx+++ b/web/app/pages/Captcha/View/components/TBPeriodSelector.tsx@@ -7,7 +7,7 @@ import { CalendarIcon } from 'lucide-react'import React, { memo, Fragment, useMemo } from 'react'import { useTranslation } from 'react-i18next'-import { ALL_PERIODS } from '~/lib/constants'+import { VALID_TIME_BUCKETS, TimeBucket } from '~/lib/constants'interface TBPeriodSelectorProps {title: string | number | React.ReactNode@@ -19,8 +19,8 @@ interface TBPeriodSelectorProps {timeBucket?: stringperiods?: string}- updateTimebucket: (timeBucket: string) => void- timeBucket: string+ updateTimebucket: (timeBucket: TimeBucket) => void+ timeBucket: TimeBucket}const TBPeriodSelector = ({@@ -34,8 +34,8 @@ const TBPeriodSelector = ({}: TBPeriodSelectorProps) => {const { t } = useTranslation('common')- const periods = useMemo(() => {- return _map(ALL_PERIODS, (period: string) => ({+ const timeBuckets = useMemo(() => {+ return _map(VALID_TIME_BUCKETS, (period: TimeBucket) => ({label: t(`project.${period}`),value: period,available: _includes(activePeriod?.tbs, period),@@ -77,7 +77,7 @@ const TBPeriodSelector = ({classes?.timeBucket,)}>- {_map(periods, ({ label, value, available }) => (+ {_map(timeBuckets, ({ label, value, available }) => (<PopoverButtonkey={value}type='button'diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex 8bd88d6b8..9022ed2dd 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -33,6 +33,7 @@ import {} from 'lucide-react'import React, { memo, useState, useEffect, useMemo, Fragment } from 'react'import { useTranslation } from 'react-i18next'+import { Link, LinkProps, useNavigate } from 'react-router'import { PROJECT_TABS } from '~/lib/constants'import { Entry } from '~/lib/models/Entry'@@ -293,10 +294,10 @@ interface MetadataProps {properties: PropertieschartData: anyfilters: Filter[]- onFilter: (column: string, filter: any, isExclusive?: boolean) => Promise<void>getCustomEventMetadata: (event: string) => Promise<any>getPropertyMetadata: (property: string) => Promise<any>customTabs: any+ getFilterLink: (column: string, value: string) => LinkProps['to']}interface CustomEventsProps extends MetadataProps {@@ -507,10 +508,10 @@ const CustomEvents = ({customs,chartData,filters,- onFilter,customTabs = [],getCustomEventMetadata,setActiveTab,+ getFilterLink,}: CustomEventsProps) => {const { t } = useTranslation('common')const [page, setPage] = useState(0)@@ -537,6 +538,7 @@ const CustomEvents = ({sortByAscend: false,sortByDescend: false,})+ const navigate = useNavigate()useEffect(() => {const sizeKeys = _size(keys)@@ -755,7 +757,8 @@ const CustomEvents = ({data={eventsMetadata[ev]}uniques={uniques}onClick={async (key, value) => {- await onFilter(`ev:key:${key}`, value)+ const link = getFilterLink(`ev:key:${key}`, value)+ navigate(link)setTriggerEventWhenFiltersChange(ev)}}displayKeyAsHeader@@ -882,7 +885,10 @@ const CustomEvents = ({<trkey={ev}className='group cursor-pointer text-gray-900 hover:bg-gray-100 dark:text-gray-50 hover:dark:bg-slate-700'- onClick={() => onFilter('ev', ev)}+ onClick={() => {+ const link = getFilterLink('ev', ev)+ navigate(link)+ }}><td className='flex items-center text-left'>{ev}@@ -967,10 +973,10 @@ const CustomEvents = ({const PageProperties = ({properties,chartData,- onFilter,filters,getPropertyMetadata,setActiveTab,+ getFilterLink,}: PagePropertiesProps) => {const { t } = useTranslation('common')const [page, setPage] = useState(0)@@ -996,6 +1002,7 @@ const PageProperties = ({sortByAscend: false,sortByDescend: false,})+ const navigate = useNavigate()useEffect(() => {const sizeKeys = _size(keys)@@ -1201,7 +1208,8 @@ const PageProperties = ({data={details[tag]}uniques={uniques}onClick={async (key, value) => {- await onFilter(`tag:key:${key}`, value)+ const link = getFilterLink(`tag:key:${key}`, value)+ navigate(link)setTriggerTagWhenFiltersChange(tag)}}/>@@ -1279,7 +1287,10 @@ const PageProperties = ({<trkey={tag}className='group cursor-pointer text-gray-900 hover:bg-gray-100 dark:text-gray-50 hover:dark:bg-slate-700'- onClick={() => onFilter('tag:key', tag)}+ onClick={() => {+ const link = getFilterLink('tag:key', tag)+ navigate(link)+ }}><td className='flex items-center text-left'>{tag}@@ -1371,6 +1382,25 @@ const Metadata = (props: MetadataProps) => {return <PageProperties {...props} setActiveTab={setActiveTab} />}+interface FilterWrapperProps {+ children: React.ReactNode+ as: 'Link' | 'div'+ to?: LinkProps['to']+ [key: string]: any+}++const FilterWrapper = ({ children, as, to, ...props }: FilterWrapperProps) => {+ if (as === 'Link') {+ return (+ <Link {...(props as any)} to={to}>+ {children}+ </Link>+ )+ }++ return <div {...props}>{children}</div>+}+interface PanelProps {name: React.ReactNodedata: Entry[]@@ -1381,9 +1411,9 @@ interface PanelProps {icon: anyid: stringhideFilters?: boolean- onFilter: anycustomTabs?: anyonFragmentChange?: (arg: number) => void+ getFilterLink?: (column: string, value: string) => LinkProps['to']}const Panel = ({@@ -1396,9 +1426,9 @@ const Panel = ({icon,id,hideFilters,- onFilter = () => {},customTabs = [],onFragmentChange = () => {},+ getFilterLink = () => '',}: PanelProps) => {const { dataLoading, activeTab } = useViewProjectContext()const { t } = useTranslation('common')@@ -1413,8 +1443,7 @@ const Panel = ({const [isReversedUserFlow, setIsReversedUserFlow] = useState(false)const canGoPrev = () => page > 0const canGoNext = () => page < _floor((_size(entries) - 1) / ENTRIES_PER_PANEL)-- const _onFilter = hideFilters ? () => {} : onFilter+ const navigate = useNavigate()useEffect(() => {const sizeKeys = _size(entries)@@ -1460,12 +1489,29 @@ const Panel = ({onExpandClick={() => setIsModalOpen(true)}customTabs={customTabs}>- <InteractiveMap data={data} total={total} onClickCountry={(key) => _onFilter(id, key)} />+ <InteractiveMap+ data={data}+ total={total}+ onClickCountry={(key) => {+ const link = getFilterLink(id, key)+ navigate(link)+ }}+ /><ModalonClose={() => setIsModalOpen(false)}closeText={t('common.close')}isOpened={isModalOpen}- message={<InteractiveMap data={data} total={total} onClickCountry={(key) => _onFilter(id, key)} />}+ message={+ <InteractiveMap+ data={data}+ total={total}+ onClickCountry={(key) => {+ const link = getFilterLink(id, key)+ navigate(link)+ setIsModalOpen(false)+ }}+ />+ }size='large'/></PanelContainer>@@ -1573,14 +1619,17 @@ const Panel = ({const rowData = rowMapper(entry)const valueData = valueMapper(count)+ const link = getFilterLink(id, entryName)+return (<Fragment key={`${id}-${entryName}-${Object.values(rest).join('-')}`}>- <div+ <FilterWrapper+ as={link ? 'Link' : 'div'}+ to={link}className={cx('mt-[0.32rem] flex justify-between rounded-sm font-mono first:mt-0 dark:text-gray-50', {'group cursor-pointer hover:bg-gray-100 hover:dark:bg-slate-700': !hideFilters && !dataLoading,'cursor-wait': dataLoading,})}- onClick={() => _onFilter(id, entryName)}>{linkContent ? (<a@@ -1617,7 +1666,7 @@ const Panel = ({{activeTab === PROJECT_TABS.traffic ? nFormatter(valueData, 1) : valueData}</span></div>- </div>+ </FilterWrapper><Progress now={perc} /></Fragment>)diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex abd1b35cc..f9c9c3a06 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -50,7 +50,7 @@ import React, {} from 'react'import { useHotkeys } from 'react-hotkeys-hook'import { useTranslation } from 'react-i18next'-import { useNavigate, Link, useSearchParams } from 'react-router'+import { useNavigate, Link, useSearchParams, LinkProps } from 'react-router'import { ClientOnly } from 'remix-utils/client-only'import { toast } from 'sonner'@@ -156,7 +156,7 @@ import OSDropdown from './components/OSDropdown'import PageDropdown from './components/PageDropdown'import { Pageflow } from './components/Pageflow'import RefRow from './components/RefRow'-import SearchFilters from './components/SearchFilters'+import SearchFilters, { getFiltersUrlParams } from './components/SearchFilters'import { SessionChart } from './components/SessionChart'import { SessionDetails } from './components/SessionDetails'import { Sessions } from './components/Sessions'@@ -177,14 +177,7 @@ import {TrafficLogResponse,} from './interfaces/traffic'import { Panel, Metadata } from './Panels'-import {- handleNavigationParams,- updateFilterState,- parseFiltersFromUrl,- isFilterValid,- FILTER_CHART_METRICS_MAPPING_FOR_COMPARE,- ERROR_FILTERS_MAPPING,-} from './utils/filters'+import { FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, ERROR_FILTERS_MAPPING, parseFilters } from './utils/filters'import {onCSVExportClick,getFormatDate,@@ -320,13 +313,18 @@ const ViewProject = () => {[activeChartMetrics, activeChartMetricsCustomEvents],)const [customMetrics, setCustomMetrics] = useState<ProjectViewCustomEvent[]>([])- const [filters, setFilters] = useState<Filter[]>([])- const [filtersPerf, setFiltersPerf] = useState<Filter[]>([])- const [filtersSessions, setFiltersSessions] = useState<Filter[]>([])-- const [filtersErrors, setFiltersErrors] = useState<Filter[]>([])+ const filters = useMemo<Filter[]>(() => {+ return parseFilters(searchParams)+ }, [searchParams])- const [filtersSubError, setFiltersSubError] = useState<Filter[]>([])+ // Search params without the session id, error id or funnel id. Needed for the back button.+ const pureSearchParams = useMemo(() => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.delete('psid')+ newSearchParams.delete('eid')+ newSearchParams.delete('funnelId')+ return newSearchParams.toString()+ }, [searchParams])const tnMapping = typeNameMapping(t)const refCalendar = useRef(null)@@ -396,9 +394,21 @@ const ViewProject = () => {return searchParams.get('eid')}, [searchParams])- const [activeFunnel, setActiveFunnel] = useState<Funnel | null>(null)const [funnelToEdit, setFunnelToEdit] = useState<Funnel | undefined>(undefined)const [funnelActionLoading, setFunnelActionLoading] = useState(false)+ const activeFunnel = useMemo(() => {+ if (!project) {+ return null+ }++ const funnelId = searchParams.get('funnelId')++ if (!funnelId) {+ return null+ }++ return _find(project.funnels, (funnel) => funnel.id === funnelId) || null+ }, [searchParams, project])// null -> not loaded yetconst [projectViews, setProjectViews] = useState<ProjectView[]>([])@@ -1374,9 +1384,9 @@ const ViewProject = () => {}if (period === 'custom' && dateRange) {- error = await getError(id, eid, '', filtersSubError, from, to, timezone, projectPassword)+ error = await getError(id, eid, '', filters, from, to, timezone, projectPassword)} else {- error = await getError(id, eid, period, filtersSubError, '', '', timezone, projectPassword)+ error = await getError(id, eid, period, filters, '', '', timezone, projectPassword)}setActiveError(error)@@ -1418,6 +1428,7 @@ const ViewProject = () => {useEffect(() => {if (!activePSID) {+ setActiveSession(null)return}@@ -1425,12 +1436,17 @@ const ViewProject = () => {}, [period, dateRange, timeBucket, activePSID])useEffect(() => {- if (!activeEID || !areFiltersParsed) {+ if (!areFiltersParsed) {+ return+ }++ if (!activeEID) {+ setActiveError(null)return}loadError(activeEID)- }, [period, dateRange, timeBucket, activeEID, filtersSubError, areFiltersParsed])+ }, [period, dateRange, timeBucket, activeEID, filters, areFiltersParsed])const loadSessions = async (forcedSkip?: number) => {if (sessionsLoading) {@@ -1451,29 +1467,9 @@ const ViewProject = () => {}if (period === 'custom' && dateRange) {- dataSessions = await getSessions(- id,- '',- filtersSessions,- from,- to,- SESSIONS_TAKE,- skip,- timezone,- projectPassword,- )+ dataSessions = await getSessions(id, '', filters, from, to, SESSIONS_TAKE, skip, timezone, projectPassword)} else {- dataSessions = await getSessions(- id,- period,- filtersSessions,- '',- '',- SESSIONS_TAKE,- skip,- timezone,- projectPassword,- )+ dataSessions = await getSessions(id, period, filters, '', '', SESSIONS_TAKE, skip, timezone, projectPassword)}setSessions((prev) => [...prev, ...(dataSessions?.sessions || [])])@@ -1519,7 +1515,7 @@ const ViewProject = () => {dataErrors = await getErrors(id,'',- filtersErrors,+ filters,errorOptions,from,to,@@ -1532,7 +1528,7 @@ const ViewProject = () => {dataErrors = await getErrors(id,period,- filtersErrors,+ filters,errorOptions,'','',@@ -1628,7 +1624,7 @@ const ViewProject = () => {id,timeBucket,'',- filtersPerf,+ filters,fromCompare,toCompare,timezone,@@ -1641,7 +1637,7 @@ const ViewProject = () => {fromCompare,toCompare,timezone,- filtersPerf,+ filters,measure,projectPassword,)@@ -1655,20 +1651,11 @@ const ViewProject = () => {}if (period === 'custom' && dateRange) {- dataPerf = await getPerfData(id, timeBucket, '', filtersPerf, from, to, timezone, measure, projectPassword)- rawOverall = await getOverallStats([id], period, from, to, timezone, filtersPerf, projectPassword)+ dataPerf = await getPerfData(id, timeBucket, '', filters, from, to, timezone, measure, projectPassword)+ rawOverall = await getOverallStats([id], period, from, to, timezone, filters, projectPassword)} else {- dataPerf = await getPerfData(id, timeBucket, period, filtersPerf, '', '', timezone, measure, projectPassword)- rawOverall = await getPerformanceOverallStats(- [id],- period,- '',- '',- timezone,- filtersPerf,- measure,- projectPassword,- )+ dataPerf = await getPerfData(id, timeBucket, period, filters, '', '', timezone, measure, projectPassword)+ rawOverall = await getPerformanceOverallStats([id], period, '', '', timezone, filters, measure, projectPassword)}// @ts-expect-error@@ -1803,134 +1790,6 @@ const ViewProject = () => {}}- const filterHandler = async (column: string, filter: any, isExclusive = false) => {- if (dataLoading) {- return- }-- const columnPerf = `${column}_perf`- const columnSessions = `${column}_sess`- const columnErrors = `${column}_err`- const columnSubErrors = `${column}_subErr`- let filtersToUpdate: Filter[] = []-- switch (activeTab) {- case PROJECT_TABS.performance:- filtersToUpdate = updateFilterState(- searchParams,- setSearchParams,- filtersPerf,- setFiltersPerf,- columnPerf,- column,- filter,- isExclusive,- )- break- case PROJECT_TABS.sessions:- filtersToUpdate = updateFilterState(- searchParams,- setSearchParams,- filtersSessions,- setFiltersSessions,- columnSessions,- column,- filter,- isExclusive,- )- break- case PROJECT_TABS.errors:- if (!activeEID) {- filtersToUpdate = updateFilterState(- searchParams,- setSearchParams,- filtersErrors,- setFiltersErrors,- columnErrors,- column,- filter,- isExclusive,- )- } else {- filtersToUpdate = updateFilterState(- searchParams,- setSearchParams,- filtersSubError,- setFiltersSubError,- columnSubErrors,- column,- filter,- isExclusive,- )- }- break- case PROJECT_TABS.traffic:- filtersToUpdate = updateFilterState(- searchParams,- setSearchParams,- filters,- setFilters,- column,- column,- filter,- isExclusive,- )- break- }-- resetSessions()- resetErrors()-- sdkInstance?._emitEvent('filtersupdate', filtersToUpdate)- }-- const onFilterSearch = (items: Filter[], override: boolean): void => {- switch (activeTab) {- case PROJECT_TABS.performance:- handleNavigationParams(- items,- '_perf',- searchParams,- setSearchParams,- override,- setFiltersPerf,- loadAnalyticsPerf,- )- break- case PROJECT_TABS.sessions:- handleNavigationParams(- items,- '_sess',- searchParams,- setSearchParams,- override,- setFiltersSessions,- resetSessions,- )- break- case PROJECT_TABS.errors:- if (!activeEID) {- handleNavigationParams(items, '_err', searchParams, setSearchParams, override, setFiltersErrors, resetErrors)- } else {- handleNavigationParams(- items,- '_subErr',- searchParams,- setSearchParams,- override,- setFiltersSubError,- resetErrors,- )- }- break- default:- handleNavigationParams(items, '', searchParams, setSearchParams, override, setFilters, loadAnalytics)- }-- resetSessions()- resetErrors()- }-const onCustomMetric = (metrics: ProjectViewCustomEvent[]) => {if (activeTab !== PROJECT_TABS.traffic) {return@@ -1957,52 +1816,6 @@ const ViewProject = () => {setCustomMetrics([])}- const onChangeExclusive = (column: string, filter: string, isExclusive: boolean) => {- if (dataLoading) {- return- }-- const updateFilters = (filters: Filter[], setFilters: React.Dispatch<React.SetStateAction<Filter[]>>): Filter[] => {- const newFilters = filters.map((f) => (f.column === column && f.filter === filter ? { ...f, isExclusive } : f))- if (JSON.stringify(newFilters) !== JSON.stringify(filters)) {- setFilters(newFilters)- }- return newFilters- }-- let newFilters: Filter[]-- switch (activeTab) {- case PROJECT_TABS.performance:- newFilters = updateFilters(filtersPerf, setFiltersPerf)- break- case PROJECT_TABS.sessions:- newFilters = updateFilters(filtersSessions, setFiltersSessions)- break- case PROJECT_TABS.errors:- if (!activeEID) {- newFilters = updateFilters(filtersErrors, setFiltersErrors)- resetErrors()- } else {- newFilters = updateFilters(filtersSubError, setFiltersSubError)- }- break- default:- newFilters = updateFilters(filters, setFilters)- break- }-- const paramName = activeTab === PROJECT_TABS.performance ? `${column}_perf` : column-- if (searchParams.get(paramName) !== filter) {- const newSearchParams = new URLSearchParams(searchParams.toString())- newSearchParams.set(paramName, filter)- setSearchParams(newSearchParams)- }-- sdkInstance?._emitEvent('filtersupdate', newFilters)- }-const setDashboardTab = (key: keyof typeof PROJECT_TABS) => {if (dataLoading) {return@@ -2013,13 +1826,8 @@ const ViewProject = () => {setSearchParams(newSearchParams)}+ // TODO: DO WE NEED THIS?useEffect(() => {- parseFiltersFromUrl('_perf', searchParams, setFiltersPerf)- parseFiltersFromUrl('_sess', searchParams, setFiltersSessions)- parseFiltersFromUrl('_err', searchParams, setFiltersErrors)- parseFiltersFromUrl('_subErr', searchParams, setFiltersSubError)- parseFiltersFromUrl('', searchParams, setFilters)-const parsePeriodFilters = () => {try {const initialPeriod = (searchParams.get('period') as Period) || preferences.period || '7d'@@ -2120,7 +1928,7 @@ const ViewProject = () => {activeTab,activePerfMeasure,activeChartMetricsPerf,- filtersPerf,+ filters,authLoading,project,isActiveCompare,@@ -2141,18 +1949,7 @@ const ViewProject = () => {}loadSessions()- }, [- activeTab,- dateRange,- filtersSessions,- id,- period,- projectPassword,- timezone,- authLoading,- project,- areFiltersParsed,- ])+ }, [activeTab, dateRange, filters, id, period, projectPassword, timezone, authLoading, project, areFiltersParsed])useEffect(() => {if (authLoading || !areFiltersParsed || activeTab !== PROJECT_TABS.errors || authLoading || !project) {@@ -2164,7 +1961,7 @@ const ViewProject = () => {activeTab,errorOptions,dateRange,- filtersErrors,+ filters,id,period,projectPassword,@@ -2524,34 +2321,22 @@ const ViewProject = () => {navigate(_replace(routes.project_settings, ':id', id))}- const cleanURLFilters = () => {- for (const [key] of Array.from(searchParams.entries())) {- if (!isFilterValid(key, true)) {- continue- }- searchParams.delete(key)- }-- setSearchParams(searchParams)- }+ const getFilterLink = (column: string, value: string): LinkProps['to'] => {+ const isFilterActive = filters.findIndex((filter) => filter.column === column && filter.filter === value) >= 0- const resetActiveTabFilters = () => {- if (dataLoading) {- return+ const newSearchParams = new URLSearchParams(searchParams.toString())+ let searchString = ''++ if (isFilterActive) {+ newSearchParams.delete(column)+ searchString = newSearchParams.toString()+ } else {+ newSearchParams.append(column, value)+ searchString = newSearchParams.toString()}- cleanURLFilters()-- if (activeTab === PROJECT_TABS.traffic) {- setFilters([])- } else if (activeTab === PROJECT_TABS.performance) {- setFiltersPerf([])- } else if (activeTab === PROJECT_TABS.sessions) {- setFiltersSessions([])- } else if (activeTab === PROJECT_TABS.errors && !activeEID) {- setFiltersErrors([])- } else if (activeTab === PROJECT_TABS.errors && activeEID) {- setFiltersSubError([])+ return {+ search: searchString,}}@@ -2731,9 +2516,10 @@ const ViewProject = () => {setDashboardTab(tab.id)}- const currentUrl = new URL(window.location.href)- currentUrl.searchParams.set('tab', tab.id)- const tabUrl = tab.id === 'settings' ? _replace(routes.project_settings, ':id', id) : currentUrl.toString()+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.set('tab', tab.id)+ const tabUrl =+ tab.id === 'settings' ? _replace(routes.project_settings, ':id', id) : newSearchParams.toString()return (<Link@@ -2872,18 +2658,7 @@ const ViewProject = () => {size,dataLoading,activeTab,- filters:- activeTab === PROJECT_TABS.traffic- ? filters- : activeTab === PROJECT_TABS.performance- ? filtersPerf- : activeTab === PROJECT_TABS.sessions- ? filtersSessions- : activeTab === PROJECT_TABS.errors && !activeEID- ? filtersErrors- : activeTab === PROJECT_TABS.errors && activeEID- ? filtersSubError- : [],+ filters,// FunctionssetDateRange,@@ -3063,7 +2838,8 @@ const ViewProject = () => {}if (item.filters && !_isEmpty(item.filters)) {- onFilterSearch(item.filters, true)+ const newUrlParams = getFiltersUrlParams(filters, item.filters, true, searchParams)+ setSearchParams(newUrlParams)}if (item.customEvents && !_isEmpty(item.customEvents)) {@@ -3465,14 +3241,15 @@ const ViewProject = () => {</div></div>{activeTab === PROJECT_TABS.funnels ? (- <button- type='button'- onClick={() => setActiveFunnel(null)}- className='mx-auto mt-2 mb-4 flex items-center font-mono text-sm text-gray-900 underline decoration-dashed hover:decoration-solid lg:mx-0 lg:mt-0 dark:text-gray-100'+ <Link+ to={{+ search: pureSearchParams,+ }}+ className='mx-auto mt-2 mb-4 flex items-center font-mono text-sm text-gray-900 underline decoration-dashed hover:decoration-solid lg:mx-0 dark:text-gray-100'><ChevronLeftIcon className='mr-1 size-3' />{t('project.backToFunnels')}- </button>+ </Link>) : null}</>) : null}@@ -3505,11 +3282,9 @@ const ViewProject = () => {setIsNewFunnelOpened(true)}}- openFunnel={setActiveFunnel}funnels={project.funnels}deleteFunnel={onFunnelDelete}loading={funnelActionLoading}- authenticated={isAuthenticated}allowedToManage={allowedToManage}/>) : null}@@ -3543,20 +3318,10 @@ const ViewProject = () => {) : null}{activeTab === PROJECT_TABS.sessions && !activePSID ? (<>- <Filters- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />+ <Filters tnMapping={tnMapping} />{(sessionsLoading === null || sessionsLoading) && _isEmpty(sessions) ? <Loader /> : null}{typeof sessionsLoading === 'boolean' && !sessionsLoading && _isEmpty(sessions) ? (- <NoEvents- filters={filters}- filterHandler={filterHandler}- onChangeExclusive={onChangeExclusive}- resetActiveTabFilters={resetActiveTabFilters}- />+ <NoEvents filters={filters} />) : null}<Sessions sessions={sessions} timeFormat={timeFormat} />{canLoadMoreSessions ? (@@ -3580,19 +3345,15 @@ const ViewProject = () => {) : null}{activeTab === PROJECT_TABS.sessions && activePSID ? (<>- <button- type='button'- onClick={() => {- setActiveSession(null)- const newSearchParams = new URLSearchParams(searchParams.toString())- newSearchParams.delete('psid')- setSearchParams(newSearchParams)+ <Link+ to={{+ search: pureSearchParams,}}className='mx-auto mt-2 mb-4 flex items-center font-mono text-sm text-gray-900 underline decoration-dashed hover:decoration-solid lg:mx-0 dark:text-gray-100'><ChevronLeftIcon className='mr-1 size-3' />{t('project.backToSessions')}- </button>+ </Link>{activeSession?.details ? <SessionDetails details={activeSession?.details} /> : null}{!_isEmpty(activeSession?.chart) ? (<SessionChart@@ -3616,20 +3377,10 @@ const ViewProject = () => {) : null}{activeTab === PROJECT_TABS.errors && !activeEID ? (<>- <Filters- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />+ <Filters tnMapping={tnMapping} />{(errorsLoading === null || errorsLoading) && _isEmpty(errors) ? <Loader /> : null}{typeof errorsLoading === 'boolean' && !errorsLoading && _isEmpty(errors) ? (- <NoEvents- filters={filtersErrors}- filterHandler={filterHandler}- onChangeExclusive={onChangeExclusive}- resetActiveTabFilters={resetActiveTabFilters}- />+ <NoEvents filters={filters} />) : null}<Errors errors={errors} />{canLoadMoreErrors ? (@@ -3653,19 +3404,15 @@ const ViewProject = () => {) : null}{activeTab === PROJECT_TABS.errors && activeEID ? (<>- <button- type='button'- onClick={() => {- setActiveError(null)- const newSearchParams = new URLSearchParams(searchParams.toString())- newSearchParams.delete('eid')- setSearchParams(newSearchParams)+ <Link+ to={{+ search: pureSearchParams,}}- className='mx-auto mt-2 mb-4 flex items-center font-mono text-sm text-gray-900 underline decoration-dashed hover:decoration-solid lg:mx-0 lg:mt-0 dark:text-gray-100'+ className='mx-auto mt-2 mb-4 flex items-center font-mono text-sm text-gray-900 underline decoration-dashed hover:decoration-solid lg:mx-0 dark:text-gray-100'><ChevronLeftIcon className='mr-1 size-3' />{t('project.backToErrors')}- </button>+ </Link>{activeError?.details ? <ErrorDetails details={activeError.details} /> : null}{activeError?.chart ? (<ErrorChart@@ -3677,12 +3424,7 @@ const ViewProject = () => {dataNames={dataNames}/>) : null}- <Filters- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />+ <Filters tnMapping={tnMapping} /><div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>{!_isEmpty(activeError?.params)? _map(ERROR_PANELS_ORDER, (type: keyof typeof tnMapping) => {@@ -3708,7 +3450,7 @@ const ViewProject = () => {key={countryActiveTab}icon={panelIcon}id={countryActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}data={activeError.params[countryActiveTab]}rowMapper={rowMapper}@@ -3751,7 +3493,7 @@ const ViewProject = () => {key={browserActiveTab}icon={panelIcon}id={browserActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}data={activeError.params[browserActiveTab]}rowMapper={rowMapper}@@ -3801,7 +3543,7 @@ const ViewProject = () => {key={osActiveTab}icon={panelIcon}id={osActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}data={activeError.params[osActiveTab]}rowMapper={rowMapper}@@ -3815,7 +3557,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={activeError.params[type]}rowMapper={(entry: { name: keyof typeof deviceIconMapping }) => {@@ -3846,7 +3588,7 @@ const ViewProject = () => {key={pageActiveTab}icon={panelIcon}id={pageActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}rowMapper={({ name: entryName }) => {if (!entryName) {return _toUpper(@@ -3876,7 +3618,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={activeError.params[type]}rowMapper={({ name: entryName }: { name: string }) =>@@ -3891,7 +3633,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={activeError.params[type]}/>@@ -3909,21 +3651,9 @@ const ViewProject = () => {{analyticsLoading && (activeTab === PROJECT_TABS.traffic || activeTab === PROJECT_TABS.performance) ? (<Loader />) : null}- {isPanelsDataEmpty && activeTab === PROJECT_TABS.traffic ? (- <NoEvents- filters={filters}- filterHandler={filterHandler}- onChangeExclusive={onChangeExclusive}- resetActiveTabFilters={resetActiveTabFilters}- />- ) : null}+ {isPanelsDataEmpty && activeTab === PROJECT_TABS.traffic ? <NoEvents filters={filters} /> : null}{isPanelsDataEmptyPerf && activeTab === PROJECT_TABS.performance ? (- <NoEvents- filters={filtersPerf}- filterHandler={filterHandler}- onChangeExclusive={onChangeExclusive}- resetActiveTabFilters={resetActiveTabFilters}- />+ <NoEvents filters={filters} />) : null}{activeTab === PROJECT_TABS.traffic ? (<div className={cx('pt-2', { hidden: isPanelsDataEmpty || analyticsLoading })}>@@ -3967,12 +3697,7 @@ const ViewProject = () => {><div className='mt-5 h-80 md:mt-0 [&_svg]:!overflow-visible' id='dataChart' /></div>- <Filters- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />+ <Filters tnMapping={tnMapping} /><CustomMetricsmetrics={customMetrics}onRemoveMetric={(id) => onRemoveCustomMetric(id)}@@ -4012,7 +3737,7 @@ const ViewProject = () => {key={countryActiveTab}icon={panelIcon}id={countryActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}data={panelsData.data[countryActiveTab]}customTabs={customTabs}@@ -4056,7 +3781,7 @@ const ViewProject = () => {key={browserActiveTab}icon={panelIcon}id={browserActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}data={panelsData.data[browserActiveTab]}rowMapper={rowMapper}@@ -4106,7 +3831,7 @@ const ViewProject = () => {key={osActiveTab}icon={panelIcon}id={osActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}data={panelsData.data[osActiveTab]}rowMapper={rowMapper}@@ -4120,7 +3845,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}customTabs={customTabs}@@ -4152,7 +3877,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}customTabs={customTabs}@@ -4169,7 +3894,7 @@ const ViewProject = () => {key={utmActiveTab}icon={panelIcon}id={utmActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<UTMDropdown onSelect={setUtmActiveTab} title={ccPanelName} />}data={panelsData.data[utmActiveTab]}customTabs={customTabs}@@ -4184,7 +3909,7 @@ const ViewProject = () => {key={pageActiveTab}icon={panelIcon}id={pageActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}onFragmentChange={setPgActiveFragment}rowMapper={({ name: entryName }) => {if (!entryName) {@@ -4222,7 +3947,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}rowMapper={({ name: entryName }: { name: string }) =>@@ -4238,7 +3963,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsData.data[type]}customTabs={customTabs}@@ -4251,7 +3976,7 @@ const ViewProject = () => {customs={panelsData.customs}properties={panelsData.properties}filters={filters}- onFilter={filterHandler}+ getFilterLink={getFilterLink}chartData={chartData}customTabs={_filter(customPanelTabs, (tab) => tab.panelID === 'ce')}getCustomEventMetadata={getCustomEventMetadata}@@ -4277,12 +4002,7 @@ const ViewProject = () => {><div className='h-80 [&_svg]:!overflow-visible' id='dataChart' /></div>- <Filters- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />+ <Filters tnMapping={tnMapping} />{dataLoading ? (<div className='static mt-4 !bg-transparent' id='loader'><div className='loader-head dark:!bg-slate-800'>@@ -4317,7 +4037,7 @@ const ViewProject = () => {key={countryActiveTab}icon={panelIcon}id={countryActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}data={panelsDataPerf.data[countryActiveTab]}customTabs={customTabs}@@ -4334,7 +4054,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsDataPerf.data[type]}customTabs={customTabs}@@ -4368,7 +4088,7 @@ const ViewProject = () => {key={pageActiveTab}icon={panelIcon}id={pageActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}data={panelsDataPerf.data[pageActiveTab]}customTabs={customTabs}// @ts-expect-error@@ -4417,7 +4137,7 @@ const ViewProject = () => {key={browserActiveTab}icon={panelIcon}id={browserActiveTab}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}data={panelsDataPerf.data[browserActiveTab]}rowMapper={rowMapper}@@ -4430,7 +4150,7 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- onFilter={filterHandler}+ getFilterLink={getFilterLink}name={panelName}data={panelsDataPerf.data[type]}customTabs={customTabs}@@ -4482,17 +4202,8 @@ const ViewProject = () => {type={activeTab === PROJECT_TABS.errors ? 'errors' : 'traffic'}showModal={showFiltersSearch}setShowModal={setShowFiltersSearch}- setProjectFilter={onFilterSearch}tnMapping={tnMapping}- filters={- activeTab === PROJECT_TABS.performance- ? filtersPerf- : activeTab === PROJECT_TABS.sessions- ? filtersSessions- : activeTab === PROJECT_TABS.errors- ? filtersErrors- : filters- }+ filters={filters}/><AddAViewModalshowModal={isAddAViewOpened}diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsxindex b11fce512..b02a3e742 100644--- a/web/app/pages/Project/View/components/AddAViewModal.tsx+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx@@ -403,22 +403,26 @@ const AddAViewModal = ({ onSubmit, showModal, setShowModal, tnMapping, defaultVi{_map(activeFilters, ({ filter, column, isExclusive }) => (<Filterkey={`${column}-${filter}`}- onRemoveFilter={(removeColumn, removeFilter) => {+ onRemoveFilter={(e) => {+ e.preventDefault()+setActiveFilters((prevFilters: any) => {return _filter(prevFilters,- ({ column, filter }) => filter !== removeFilter || column !== removeColumn,+ ({ column: prevColumn, filter: prevFilter }) => prevFilter !== filter || prevColumn !== column,)})}}- onChangeExclusive={(columnToChange: string, filterToChange: string, isExclusive: boolean) => {+ onChangeExclusive={(e) => {+ e.preventDefault()+setActiveFilters((prevFilters: any) => {return _map(prevFilters, (item) => {- if (item.column === columnToChange && item.filter === filterToChange) {+ if (item.column === column && item.filter === filter) {return {- column: columnToChange,- filter: filterToChange,- isExclusive,+ column,+ filter,+ isExclusive: !isExclusive,}}diff --git a/web/app/pages/Project/View/components/CustomMetrics.tsx b/web/app/pages/Project/View/components/CustomMetrics.tsxindex 595ba84ee..587add36a 100644--- a/web/app/pages/Project/View/components/CustomMetrics.tsx+++ b/web/app/pages/Project/View/components/CustomMetrics.tsx@@ -55,8 +55,9 @@ const CustomMetric = ({ metric, onRemove }: CustomMetricProps) => {onClick={onRemove}type='button'className='ml-0.5 inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-800 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-300 focus:text-gray-900 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-gray-800 dark:hover:text-gray-300 dark:focus:bg-gray-800 dark:focus:text-gray-300'+ title={t('project.removeFilter')}+ aria-label={t('project.removeFilter')}>- <span className='sr-only'>Remove filter</span><svg className='h-2 w-2' stroke='currentColor' fill='none' viewBox='0 0 8 8'><path strokeLinecap='round' strokeWidth='1.5' d='M1 1l6 6m0-6L1 7' /></svg>diff --git a/web/app/pages/Project/View/components/Filters.tsx b/web/app/pages/Project/View/components/Filters.tsxindex 9ef6daca0..f5e7f9997 100644--- a/web/app/pages/Project/View/components/Filters.tsx+++ b/web/app/pages/Project/View/components/Filters.tsx@@ -6,36 +6,39 @@ import _replace from 'lodash/replace'import _startsWith from 'lodash/startsWith'import _truncate from 'lodash/truncate'import { FilterIcon } from 'lucide-react'-import { memo } from 'react'+import { memo, MouseEvent, useMemo } from 'react'import { useTranslation } from 'react-i18next'+import { Link, useSearchParams } from 'react-router'import { getLocaleDisplayName } from '~/utils/generic'import countries from '~/utils/isoCountries'+import { isFilterValid } from '../utils/filters'import { useViewProjectContext } from '../ViewProject'interface FilterProps {column: stringfilter: stringisExclusive: boolean- onRemoveFilter: (column: string, filter: string) => void- onChangeExclusive: (column: string, filter: string, isExclusive: boolean) => voidtnMapping: Record<string, string>canChangeExclusive?: booleanremovable?: boolean+ onChangeExclusive?: (e: MouseEvent) => void+ onRemoveFilter?: (e: MouseEvent) => void}export const Filter = ({column,filter,isExclusive,- onRemoveFilter,- onChangeExclusive,tnMapping,canChangeExclusive,removable,+ onChangeExclusive,+ onRemoveFilter,}: FilterProps) => {const { dataLoading } = useViewProjectContext()+ const [searchParams] = useSearchParams()const {t,i18n: { language },@@ -72,6 +75,24 @@ export const Filter = ({const truncatedFilter = _truncate(displayFilter)+ const createRemoveFilterPath = () => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ const paramKeyInUrl = isExclusive ? `!${column}` : column+ newSearchParams.delete(paramKeyInUrl, filter)+ return { search: newSearchParams.toString() }+ }++ const createToggleExclusivePath = () => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ const oldParamKey = isExclusive ? `!${column}` : column+ const newParamKey = isExclusive ? column : `!${column}`++ newSearchParams.delete(oldParamKey, filter)+ newSearchParams.append(newParamKey, filter)++ return { search: newSearchParams.toString() }+ }+return (<spantitle={truncatedFilter === displayFilter ? undefined : displayFilter}@@ -85,14 +106,34 @@ export const Filter = ({{displayColumn} {canChangeExclusive ? (- <span- className={cx('cursor-pointer border-b-2 border-dotted border-blue-400 text-blue-400', {- 'cursor-wait': dataLoading,- })}- onClick={() => onChangeExclusive(column, filter, !isExclusive)}+ <Link+ to={createToggleExclusivePath()}+ className={cx(+ 'cursor-pointer border-b-2 border-dotted border-blue-400 text-blue-400 hover:border-blue-500 hover:text-blue-500',+ {+ 'cursor-wait': dataLoading,+ },+ )}+ onClick={(e: MouseEvent) => {+ if (dataLoading) {+ e.preventDefault()+ return+ }+ onChangeExclusive?.(e)+ }}+ title={+ isExclusive+ ? t('project.toggleFilterToIs', { column: displayColumn, filter: truncatedFilter })+ : t('project.toggleFilterToIsNot', { column: displayColumn, filter: truncatedFilter })+ }+ aria-label={+ isExclusive+ ? t('project.toggleFilterToIs', { column: displayColumn, filter: truncatedFilter })+ : t('project.toggleFilterToIsNot', { column: displayColumn, filter: truncatedFilter })+ }>{t(`common.${isExclusive ? 'isNot' : 'is'}`)}- </span>+ </Link>) : (<span>{t(`common.${isExclusive ? 'isNot' : 'is'}`)}</span>)}@@ -100,35 +141,62 @@ export const Filter = ({{truncatedFilter}"{removable ? (- <button- onClick={() => onRemoveFilter(column, filter)}- type='button'+ <Link+ to={createRemoveFilterPath()}className={cx('ml-0.5 inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-800 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-300 focus:text-gray-900 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-gray-800 dark:hover:text-gray-300 dark:focus:bg-gray-800 dark:focus:text-gray-300',{'cursor-wait': dataLoading,},)}+ title={t('project.removeFilter')}+ aria-label={t('project.removeFilter')}+ onClick={(e: MouseEvent) => {+ if (dataLoading) {+ e.preventDefault()+ return+ }+ onRemoveFilter?.(e)+ }}>- <span className='sr-only'>Remove filter</span><svg className='h-2 w-2' stroke='currentColor' fill='none' viewBox='0 0 8 8'><path strokeLinecap='round' strokeWidth='1.5' d='M1 1l6 6m0-6L1 7' /></svg>- </button>+ </Link>) : null}</span>)}interface FiltersProps {- onRemoveFilter: (column: string, filter: string) => void- onChangeExclusive: (column: string, filter: string, isExclusive: boolean) => voidtnMapping: Record<string, string>- resetFilters: () => void}-const Filters = ({ onRemoveFilter, onChangeExclusive, tnMapping, resetFilters }: FiltersProps) => {+const Filters = ({ tnMapping }: FiltersProps) => {const { dataLoading, filters } = useViewProjectContext()+ const { t } = useTranslation('common')+ const [searchParams] = useSearchParams()++ const filterlessSearch = useMemo(() => {+ const newSearchParams = new URLSearchParams(searchParams.toString())++ const entries = Array.from(searchParams.entries())++ for (const [key] of entries) {+ let processedKey = key+ if (key.startsWith('!')) {+ processedKey = key.substring(1)+ }++ if (!isFilterValid(processedKey, true)) {+ continue+ }++ newSearchParams.delete(key)+ }++ return newSearchParams.toString()+ }, [searchParams])if (_isEmpty(filters)) {return null@@ -143,29 +211,22 @@ const Filters = ({ onRemoveFilter, onChangeExclusive, tnMapping, resetFilters }:const { column, filter } = propsconst key = `${column}${filter}`- return (- <Filter- key={key}- onRemoveFilter={onRemoveFilter}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- canChangeExclusive- removable- {...props}- />- )+ return <Filter key={key} tnMapping={tnMapping} canChangeExclusive removable {...props} />})}</div></div>- <XMarkIcon- className={cx(- 'box-content size-6 shrink-0 cursor-pointer stroke-2 px-1 text-gray-800 hover:text-gray-600 dark:text-gray-200 dark:hover:text-gray-300',- {- 'cursor-wait': dataLoading,- },- )}- onClick={resetFilters}- />+ <Link+ title={t('project.resetFilters')}+ aria-label={t('project.resetFilters')}+ to={{+ search: filterlessSearch,+ }}+ className={cx({+ 'cursor-wait': dataLoading,+ })}+ >+ <XMarkIcon className='box-content size-6 shrink-0 cursor-pointer stroke-2 px-1 text-gray-800 hover:text-gray-600 dark:text-gray-200 dark:hover:text-gray-300' />+ </Link></div>)}diff --git a/web/app/pages/Project/View/components/FunnelsList.tsx b/web/app/pages/Project/View/components/FunnelsList.tsxindex 5a3cac8f2..3a778ba48 100644--- a/web/app/pages/Project/View/components/FunnelsList.tsx+++ b/web/app/pages/Project/View/components/FunnelsList.tsx@@ -2,24 +2,24 @@ import { AdjustmentsVerticalIcon, PlusCircleIcon } from '@heroicons/react/24/outimport cx from 'clsx'import _map from 'lodash/map'import { Trash2Icon } from 'lucide-react'+import { useMemo } from 'react'import { useTranslation } from 'react-i18next'+import { Link, useSearchParams } from 'react-router'import { Funnel } from '~/lib/models/Project'+import { useAuth } from '~/providers/AuthProvider'interface FunnelsListProps {funnels?: any[]openFunnelSettings: (funnel?: Funnel) => void- openFunnel: (funnel: Funnel) => voiddeleteFunnel: (id: string) => voidloading: boolean- authenticated: booleanallowedToManage: boolean}interface FunnelCardProps {funnel: FunnelopenFunnelSettings: (funnel: Funnel) => void- openFunnel: (funnel: Funnel) => voiddeleteFunnel: (id: string) => voidloading: booleanallowedToManage: boolean@@ -29,19 +29,21 @@ interface AddFunnelProps {openFunnelSettings: (funnel?: Funnel) => void}-const FunnelCard = ({- funnel,- openFunnelSettings,- openFunnel,- deleteFunnel,- loading,- allowedToManage,-}: FunnelCardProps) => {+const FunnelCard = ({ funnel, openFunnelSettings, deleteFunnel, loading, allowedToManage }: FunnelCardProps) => {const { t } = useTranslation()+ const [searchParams] = useSearchParams()++ const search = useMemo(() => {+ const params = new URLSearchParams(searchParams)+ params.set('funnelId', funnel.id)+ return params.toString()+ }, [funnel.id, searchParams])return (- <li- onClick={() => openFunnel(funnel)}+ <Link+ to={{+ search,+ }}className='min-h-[120px] cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 hover:bg-gray-100 dark:border-slate-800/25 dark:bg-[#162032] dark:hover:bg-slate-800'><div className='px-4 py-4'>@@ -78,7 +80,7 @@ const FunnelCard = ({</div></div></div>- </li>+ </Link>)}@@ -104,29 +106,24 @@ const AddFunnel = ({ openFunnelSettings }: AddFunnelProps) => {)}-const FunnelsList = ({- funnels,- openFunnelSettings,- openFunnel,- deleteFunnel,- loading,- authenticated,- allowedToManage,-}: FunnelsListProps) => (- <ul className='mt-4 grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>- {_map(funnels, (funnel) => (- <FunnelCard- key={funnel.id}- funnel={funnel}- deleteFunnel={deleteFunnel}- openFunnelSettings={openFunnelSettings}- openFunnel={openFunnel}- loading={loading}- allowedToManage={allowedToManage}- />- ))}- {authenticated && allowedToManage ? <AddFunnel openFunnelSettings={openFunnelSettings} /> : null}- </ul>-)+const FunnelsList = ({ funnels, openFunnelSettings, deleteFunnel, loading, allowedToManage }: FunnelsListProps) => {+ const { isAuthenticated } = useAuth()++ return (+ <div role='list' className='mt-4 grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>+ {_map(funnels, (funnel) => (+ <FunnelCard+ key={funnel.id}+ funnel={funnel}+ deleteFunnel={deleteFunnel}+ openFunnelSettings={openFunnelSettings}+ loading={loading}+ allowedToManage={allowedToManage}+ />+ ))}+ {isAuthenticated && allowedToManage ? <AddFunnel openFunnelSettings={openFunnelSettings} /> : null}+ </div>+ )+}export default FunnelsListdiff --git a/web/app/pages/Project/View/components/NoEvents.tsx b/web/app/pages/Project/View/components/NoEvents.tsxindex 22a2c863d..dc969231f 100644--- a/web/app/pages/Project/View/components/NoEvents.tsx+++ b/web/app/pages/Project/View/components/NoEvents.tsx@@ -9,12 +9,9 @@ import Filters from './Filters'interface NoEventsProps {filters: Filter[]- filterHandler: (column: string, filter: any) => void- onChangeExclusive: (column: string, filter: any, isExclusive: boolean) => void- resetActiveTabFilters: () => void}-const NoEvents = ({ filters, filterHandler, onChangeExclusive, resetActiveTabFilters }: NoEventsProps) => {+const NoEvents = ({ filters }: NoEventsProps) => {const { t } = useTranslation('common')const tnMapping = typeNameMapping(t)@@ -32,12 +29,7 @@ const NoEvents = ({ filters, filterHandler, onChangeExclusive, resetActiveTabFilreturn (<><div className='mt-4'>- <Filters- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetActiveTabFilters}- />+ <Filters tnMapping={tnMapping} /></div><div className='mt-5 flex flex-col py-6 sm:px-6 lg:px-8'><div className='mx-auto w-full max-w-7xl text-gray-900 dark:text-gray-50'>diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsxindex fb738584f..644f1ecc2 100644--- a/web/app/pages/Project/View/components/SearchFilters.tsx+++ b/web/app/pages/Project/View/components/SearchFilters.tsx@@ -4,6 +4,7 @@ import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import { useState, useEffect, useCallback } from 'react'import { useTranslation } from 'react-i18next'+import { useNavigate, useSearchParams } from 'react-router'import { getFilters, getErrorsFilters } from '~/api'import { FILTERS_PANELS_ORDER, ERRORS_FILTERS_PANELS_ORDER } from '~/lib/constants'@@ -15,11 +16,60 @@ import Select from '~/ui/Select'import countries from '~/utils/isoCountries'import { Filter as FilterType } from '../interfaces/traffic'+import { isFilterValid } from '../utils/filters'import { Filter } from './Filters'+export const getFiltersUrlParams = (+ filters: FilterType[],+ newFilters: FilterType[],+ override: boolean,+ searchParams: URLSearchParams,+) => {+ const currentUrlParams = new URLSearchParams(searchParams.toString())+ const resultingFilters: FilterType[] = []++ if (override) {+ resultingFilters.push(...filters)+ } else {+ // Combining existing (from URL) and new (from modal) filters, removing duplicates+ const finalUniqueFiltersMap = new Map<string, FilterType>()++ newFilters.forEach((f) => {+ const mapKey = `${f.isExclusive ? '!' : ''}${f.column}=${f.filter}`+ finalUniqueFiltersMap.set(mapKey, f)+ })++ filters.forEach((f) => {+ const mapKey = `${f.isExclusive ? '!' : ''}${f.column}=${f.filter}`+ finalUniqueFiltersMap.set(mapKey, f)+ })++ resultingFilters.push(...Array.from(finalUniqueFiltersMap.values()))+ }++ const newUrlParams = new URLSearchParams()++ // Preserve non-filter parameters from the current URL+ for (const [key, value] of currentUrlParams.entries()) {+ let processedKey = key+ if (key.startsWith('!')) {+ processedKey = key.substring(1)+ }+ if (!isFilterValid(processedKey, true)) {+ newUrlParams.append(key, value)+ }+ }++ resultingFilters.forEach((f) => {+ const filterKey = f.isExclusive ? `!${f.column}` : f.column+ newUrlParams.append(filterKey, f.filter)+ })++ return newUrlParams+}+interface SearchFiltersProps {- setProjectFilter: (filters: FilterType[], override: boolean) => voidshowModal: booleansetShowModal: (show: boolean) => voidtnMapping: Record<string, string>@@ -27,7 +77,7 @@ interface SearchFiltersProps {type: 'traffic' | 'errors'}-const SearchFilters = ({ setProjectFilter, showModal, setShowModal, tnMapping, filters, type }: SearchFiltersProps) => {+const SearchFilters = ({ showModal, setShowModal, tnMapping, filters, type }: SearchFiltersProps) => {const { id } = useCurrentProject()const projectPassword = useProjectPassword(id)const {@@ -38,6 +88,8 @@ const SearchFilters = ({ setProjectFilter, showModal, setShowModal, tnMapping, fconst [searchList, setSearchList] = useState<any[]>([])const [activeFilters, setActiveFilters] = useState<FilterType[]>([])const [override, setOverride] = useState(false)+ const [searchParams] = useSearchParams()+ const navigate = useNavigate()const getFiltersList = useCallback(async (category: string) => {@@ -75,7 +127,7 @@ const SearchFilters = ({ setProjectFilter, showModal, setShowModal, tnMapping, freturn}- setActiveFilters((prevFilters: any) => [+ setActiveFilters((prevFilters: FilterType[]) => [...prevFilters,{column: filterType,@@ -94,13 +146,17 @@ const SearchFilters = ({ setProjectFilter, showModal, setShowModal, tnMapping, f}, 300)}+ const onSubmit = () => {+ const newUrlParams = getFiltersUrlParams(filters, activeFilters, override, searchParams)++ navigate({ search: newUrlParams.toString() })+ closeModal()+ }+return (<ModalonClose={closeModal}- onSubmit={() => {- setProjectFilter(activeFilters, override)- closeModal()- }}+ onSubmit={onSubmit}submitText={t('project.applyFilters')}title={t('project.advancedFilters')}message={@@ -120,8 +176,6 @@ const SearchFilters = ({ setProjectFilter, showModal, setShowModal, tnMapping, f{_map(filters, ({ column, filter, isExclusive }) => (<Filterkey={`${column}-${filter}`}- onChangeExclusive={() => {}}- onRemoveFilter={() => {}}isExclusive={isExclusive}column={column}filter={filter}@@ -153,22 +207,26 @@ const SearchFilters = ({ setProjectFilter, showModal, setShowModal, tnMapping, f{_map(activeFilters, ({ filter, column, isExclusive }) => (<Filterkey={`${column}-${filter}`}- onRemoveFilter={(removeColumn, removeFilter) => {+ onRemoveFilter={(e) => {+ e.preventDefault()+setActiveFilters((prevFilters: any) => {return _filter(prevFilters,- ({ column, filter }) => filter !== removeFilter || column !== removeColumn,+ ({ column: prevColumn, filter: prevFilter }) => prevFilter !== filter || prevColumn !== column,)})}}- onChangeExclusive={(columnToChange: string, filterToChange: string, isExclusive: boolean) => {+ onChangeExclusive={(e) => {+ e.preventDefault()+setActiveFilters((prevFilters: any) => {return _map(prevFilters, (item) => {- if (item.column === columnToChange && item.filter === filterToChange) {+ if (item.column === column && item.filter === filter) {return {- column: columnToChange,- filter: filterToChange,- isExclusive,+ column,+ filter,+ isExclusive: !isExclusive,}}diff --git a/web/app/pages/Project/View/components/TBPeriodSelector.tsx b/web/app/pages/Project/View/components/TBPeriodSelector.tsxindex d28e2d31f..a75b10d45 100644--- a/web/app/pages/Project/View/components/TBPeriodSelector.tsx+++ b/web/app/pages/Project/View/components/TBPeriodSelector.tsx@@ -7,7 +7,7 @@ import { CalendarIcon } from 'lucide-react'import React, { memo, Fragment, useMemo } from 'react'import { useTranslation } from 'react-i18next'-import { ALL_PERIODS } from '~/lib/constants'+import { TimeBucket, VALID_TIME_BUCKETS } from '~/lib/constants'import { useViewProjectContext } from '../ViewProject'@@ -27,8 +27,8 @@ const TBPeriodSelector = ({ items, title, onSelect, activePeriod, classes }: TBPconst { dataLoading, updateTimebucket, timeBucket } = useViewProjectContext()const { t } = useTranslation('common')- const periods = useMemo(() => {- return _map(ALL_PERIODS, (period: string) => ({+ const timeBuckets = useMemo(() => {+ return _map(VALID_TIME_BUCKETS, (period: TimeBucket) => ({label: t(`project.${period}`),value: period,available: _includes(activePeriod?.tbs, period),@@ -70,7 +70,7 @@ const TBPeriodSelector = ({ items, title, onSelect, activePeriod, classes }: TBPclasses?.timeBucket,)}>- {_map(periods, ({ label, value, available }) => (+ {_map(timeBuckets, ({ label, value, available }) => (<PopoverButtonkey={value}type='button'diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsxindex 6c58e7ceb..2ff95d2f7 100644--- a/web/app/pages/Project/View/utils/filters.tsx+++ b/web/app/pages/Project/View/utils/filters.tsx@@ -1,10 +1,10 @@import _includes from 'lodash/includes'import _keys from 'lodash/keys'import _reduce from 'lodash/reduce'-import _replace from 'lodash/replace'import _some from 'lodash/some'import _startsWith from 'lodash/startsWith'-import React from 'react'++import { VALID_PERIODS, VALID_TIME_BUCKETS } from '~/lib/constants'import { ProjectPreferences } from '../../../../providers/CurrentProjectProvider'import { Filter } from '../interfaces/traffic'@@ -15,8 +15,6 @@ export const ERROR_FILTERS_MAPPING = {export const FILTER_CHART_METRICS_MAPPING_FOR_COMPARE = ['bounce', 'viewsPerUnique', 'trendlines', 'customEvents']-export const validTimeBacket = ['hour', 'day', 'week', 'month']-export const validPeriods = ['custom', 'today', 'yesterday', '1d', '7d', '4w', '3M', '12M', '24M']const validFilters = ['host','cc',@@ -50,7 +48,7 @@ export const filterInvalidPreferences = ((prev: string[], curr: string) => {const { period, timeBucket } = prefs[curr]- if (!_includes(validPeriods, period) || !_includes(validTimeBacket, timeBucket)) {+ if (!_includes(VALID_PERIODS, period) || !_includes(VALID_TIME_BUCKETS, timeBucket)) {return prev}@@ -83,94 +81,31 @@ export const isFilterValid = (filter: string, checkDynamicFilters = false) => {return false}-const applyFilters = (items: Filter[], suffix: string, searchParams: URLSearchParams, override: boolean): Filter[] => {- const filtersToLoad: Filter[] = []- items.forEach((item) => {- if (!item.filter) return-- const filters = Array.isArray(item.filter) ? item.filter : [item.filter]- if (filters.length === 0) return+export const parseFilters = (searchParams: URLSearchParams): Filter[] => {+ const filters: Filter[] = []- const columnSuffix = `${item.column}${suffix}`-- if (override || !searchParams.has(columnSuffix)) {- searchParams.delete(columnSuffix)- filters.forEach((filter) => searchParams.append(columnSuffix, filter))- }+ const entries = Array.from(searchParams.entries())- filtersToLoad.push(item)- })- return filtersToLoad-}--export const handleNavigationParams = (- items: Filter[],- suffix: string,- searchParams: URLSearchParams,- setSearchParams: React.Dispatch<React.SetStateAction<URLSearchParams>>,- override: boolean,- stateSetter: React.Dispatch<React.SetStateAction<Filter[]>>,- loader: (forceReload: boolean, filters: Filter[]) => void,-): void => {- const filters = applyFilters(items, suffix, searchParams, override)- setSearchParams(searchParams)- stateSetter(override ? filters : (prev) => [...prev, ...filters])- loader(true, filters)-}+ for (const [key, value] of entries) {+ let actualColumn = key-export const updateFilterState = (- searchParams: URLSearchParams,- setSearchParams: React.Dispatch<React.SetStateAction<URLSearchParams>>,- filters: Filter[],- newFiltersStateSetter: React.Dispatch<React.SetStateAction<Filter[]>>,- column: string,- columnSuffix: string,- filter: any,- isExclusive: boolean,-) => {- const existingFilterIndex = filters.findIndex((f) => f.filter === filter)- let updatedFilters: Filter[]-- if (existingFilterIndex > -1) {- updatedFilters = filters.filter((_, index) => index !== existingFilterIndex)- searchParams.delete(column)- } else {- updatedFilters = [...filters, { column: columnSuffix, filter, isExclusive }]- searchParams.append(column, filter)- }+ let isExclusive = false- if (JSON.stringify(updatedFilters) !== JSON.stringify(filters)) {- newFiltersStateSetter(updatedFilters)- setSearchParams(searchParams)- }+ if (key.startsWith('!')) {+ isExclusive = true+ actualColumn = key.substring(1)+ }- return updatedFilters-}+ if (!isFilterValid(actualColumn)) {+ continue+ }-export const parseFiltersFromUrl = (- keySuffix: string,- searchParams: URLSearchParams,- setFilters: React.Dispatch<React.SetStateAction<Filter[]>>,-) => {- try {- const initialFilters: Filter[] = []-- searchParams.forEach((value, key) => {- if (!_includes(key, keySuffix)) return-- const keyWithoutSuffix = _replace(key, keySuffix, '')- if (!isFilterValid(keyWithoutSuffix)) return-- const isExclusive = _startsWith(value, '!')- initialFilters.push({- column: keyWithoutSuffix,- filter: isExclusive ? value.substring(1) : value,- isExclusive,- })+ filters.push({+ column: actualColumn,+ filter: value,+ isExclusive: isExclusive,})-- setFilters(initialFilters)- } catch (reason) {- console.error(`[ERROR] Parsing filters from URL with suffix ${keySuffix}: ${reason}`)}++ return filters}diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex db270458f..4c01729dd 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -836,6 +836,9 @@"customEventsAndMetrics": "Custom events and metrics (optional)","addAMetric": "Add a metric","customEvent": "Custom event",+ "removeFilter": "Remove filter",+ "toggleFilterToIs": "Change filter from '{{column}} is not \"{{filter}}\"' to '{{column}} is \"{{filter}}\"'",+ "toggleFilterToIsNot": "Change filter from '{{column}} is \"{{filter}}\"' to '{{column}} is not \"{{filter}}\"'","metrics": {"xAvg": "\"{{x}}\" average","xTotal": "\"{{x}}\" total",