📈 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
Rework filters experience
Blue Mouse66df5a549967
diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.tsindex 6fdf9fd13..eb849eee3 100644--- a/web/app/lib/constants/index.ts+++ b/web/app/lib/constants/index.ts@@ -250,8 +250,28 @@ export const PERIOD_PAIRS_COMPARE = {export const TRAFFIC_PANELS_ORDER = ['location', 'pg', 'devices', 'traffic-sources']export const PERFORMANCE_PANELS_ORDER = ['location', 'pg', 'devices']export const ERROR_PANELS_ORDER = ['location', 'pg', 'devices']-export const FILTERS_PANELS_ORDER = ['cc', 'pg', 'entryPage', 'exitPage', 'br', 'os', 'ref', 'lc', 'dv']-export const ERRORS_FILTERS_PANELS_ORDER = ['cc', 'pg', 'br', 'os', 'lc', 'dv']+export const FILTERS_PANELS_ORDER = [+ 'pg',+ 'entryPage',+ 'exitPage',+ 'host',+ 'cc',+ 'rg',+ 'ct',+ 'lc',+ 'dv',+ 'br',+ 'brv',+ 'os',+ 'osv',+ 'ref',+ 'so',+ 'me',+ 'ca',+ 'te',+ 'co',+]+export const ERRORS_FILTERS_PANELS_ORDER = ['cc', 'rg', 'ct', 'pg', 'br', 'brv', 'os', 'osv', 'lc', 'dv']// the maximum amount of months user can go back when picking a date in flat picker (project view)export const MAX_MONTHS_IN_PAST = 24diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsxindex f8bd71985..40654b33d 100644--- a/web/app/pages/Project/View/components/SearchFilters.tsx+++ b/web/app/pages/Project/View/components/SearchFilters.tsx@@ -1,24 +1,88 @@-import _filter from 'lodash/filter'-import _find from 'lodash/find'+import { Listbox, Transition, ListboxButton, ListboxOptions, ListboxOption } from '@headlessui/react'+import { useVirtualizer } from '@tanstack/react-virtual'+import cx from 'clsx'+import _includes from 'lodash/includes'import _isEmpty from 'lodash/isEmpty'-import _map from 'lodash/map'-import { useState, useEffect, useCallback } from 'react'+import _toLower from 'lodash/toLower'+import {+ BuildingIcon,+ CheckIcon,+ ChevronsUpDownIcon,+ CircleQuestionMark,+ CompassIcon,+ CpuIcon,+ FileIcon,+ FileTextIcon,+ Gamepad2Icon,+ GlobeIcon,+ LanguagesIcon,+ LinkIcon,+ LogInIcon,+ LogOutIcon,+ MapIcon,+ MapPinIcon,+ MegaphoneIcon,+ MonitorCogIcon,+ MonitorIcon,+ PlusIcon,+ RadioIcon,+ ServerIcon,+ ShareIcon,+ SlidersHorizontalIcon,+ SmartphoneIcon,+ TabletIcon,+ TabletSmartphoneIcon,+ TagIcon,+ Trash2Icon,+ TvIcon,+ WatchIcon,+} from 'lucide-react'+import { useState, useEffect, useCallback, useRef, useMemo, Fragment, ReactNode } 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'+import {+ FILTERS_PANELS_ORDER,+ ERRORS_FILTERS_PANELS_ORDER,+ BROWSER_LOGO_MAP,+ OS_LOGO_MAP,+ OS_LOGO_MAP_DARK,+} from '~/lib/constants'import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'-import Checkbox from '~/ui/Checkbox'-import Combobox from '~/ui/Combobox'+import { useTheme } from '~/providers/ThemeProvider'+import Flag from '~/ui/Flag'+import Spin from '~/ui/icons/Spin'import Modal from '~/ui/Modal'-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'+// Icon mapping for filter categories+const filterCategoryIcons: Record<string, ReactNode> = {+ cc: <MapPinIcon className='size-4' strokeWidth={1.5} />,+ rg: <MapIcon className='size-4' strokeWidth={1.5} />,+ ct: <BuildingIcon className='size-4' strokeWidth={1.5} />,+ pg: <FileTextIcon className='size-4' strokeWidth={1.5} />,+ entryPage: <LogInIcon className='size-4' strokeWidth={1.5} />,+ exitPage: <LogOutIcon className='size-4' strokeWidth={1.5} />,+ host: <ServerIcon className='size-4' strokeWidth={1.5} />,+ br: <CompassIcon className='size-4' strokeWidth={1.5} />,+ brv: <CompassIcon className='size-4' strokeWidth={1.5} />,+ os: <MonitorCogIcon className='size-4' strokeWidth={1.5} />,+ osv: <MonitorCogIcon className='size-4' strokeWidth={1.5} />,+ ref: <LinkIcon className='size-4' strokeWidth={1.5} />,+ so: <ShareIcon className='size-4' strokeWidth={1.5} />,+ me: <RadioIcon className='size-4' strokeWidth={1.5} />,+ ca: <MegaphoneIcon className='size-4' strokeWidth={1.5} />,+ te: <TagIcon className='size-4' strokeWidth={1.5} />,+ co: <FileIcon className='size-4' strokeWidth={1.5} />,+ lc: <LanguagesIcon className='size-4' strokeWidth={1.5} />,+ dv: <TabletSmartphoneIcon className='size-4' strokeWidth={1.5} />,+}++const ITEM_HEIGHT = 36export const getFiltersUrlParams = (filters: FilterType[],@@ -36,12 +100,12 @@ export const getFiltersUrlParams = (const finalUniqueFiltersMap = new Map<string, FilterType>()newFilters.forEach((f) => {- const mapKey = `${f.isExclusive ? '!' : ''}${f.column}=${f.filter}`+ const mapKey = `${f.isExclusive ? '!' : ''}${f.isContains ? '~' : ''}${f.column}=${f.filter}`finalUniqueFiltersMap.set(mapKey, f)})filters.forEach((f) => {- const mapKey = `${f.isExclusive ? '!' : ''}${f.column}=${f.filter}`+ const mapKey = `${f.isExclusive ? '!' : ''}${f.isContains ? '~' : ''}${f.column}=${f.filter}`finalUniqueFiltersMap.set(mapKey, f)})@@ -72,6 +136,303 @@ export const getFiltersUrlParams = (return newUrlParams}+type FilterOperator = 'is' | 'isNot' | 'contains' | 'notContains'++interface FilterRow {+ id: string+ column: string+ operator: FilterOperator+ value: string+}++const OPERATORS: { value: FilterOperator; labelKey: string }[] = [+ { value: 'is', labelKey: 'common.is' },+ { value: 'isNot', labelKey: 'common.isNot' },+ { value: 'contains', labelKey: 'project.contains.is' },+ { value: 'notContains', labelKey: 'project.contains.not' },+]++const operatorToFilter = (operator: FilterOperator): { isExclusive: boolean; isContains: boolean } => {+ switch (operator) {+ case 'is':+ return { isExclusive: false, isContains: false }+ case 'isNot':+ return { isExclusive: true, isContains: false }+ case 'contains':+ return { isExclusive: false, isContains: true }+ case 'notContains':+ return { isExclusive: true, isContains: true }+ }+}++// Device icon mapping+const deviceIconMapping: Record<string, ReactNode> = {+ desktop: <MonitorIcon className='size-4' strokeWidth={1.5} />,+ mobile: <SmartphoneIcon className='size-4' strokeWidth={1.5} />,+ tablet: <TabletIcon className='size-4' strokeWidth={1.5} />,+ smarttv: <TvIcon className='size-4' strokeWidth={1.5} />,+ console: <Gamepad2Icon className='size-4' strokeWidth={1.5} />,+ wearable: <WatchIcon className='size-4' strokeWidth={1.5} />,+ embedded: <CpuIcon className='size-4' strokeWidth={1.5} />,+}++interface ValueInputProps {+ items: string[]+ value: string+ onChange: (value: string) => void+ placeholder: string+ column: string+ language: string+ disabled?: boolean+ isLoading?: boolean+ theme: string+}++const ValueInput = ({+ items,+ value,+ onChange,+ placeholder,+ column,+ language,+ disabled,+ isLoading,+ theme,+}: ValueInputProps) => {+ const { t } = useTranslation('common')+ const [inputValue, setInputValue] = useState(value)+ const [isOpen, setIsOpen] = useState(false)+ const listRef = useRef<HTMLDivElement>(null)+ const inputRef = useRef<HTMLInputElement>(null)+ const containerRef = useRef<HTMLDivElement>(null)++ // Sync input value with prop value+ useEffect(() => {+ setInputValue(value)+ }, [value])++ // Close dropdown when clicking outside+ useEffect(() => {+ const handleClickOutside = (event: MouseEvent) => {+ if (containerRef.current && !containerRef.current.contains(event.target as Node)) {+ setIsOpen(false)+ }+ }+ document.addEventListener('mousedown', handleClickOutside)+ return () => document.removeEventListener('mousedown', handleClickOutside)+ }, [])++ const getLabelForItem = useCallback(+ (item: string) => {+ if (column === 'cc') {+ return countries.getName(item, language) || item+ }+ return item || t('common.notSet')+ },+ [column, language, t],+ )++ const getIconForItem = useCallback(+ (item: string): ReactNode => {+ if (column === 'cc') {+ return <Flag className='shrink-0 rounded-xs' country={item} size={16} alt='' aria-hidden='true' />+ }++ if (column === 'br') {+ // @ts-expect-error - dynamic key access+ const logoUrl = BROWSER_LOGO_MAP[item]+ if (logoUrl) {+ return <img src={logoUrl} className='size-4 shrink-0' alt='' />+ }+ return <GlobeIcon className='size-4 shrink-0' strokeWidth={1.5} />+ }++ if (column === 'os') {+ // @ts-expect-error - dynamic key access+ const logoPathLight = OS_LOGO_MAP[item]+ // @ts-expect-error - dynamic key access+ const logoPathDark = OS_LOGO_MAP_DARK[item]+ let logoPath = theme === 'dark' ? logoPathDark : logoPathLight+ logoPath ||= logoPathLight++ if (logoPath) {+ return <img src={`/${logoPath}`} className='size-4 shrink-0 dark:fill-gray-50' alt='' />+ }+ return <GlobeIcon className='size-4 shrink-0' strokeWidth={1.5} />+ }++ if (column === 'dv') {+ const icon = deviceIconMapping[item]+ if (icon) {+ return <span className='shrink-0'>{icon}</span>+ }+ return <CircleQuestionMark className='size-4 shrink-0' strokeWidth={1.5} />+ }++ return null+ },+ [column, theme],+ )++ const filteredItems = useMemo(() => {+ if (_isEmpty(inputValue)) return items+ return items.filter((item) => {+ const labelValue = getLabelForItem(item)+ return _includes(_toLower(labelValue), _toLower(inputValue))+ })+ }, [items, inputValue, getLabelForItem])++ const virtualizer = useVirtualizer({+ count: filteredItems.length,+ getScrollElement: () => listRef.current,+ estimateSize: () => ITEM_HEIGHT,+ overscan: 15,+ })++ const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {+ const newValue = e.target.value+ setInputValue(newValue)+ setIsOpen(true)+ }++ const handleSelectItem = (item: string) => {+ setInputValue(getLabelForItem(item))+ onChange(item)+ setIsOpen(false)+ }++ const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {+ if (e.key === 'Enter') {+ e.preventDefault()+ if (inputValue.trim()) {+ // For country codes, try to find the alpha2 code+ if (column === 'cc') {+ const alpha2 = countries.getAlpha2Code(inputValue, language)+ if (alpha2) {+ onChange(alpha2)+ } else {+ // Check if it's already a valid alpha2 code+ const validCode = items.find((item) => _toLower(item) === _toLower(inputValue))+ onChange(validCode || inputValue.trim())+ }+ } else {+ // Check if input matches an existing item (case insensitive)+ const matchingItem = items.find((item) => _toLower(getLabelForItem(item)) === _toLower(inputValue.trim()))+ onChange(matchingItem || inputValue.trim())+ }+ setIsOpen(false)+ }+ } else if (e.key === 'Escape') {+ setIsOpen(false)+ }+ }++ const displayValue = value ? getLabelForItem(value) : ''++ return (+ <div ref={containerRef} className='relative flex-1'>+ <div className='relative'>+ <input+ ref={inputRef}+ type='text'+ className={cx(+ 'w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-sm transition-colors placeholder:text-gray-400 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:placeholder:text-gray-500',+ {+ 'cursor-not-allowed opacity-60': disabled,+ },+ )}+ placeholder={placeholder}+ value={isOpen ? inputValue : displayValue || inputValue}+ onChange={handleInputChange}+ onFocus={() => setIsOpen(true)}+ onKeyDown={handleKeyDown}+ disabled={disabled}+ />+ <span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>+ {isLoading ? <Spin className='size-4' /> : <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />}+ </span>+ </div>++ {isOpen && !disabled ? (+ <div className='absolute z-50 mt-1 w-full min-w-[200px] rounded-md bg-white text-sm shadow-lg ring-1 ring-black/10 dark:bg-slate-800'>+ {isLoading ? (+ <div className='flex items-center justify-center gap-2 px-4 py-3 text-gray-500 dark:text-gray-400'>+ <Spin className='size-4' />+ {t('common.loading')}+ </div>+ ) : _isEmpty(filteredItems) ? (+ <div className='px-4 py-3'>+ {inputValue.trim() ? (+ <button+ type='button'+ onClick={() => {+ if (column === 'cc') {+ const alpha2 = countries.getAlpha2Code(inputValue, language)+ onChange(alpha2 || inputValue.trim())+ } else {+ onChange(inputValue.trim())+ }+ setIsOpen(false)+ }}+ className='flex w-full items-center justify-center gap-1.5 rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-indigo-700'+ >+ <PlusIcon className='h-4 w-4' />+ {t('project.filterUseValue', { value: inputValue.trim() })}+ </button>+ ) : (+ <span className='text-gray-500 dark:text-gray-400'>{t('common.nothingFound')}</span>+ )}+ </div>+ ) : (+ <div ref={listRef} className='max-h-48 overflow-auto py-1'>+ <div+ style={{+ height: `${virtualizer.getTotalSize()}px`,+ width: '100%',+ position: 'relative',+ }}+ >+ {virtualizer.getVirtualItems().map((virtualItem) => {+ const item = filteredItems[virtualItem.index]+ const labelValue = getLabelForItem(item)+ const selected = item === value+ const icon = getIconForItem(item)++ return (+ <button+ key={item}+ type='button'+ onClick={() => handleSelectItem(item)}+ className={cx(+ 'absolute right-0 left-0 mx-1 flex cursor-pointer items-center gap-2 rounded-md py-2 pr-4 pl-2 text-left transition-colors select-none hover:bg-gray-100 dark:hover:bg-slate-700',+ {+ 'bg-indigo-50 dark:bg-indigo-900/30': selected,+ 'text-gray-700 dark:text-gray-50': !selected,+ },+ )}+ style={{+ top: 0,+ transform: `translateY(${virtualItem.start}px)`,+ height: `${virtualItem.size}px`,+ }}+ >+ {icon}+ <span className={cx('block truncate', { 'font-medium': selected })}>{labelValue}</span>+ {selected ? (+ <CheckIcon className='ml-auto h-4 w-4 shrink-0 text-indigo-600 dark:text-indigo-400' />+ ) : null}+ </button>+ )+ })}+ </div>+ </div>+ )}+ </div>+ ) : null}+ </div>+ )+}+interface SearchFiltersProps {showModal: booleansetShowModal: (show: boolean) => void@@ -83,203 +444,376 @@ interface SearchFiltersProps {const SearchFilters = ({ showModal, setShowModal, tnMapping, filters, type }: SearchFiltersProps) => {const { id } = useCurrentProject()const projectPassword = useProjectPassword(id)+ const { theme } = useTheme()const {t,i18n: { language },} = useTranslation('common')- const [filterType, setFilterType] = useState('')- const [searchList, setSearchList] = useState<any[]>([])- const [activeFilters, setActiveFilters] = useState<FilterType[]>([])- const [override, setOverride] = useState(false)+ const [filterRows, setFilterRows] = useState<FilterRow[]>([])+ const [filterValuesCache, setFilterValuesCache] = useState<Record<string, string[]>>({})+ const [loadingColumns, setLoadingColumns] = useState<Set<string>>(new Set())const [searchParams] = useSearchParams()const navigate = useNavigate()- const getFiltersList = useCallback(- async (category: string) => {- let result: any[]-- if (type === 'errors') {- result = await getErrorsFilters(id, category, projectPassword)- } else {- result = await getFilters(id, category, projectPassword)+ const panelOptions = type === 'traffic' ? FILTERS_PANELS_ORDER : ERRORS_FILTERS_PANELS_ORDER++ const fetchFilterValues = useCallback(+ async (column: string) => {+ if (filterValuesCache[column] || loadingColumns.has(column)) return++ setLoadingColumns((prev) => new Set(prev).add(column))+ try {+ let result: string[]+ if (type === 'errors') {+ result = await getErrorsFilters(id, column, projectPassword)+ } else {+ result = await getFilters(id, column, projectPassword)+ }+ setFilterValuesCache((prev) => ({ ...prev, [column]: result }))+ } catch (error) {+ console.error('Failed to fetch filter values:', error)+ setFilterValuesCache((prev) => ({ ...prev, [column]: [] }))+ } finally {+ setLoadingColumns((prev) => {+ const newSet = new Set(prev)+ newSet.delete(column)+ return newSet+ })}-- setSearchList(result)},- [id, projectPassword, type],+ [id, projectPassword, type, filterValuesCache, loadingColumns],)+ // Pre-fetch all filter values when modal opensuseEffect(() => {- if (!showModal || _isEmpty(filterType)) {- return+ if (showModal) {+ // Pre-fetch values for all panel options+ panelOptions.forEach((column) => {+ if (!filterValuesCache[column] && !loadingColumns.has(column)) {+ fetchFilterValues(column)+ }+ })}+ }, [showModal, panelOptions, fetchFilterValues, filterValuesCache, loadingColumns])- // eslint-disable-next-line react-hooks/set-state-in-effect -- Fetching filter list when modal opens- getFiltersList(filterType)- }, [filterType, showModal, getFiltersList])-- const onItemSelect = (item: string) => {- let processedItem = item-- if (filterType === 'cc') {- processedItem = countries.getAlpha2Code(item, language) as string+ // Initialize filter rows when modal opens+ useEffect(() => {+ if (showModal) {+ if (_isEmpty(filterRows)) {+ // Start with one empty filter row+ setFilterRows([{ id: crypto.randomUUID(), column: '', operator: 'is', value: '' }])+ }}+ }, [showModal, filterRows])- const itemExists = _find(activeFilters, ({ column, filter }) => filter === processedItem && column === filterType)+ const addFilterRow = () => {+ setFilterRows((prev) => [...prev, { id: crypto.randomUUID(), column: '', operator: 'is', value: '' }])+ }- if (itemExists) {- return- }+ const removeFilterRow = (rowId: string) => {+ setFilterRows((prev) => {+ const newRows = prev.filter((r) => r.id !== rowId)+ // Keep at least one row+ if (newRows.length === 0) {+ return [{ id: crypto.randomUUID(), column: '', operator: 'is', value: '' }]+ }+ return newRows+ })+ }- setActiveFilters((prevFilters: FilterType[]) => [- ...prevFilters,- {- column: filterType,- filter: processedItem,- isExclusive: false,- isContains: false,- },- ])+ const updateFilterRow = (rowId: string, field: keyof FilterRow, fieldValue: string) => {+ setFilterRows((prev) =>+ prev.map((row) => {+ if (row.id !== rowId) return row++ if (field === 'column') {+ // Reset value when column changes, but fetch values immediately+ if (fieldValue && !filterValuesCache[fieldValue] && !loadingColumns.has(fieldValue)) {+ fetchFilterValues(fieldValue)+ }+ return { ...row, column: fieldValue, value: '' }+ }+ return { ...row, [field]: fieldValue }+ }),+ )}const closeModal = () => {setShowModal(false)setTimeout(() => {- setFilterType('')- setActiveFilters([])- setOverride(false)+ setFilterRows([])}, 300)}- const onSubmit = () => {- const newUrlParams = getFiltersUrlParams(filters, activeFilters, override, searchParams)+ const clearAllFilters = () => {+ setFilterRows([{ id: crypto.randomUUID(), column: '', operator: 'is', value: '' }])+ }+ const onSubmit = () => {+ // Convert filter rows to FilterType format+ const validFilters = filterRows+ .filter((row) => row.column && row.value)+ .map((row) => {+ const { isExclusive, isContains } = operatorToFilter(row.operator)+ let processedValue = row.value++ if (row.column === 'cc') {+ const alpha2 = countries.getAlpha2Code(row.value, language)+ if (alpha2) {+ processedValue = alpha2+ }+ }++ return {+ column: row.column,+ filter: processedValue,+ isExclusive,+ isContains,+ }+ })++ const newUrlParams = getFiltersUrlParams(filters, validFilters, true, searchParams)navigate({ search: newUrlParams.toString() })closeModal()}+ const hasValidFilters = filterRows.some((row) => row.column && row.value)+return (<Modal+ size='medium'onClose={closeModal}onSubmit={onSubmit}submitText={t('project.applyFilters')}- title={t('project.filters')}+ submitDisabled={!hasValidFilters}+ title={+ <span className='flex items-center gap-2'>+ <SlidersHorizontalIcon className='h-5 w-5' />+ {t('project.filters')}+ </span>+ }message={- <div className='min-h-[410px]'>- <Select- label={t('project.selectCategory')}- items={type === 'traffic' ? FILTERS_PANELS_ORDER : ERRORS_FILTERS_PANELS_ORDER}- labelExtractor={(item) => tnMapping[item] || t(`project.mapping.${item}`)}- onSelect={(item) => setFilterType(item)}- title={- _isEmpty(filterType)- ? t('project.settings.reseted.selectFilters')- : tnMapping[filterType] || t(`project.mapping.${filterType}`)- }- selectedItem={_isEmpty(filterType) ? undefined : filterType}- />- {!_isEmpty(filters) ? (- <>- <p className='mt-5 text-sm font-medium text-gray-700 dark:text-gray-200'>{t('project.currentFilters')}</p>- {_map(filters, ({ column, filter, isExclusive }) => (- <Filter- key={`${column}-${filter}`}- isExclusive={isExclusive}- column={column}- filter={filter}- tnMapping={tnMapping}- removable={false}- canChangeExclusive={false}+ <div className='min-h-[280px] space-y-4'>+ {/* Filter Rows */}+ <div className='space-y-3'>+ {filterRows.map((row) => (+ <div key={row.id} className='flex items-center gap-2'>+ {/* Column Select */}+ <Listbox value={row.column} onChange={(value) => updateFilterRow(row.id, 'column', value)}>+ {({ open }) => (+ <div className='relative w-44'>+ <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>+ <span className={cx('flex items-center gap-2 truncate', { 'text-gray-400': !row.column })}>+ {row.column ? filterCategoryIcons[row.column] : null}+ {row.column+ ? tnMapping[row.column] || t(`project.mapping.${row.column}`)+ : t('project.selectColumn')}+ </span>+ <span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>+ <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />+ </span>+ </ListboxButton>+ <Transition+ show={open}+ as={Fragment}+ enter='transition ease-in duration-100'+ enterFrom='opacity-0'+ enterTo='opacity-100'+ leave='transition ease-in duration-100'+ leaveFrom='opacity-100'+ leaveTo='opacity-0'+ >+ <ListboxOptions+ static+ className='absolute z-50 mt-1 max-h-60 w-full min-w-[180px] overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-800'+ >+ {panelOptions.map((option) => (+ <ListboxOption+ key={option}+ value={option}+ className={({ focus }) =>+ cx('relative cursor-pointer py-2 pr-4 pl-3 select-none', {+ 'bg-gray-100 dark:bg-slate-700': focus,+ 'text-gray-700 dark:text-gray-50': !focus,+ })+ }+ >+ {({ selected }) => (+ <span className={cx('flex items-center gap-2', { 'font-medium': selected })}>+ <span className='shrink-0 text-gray-500 dark:text-gray-400'>+ {filterCategoryIcons[option]}+ </span>+ <span className='truncate'>+ {tnMapping[option] || t(`project.mapping.${option}`)}+ </span>+ {selected ? (+ <CheckIcon className='ml-auto h-4 w-4 shrink-0 text-indigo-600 dark:text-indigo-400' />+ ) : null}+ </span>+ )}+ </ListboxOption>+ ))}+ </ListboxOptions>+ </Transition>+ </div>+ )}+ </Listbox>++ {/* Operator Select */}+ <Listbox value={row.operator} onChange={(value) => updateFilterRow(row.id, 'operator', value)}>+ {({ open }) => (+ <div className='relative w-32'>+ <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>+ <span className='block truncate'>+ {t(OPERATORS.find((o) => o.value === row.operator)?.labelKey || '')}+ </span>+ <span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>+ <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />+ </span>+ </ListboxButton>+ <Transition+ show={open}+ as={Fragment}+ enter='transition ease-in duration-100'+ enterFrom='opacity-0'+ enterTo='opacity-100'+ leave='transition ease-in duration-100'+ leaveFrom='opacity-100'+ leaveTo='opacity-0'+ >+ <ListboxOptions+ static+ className='absolute z-50 mt-1 w-full overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-800'+ >+ {OPERATORS.map((op) => (+ <ListboxOption+ key={op.value}+ value={op.value}+ className={({ focus }) =>+ cx('relative cursor-pointer py-2 pr-4 pl-8 select-none', {+ 'bg-gray-100 dark:bg-slate-700': focus,+ 'text-gray-700 dark:text-gray-50': !focus,+ })+ }+ >+ {({ selected }) => (+ <>+ <span className={cx('block truncate', { 'font-medium': selected })}>+ {t(op.labelKey)}+ </span>+ {selected ? (+ <span className='absolute inset-y-0 left-0 flex items-center pl-2 text-indigo-600 dark:text-indigo-400'>+ <CheckIcon className='h-4 w-4' />+ </span>+ ) : null}+ </>+ )}+ </ListboxOption>+ ))}+ </ListboxOptions>+ </Transition>+ </div>+ )}+ </Listbox>++ {/* Freeform Value Input with Suggestions */}+ <ValueInput+ items={filterValuesCache[row.column] || []}+ value={row.value}+ onChange={(value) => updateFilterRow(row.id, 'value', value)}+ placeholder={t('project.filterSearchOrType')}+ column={row.column}+ language={language}+ disabled={!row.column}+ isLoading={loadingColumns.has(row.column)}+ theme={theme}/>- ))}- </>- ) : null}- {filterType && !_isEmpty(searchList) ? (- <>- <p className='mt-5 text-sm font-medium text-gray-700 dark:text-gray-200'>{t('project.filters')}</p>- <Combobox- items={searchList}- labelExtractor={(item) => {- if (filterType === 'cc') {- return countries.getName(item, language)- }- return item- }}- onSelect={onItemSelect}- placeholder={t('project.settings.reseted.filtersPlaceholder')}- />- </>- ) : null}- <div className='mt-2'>- {_map(activeFilters, ({ filter, column, isExclusive, isContains }) => (- <Filter- key={`${column}-${filter}`}- onRemoveFilter={(e) => {- e.preventDefault()-- setActiveFilters((prevFilters: any) => {- return _filter(- prevFilters,- ({ column: prevColumn, filter: prevFilter }) => prevFilter !== filter || prevColumn !== column,- )- })- }}- onChangeExclusive={(e) => {- e.preventDefault()-- setActiveFilters((prevFilters: any) => {- return _map(prevFilters, (item) => {- if (item.column === column && item.filter === filter) {- // Cycle: is -> is not -> contains -> not contains -> is- let nextContains = isContains- let nextExclusive = isExclusive- if (!isContains && !isExclusive) {- nextContains = false- nextExclusive = true- } else if (!isContains && isExclusive) {- nextContains = true- nextExclusive = false- } else if (isContains && !isExclusive) {- nextContains = true- nextExclusive = true- } else {- nextContains = false- nextExclusive = false- }-- return { column, filter, isExclusive: nextExclusive, isContains: nextContains }- }-- return item- })- })- }}- isExclusive={isExclusive}- column={column}- filter={filter}- tnMapping={tnMapping}- isContains={isContains}- canChangeExclusive- removable- />+ {/* Delete Button */}+ <button+ type='button'+ onClick={() => removeFilterRow(row.id)}+ className='rounded-md p-2 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-slate-700 dark:hover:text-gray-300'+ title={t('project.removeFilter')}+ >+ <Trash2Icon className='h-5 w-5' />+ </button>+ </div>))}</div>- {!_isEmpty(activeFilters) ? (- <Checkbox- checked={Boolean(override)}- onChange={setOverride}- name='overrideCurrentlyFilters'- classes={{- label: 'mt-4',- }}- label={t('project.overrideCurrentlyFilters')}- />++ {/* Action Buttons */}+ <div className='flex items-center justify-between border-t border-gray-200 pt-4 dark:border-gray-700'>+ <button+ type='button'+ onClick={addFilterRow}+ className='flex items-center gap-1.5 rounded-md px-3 py-1.5 text-sm font-medium text-indigo-600 transition-colors hover:bg-indigo-50 dark:text-indigo-400 dark:hover:bg-indigo-900/20'+ >+ <PlusIcon className='h-4 w-4' />+ {t('project.addFilter')}+ </button>++ {filterRows.length > 1 || hasValidFilters ? (+ <button+ type='button'+ onClick={clearAllFilters}+ className='rounded-md px-3 py-1.5 text-sm font-medium text-gray-600 transition-colors hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-slate-700'+ >+ {t('project.clearAllFilters')}+ </button>+ ) : null}+ </div>++ {/* Currently Applied Filters */}+ {!_isEmpty(filters) ? (+ <div className='border-t border-gray-200 pt-4 dark:border-gray-700'>+ <p className='mb-2 text-xs font-medium text-gray-500 uppercase dark:text-gray-400'>+ {t('project.currentFilters')}+ </p>+ <div className='flex flex-wrap gap-2'>+ {filters.map(({ column, filter, isExclusive, isContains }) => {+ let displayFilter = filter+ if (column === 'cc') {+ displayFilter = countries.getName(filter, language) || filter+ }+ const operatorLabel = isContains+ ? isExclusive+ ? t('project.contains.not')+ : t('project.contains.is')+ : isExclusive+ ? t('common.isNot')+ : t('common.is')++ return (+ <span+ key={`${column}-${filter}`}+ className='inline-flex items-center gap-1 rounded-full bg-gray-100 px-2.5 py-1 text-xs font-medium text-gray-700 dark:bg-slate-700 dark:text-gray-300'+ >+ <span className='text-gray-500 dark:text-gray-400'>+ {tnMapping[column] || t(`project.mapping.${column}`)}+ </span>+ <span+ className={cx({+ 'text-green-600 dark:text-green-400': !isExclusive && !isContains,+ 'text-red-600 dark:text-red-400': isExclusive && !isContains,+ 'text-yellow-600 dark:text-yellow-400': !isExclusive && isContains,+ 'text-orange-600 dark:text-orange-400': isExclusive && isContains,+ })}+ >+ {operatorLabel}+ </span>+ <span className='font-semibold'>{displayFilter}</span>+ </span>+ )+ })}+ </div>+ </div>) : null}</div>}submitType='regular'isOpened={showModal}+ overflowVisible/>)}diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsxindex 55f034a72..6fe2a1869 100644--- a/web/app/pages/Project/View/utils/filters.tsx+++ b/web/app/pages/Project/View/utils/filters.tsx@@ -34,6 +34,8 @@ const validFilters = ['so','me','ca',+ 'te',+ 'co','ev','tag:key','tag:value',diff --git a/web/app/ui/Modal.tsx b/web/app/ui/Modal.tsxindex 676948148..643cdaf37 100644--- a/web/app/ui/Modal.tsx+++ b/web/app/ui/Modal.tsx@@ -25,7 +25,7 @@ interface ModalProps {submitText?: stringsubmitDisabled?: booleansubmitType?: 'regular' | 'danger'- size?: 'regular' | 'large'+ size?: 'regular' | 'medium' | 'large'customButtons?: React.ReactNodeisLoading?: booleanoverflowVisible?: boolean@@ -66,6 +66,7 @@ const Modal = ({'transition-all data-closed:translate-y-4 data-closed:opacity-0 data-enter:ease-out data-leave:duration-200 data-leave:ease-in',{'w-[90vw] md:w-full md:max-w-lg': size === 'regular',+ 'w-[90vw] max-w-2xl md:w-full': size === 'medium','w-[90vw] max-w-5xl md:w-full': size === 'large','overflow-visible': overflowVisible,'overflow-hidden': !overflowVisible,diff --git a/web/app/ui/VirtualizedSelect.tsx b/web/app/ui/VirtualizedSelect.tsxnew file mode 100644index 000000000..0589afbf5--- /dev/null+++ b/web/app/ui/VirtualizedSelect.tsx@@ -0,0 +1,223 @@+import { Listbox, Transition, ListboxButton, ListboxOptions, ListboxOption, Label } from '@headlessui/react'+import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/24/solid'+import { useVirtualizer } from '@tanstack/react-virtual'+import cx from 'clsx'+import _filter from 'lodash/filter'+import _includes from 'lodash/includes'+import _isEmpty from 'lodash/isEmpty'+import _toLower from 'lodash/toLower'+import { Fragment, memo, useState, useRef, useMemo } from 'react'+import { useTranslation } from 'react-i18next'++interface VirtualizedSelectProps<T> {+ title?: string+ label?: string+ className?: string+ buttonClassName?: string+ items: T[]+ labelExtractor?: (item: T, index: number) => string+ keyExtractor?: (item: T, index: number) => string+ onSelect: (item: T) => void+ selectedItems?: T[]+ placeholder?: string+ disabled?: boolean+ searchable?: boolean+ allowCustomValue?: boolean+ onCustomValue?: (value: string) => void+}++const ITEM_HEIGHT = 36++function VirtualizedSelect<T>({+ title,+ label,+ className,+ items = [],+ labelExtractor,+ keyExtractor,+ onSelect,+ buttonClassName,+ placeholder,+ disabled,+ selectedItems = [],+ searchable = true,+ allowCustomValue = false,+ onCustomValue,+}: VirtualizedSelectProps<T>) {+ const { t } = useTranslation('common')+ const [query, setQuery] = useState('')+ const listRef = useRef<HTMLDivElement>(null)++ const filteredItems = useMemo(() => {+ if (_isEmpty(query) || _isEmpty(items)) {+ return items+ }+ return _filter(items, (item, index) => {+ const labelValue = labelExtractor ? labelExtractor(item, index) : String(item)+ return _includes(_toLower(labelValue), _toLower(query))+ })+ }, [items, query, labelExtractor])++ const virtualizer = useVirtualizer({+ count: filteredItems.length,+ getScrollElement: () => listRef.current,+ estimateSize: () => ITEM_HEIGHT,+ overscan: 10,+ })++ const isItemSelected = (item: T): boolean => {+ if (_isEmpty(selectedItems)) return false+ return selectedItems.some((selected) => {+ if (keyExtractor) {+ return keyExtractor(item, 0) === keyExtractor(selected, 0)+ }+ return item === selected+ })+ }++ const handleAddCustomValue = () => {+ if (query.trim() && allowCustomValue && onCustomValue) {+ onCustomValue(query.trim())+ setQuery('')+ }+ }++ return (+ <Listbox as='div' value={undefined} onChange={onSelect} disabled={disabled}>+ {({ open }) => (+ <>+ {label ? (+ <Label className='mb-1 block text-sm font-medium text-gray-700 dark:text-gray-100'>{label}</Label>+ ) : null}+ <div className={cx('relative', className)}>+ <ListboxButton+ className={cx(+ 'relative w-full rounded-md border border-gray-300 bg-white py-2 pr-10 pl-3 text-left font-medium transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:ring-offset-gray-100 focus:outline-hidden sm:text-sm dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700',+ buttonClassName,+ )}+ >+ <span className='block truncate text-gray-500 dark:text-gray-400'>{title || placeholder}</span>+ <span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>+ <ChevronUpDownIcon className='h-5 w-5 text-gray-400' aria-hidden='true' />+ </span>+ </ListboxButton>++ <Transition+ show={open}+ as={Fragment}+ enter='transition ease-in duration-100'+ enterFrom='opacity-0'+ enterTo='opacity-100'+ leave='transition ease-in duration-100'+ leaveFrom='opacity-100'+ leaveTo='opacity-0'+ afterLeave={() => setQuery('')}+ >+ <ListboxOptions+ static+ className='absolute z-30 mt-1 w-full rounded-md bg-gray-50 text-base ring-1 ring-black/10 focus:outline-hidden sm:text-sm dark:bg-slate-800'+ >+ {searchable ? (+ <div className='sticky top-0 z-10 border-b border-gray-200 bg-gray-50 px-3 py-2 dark:border-gray-700 dark:bg-slate-800'>+ <input+ type='text'+ className='w-full rounded-md border border-gray-300 bg-white px-3 py-1.5 text-sm focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-gray-700 dark:bg-slate-700 dark:text-gray-50'+ placeholder={t('common.search') || 'Search...'}+ value={query}+ onChange={(e) => setQuery(e.target.value)}+ onKeyDown={(e) => {+ if (e.key === 'Enter' && allowCustomValue && query.trim()) {+ e.preventDefault()+ handleAddCustomValue()+ }+ e.stopPropagation()+ }}+ onClick={(e) => e.stopPropagation()}+ />+ {allowCustomValue && query.trim() ? (+ <button+ type='button'+ onClick={(e) => {+ e.preventDefault()+ e.stopPropagation()+ handleAddCustomValue()+ }}+ className='mt-2 w-full rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-indigo-700'+ >+ {t('project.filterAddCustomValue', { value: query.trim() })}+ </button>+ ) : null}+ </div>+ ) : null}++ {_isEmpty(filteredItems) ? (+ <div className='relative cursor-default px-4 py-3 text-gray-600 select-none dark:text-gray-400'>+ {t('common.nothingFound')}+ </div>+ ) : (+ <div ref={listRef} className='max-h-60 overflow-auto py-1'>+ <div+ style={{+ height: `${virtualizer.getTotalSize()}px`,+ width: '100%',+ position: 'relative',+ }}+ >+ {virtualizer.getVirtualItems().map((virtualItem) => {+ const item = filteredItems[virtualItem.index]+ const labelValue = labelExtractor ? labelExtractor(item, virtualItem.index) : String(item)+ const keyValue = keyExtractor ? keyExtractor(item, virtualItem.index) : String(item)+ const selected = isItemSelected(item)++ return (+ <ListboxOption+ key={keyValue}+ value={item}+ className={({ focus }) =>+ cx(+ 'absolute right-0 left-0 mx-1 cursor-pointer rounded-md py-2 pr-4 pl-8 transition-colors select-none',+ {+ 'bg-gray-200 dark:bg-slate-700': focus && !selected,+ 'bg-indigo-100 dark:bg-indigo-900/40': selected,+ 'text-gray-700 dark:text-gray-50': !focus && !selected,+ 'text-gray-900 dark:text-white': focus || selected,+ },+ )+ }+ style={{+ top: 0,+ transform: `translateY(${virtualItem.start}px)`,+ height: `${virtualItem.size}px`,+ }}+ >+ <>+ <span+ className={cx('block truncate', {+ 'font-semibold': selected,+ 'font-normal': !selected,+ })}+ >+ {labelValue}+ </span>+ {selected ? (+ <span className='absolute inset-y-0 left-0 flex items-center pl-1.5 text-indigo-600 dark:text-indigo-400'>+ <CheckIcon className='h-5 w-5' aria-hidden='true' />+ </span>+ ) : null}+ </>+ </ListboxOption>+ )+ })}+ </div>+ </div>+ )}+ </ListboxOptions>+ </Transition>+ </div>+ </>+ )}+ </Listbox>+ )+}++export default memo(VirtualizedSelect) as typeof VirtualizedSelectdiff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 42862c28f..3a1ec8d80 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -141,6 +141,7 @@"link": "Link","unlink": "Unlink","nothingFound": "Nothing found",+ "search": "Search","oneMember": "1 Member","xMembers": "{{number}} Members","general": "General",@@ -939,6 +940,13 @@"addAMetric": "Add a metric","customEvent": "Custom event","removeFilter": "Remove filter",+ "addFilter": "Add filter",+ "selectColumn": "Select column",+ "selectValues": "Select values...",+ "clearAllFilters": "Clear all filters",+ "filterSearchOrType": "Search or type a value...",+ "filterUseValue": "Use \"{{value}}\"",+ "filterAddCustomValue": "Add \"{{value}}\" as filter value","toggleFilterToIs": "Change filter to '{{column}} is \"{{filter}}\"'","toggleFilterToIsNot": "Change filter to '{{column}} is not \"{{filter}}\"'","toggleFilterToContains": "Change filter to '{{column}} contains \"{{filter}}\"'",