Skip to content

📈 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!

Reuse filter selection view from Filters modal (for the Segments modal)

Blue Mouse4bb0afb94ba3
diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsx
index eba53cd29..6e62e611a 100644
--- a/web/app/pages/Project/View/components/AddAViewModal.tsx
+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx
@@ -8,15 +8,11 @@ import { useTranslation } from 'react-i18next'
import { useFetcher } from 'react-router'
import { toast } from 'sonner'
-import { useFiltersProxy } from '~/hooks/useAnalyticsProxy'
-import { useCurrentProject } from '~/providers/CurrentProjectProvider'
import { ProjectViewActionData } from '~/routes/projects.$id'
-import Combobox from '~/ui/Combobox'
import Input from '~/ui/Input'
import Modal from '~/ui/Modal'
import Select from '~/ui/Select'
import { Text } from '~/ui/Text'
-import countries from '~/utils/isoCountries'
import {
Filter as FilterType,
@@ -25,7 +21,7 @@ import {
ProjectViewCustomEventMetaValueType,
} from '../interfaces/traffic'
-import { Filter } from './Filters'
+import FilterRowsEditor from './FilterRowsEditor'
interface AddAViewModalProps {
onSubmit: () => void
@@ -213,15 +209,9 @@ const AddAViewModal = ({
supportsCustomMetrics,
viewType,
}: AddAViewModalProps) => {
- const { id } = useCurrentProject()
- const {
- t,
- i18n: { language },
- } = useTranslation('common')
+ const { t } = useTranslation('common')
const fetcher = useFetcher<ProjectViewActionData>()
const [name, setName] = useState(defaultView?.name || '')
- const [filterType, setFilterType] = useState('')
- const [searchList, setSearchList] = useState<any[]>([])
const [activeFilters, setActiveFilters] = useState<FilterType[]>(
defaultView?.filters || [],
)
@@ -229,19 +219,6 @@ const AddAViewModal = ({
Partial<ProjectViewCustomEvent>[]
>(defaultView?.customEvents || [])
const [errors, setErrors] = useState<AddAViewModalErrors>({})
- const { fetchFilters, fetchErrorsFilters } = useFiltersProxy()
-
- const getFiltersList = useCallback(
- async (category: string) => {
- const result =
- filterDataType === 'errors'
- ? await fetchErrorsFilters(id, category)
- : await fetchFilters(id, category)
-
- setSearchList(result || [])
- },
- [id, filterDataType, fetchErrorsFilters, fetchFilters],
- )
useEffect(() => {
if (!defaultView) {
@@ -260,53 +237,16 @@ const AddAViewModal = ({
setName(defaultView.name)
}, [defaultView])
- useEffect(() => {
- if (!showModal || _isEmpty(filterType)) {
- return
- }
-
- // eslint-disable-next-line react-hooks/set-state-in-effect -- Fetching filter list when modal opens
- getFiltersList(filterType)
- }, [filterType, showModal, getFiltersList])
-
const closeModal = useCallback(() => {
setShowModal(false)
setTimeout(() => {
setName('')
- setFilterType('')
setActiveFilters([])
setCustomEvents([])
setErrors({})
}, 300)
}, [setShowModal])
- const onItemSelect = (item: string) => {
- let processedItem = item
-
- if (filterType === 'cc') {
- processedItem = countries.getAlpha2Code(item, language) as string
- }
-
- const itemExists = _find(
- activeFilters,
- ({ column, filter }) => filter === processedItem && column === filterType,
- )
-
- if (itemExists) {
- return
- }
-
- setActiveFilters((prevFilters: any) => [
- ...prevFilters,
- {
- column: filterType,
- filter: processedItem,
- isExclusive: false,
- isContains: false,
- },
- ])
- }
-
const validateCustomMetricsAndName = () => {
let valid = true
const metricErrors: AddAViewModalErrors = {}
@@ -352,14 +292,12 @@ const AddAViewModal = ({
const isViewSubmitting = fetcher.state !== 'idle'
const hasHandledResponse = useRef(false)
- // Reset the handled flag when fetcher starts submitting
useEffect(() => {
if (fetcher.state === 'submitting') {
hasHandledResponse.current = false
}
}, [fetcher.state])
- // Handle fetcher response
useEffect(() => {
if (
fetcher.state === 'idle' &&
@@ -406,6 +344,7 @@ const AddAViewModal = ({
return (
<Modal
+ size='medium'
onClose={() => {
if (isViewSubmitting) {
return
@@ -433,104 +372,24 @@ const AddAViewModal = ({
maxLength={20}
/>
<hr className='my-4' />
- <Select
- label={t('project.selectCategoryOptional')}
- items={filterOptions}
- labelExtractor={(item) => t(`project.mapping.${item}`)}
- onSelect={(item) => setFilterType(item)}
- title={
- _isEmpty(filterType)
- ? t('project.settings.reseted.selectFilters')
- : t(`project.mapping.${filterType}`)
- }
- selectedItem={_isEmpty(filterType) ? undefined : filterType}
- />
- {filterType && !_isEmpty(searchList) ? (
- <>
- <Text
- as='p'
- size='sm'
- weight='medium'
- colour='secondary'
- className='mt-5'
- >
- {t('project.filters')}
- </Text>
- <Combobox
- items={searchList}
- labelExtractor={(item) => {
- if (filterType === 'cc') {
- return countries.getName(item, language)
- }
-
- return item
- }}
- onSelect={onItemSelect}
- placeholder={t('project.settings.reseted.filtersPlaceholder')}
- />
- </>
- ) : null}
+ <Text
+ as='p'
+ size='sm'
+ weight='medium'
+ className='mb-3 text-gray-700 dark:text-gray-100'
+ >
+ {t('project.filters')}
+ </Text>
<div className='mt-2'>
- {_map(
- activeFilters,
- ({ filter, column, isExclusive, isContains }) => (
- <Filter
- key={`${column}-${filter}-${isExclusive}-${isContains}`}
- 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) {
- 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
- />
- ),
- )}
+ <FilterRowsEditor
+ active={showModal}
+ tnMapping={tnMapping}
+ initialFilters={defaultView?.filters}
+ type={filterDataType}
+ filterOptions={filterOptions}
+ onChange={setActiveFilters}
+ resetKey={defaultView?.id || 'new'}
+ />
</div>
{supportsCustomMetrics ? (
<>
@@ -593,6 +452,7 @@ const AddAViewModal = ({
}
submitType='regular'
isOpened={showModal}
+ overflowVisible
/>
)
}
diff --git a/web/app/pages/Project/View/components/FilterRowsEditor.tsx b/web/app/pages/Project/View/components/FilterRowsEditor.tsx
new file mode 100644
index 000000000..73bc1ba79
--- /dev/null
+++ b/web/app/pages/Project/View/components/FilterRowsEditor.tsx
@@ -0,0 +1,659 @@
+import {
+ Listbox,
+ Transition,
+ ListboxButton,
+ ListboxOptions,
+ ListboxOption,
+} from '@headlessui/react'
+import cx from 'clsx'
+import _isEmpty from 'lodash/isEmpty'
+import { CheckIcon, CaretUpDownIcon, TrashIcon } from '@phosphor-icons/react'
+import { useState, useEffect, useCallback, Fragment, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { useFiltersProxy } from '~/hooks/useAnalyticsProxy'
+import {
+ FILTERS_PANELS_ORDER,
+ ERRORS_FILTERS_PANELS_ORDER,
+} from '~/lib/constants'
+import { useCurrentProject } from '~/providers/CurrentProjectProvider'
+import { useTheme } from '~/providers/ThemeProvider'
+import FilterValueInput, {
+ filterCategoryIcons,
+ createVersionValue,
+ parseVersionValue,
+} from '~/ui/FilterValueInput'
+import { Text } from '~/ui/Text'
+import countries from '~/utils/isoCountries'
+
+import { Filter as FilterType } from '../interfaces/traffic'
+import { cn } from '~/utils/generic'
+
+type FilterOperator = 'is' | 'isNot' | 'contains' | 'notContains'
+
+interface FilterRow {
+ id: string
+ column: string
+ operator: FilterOperator
+ value: string
+}
+
+interface FilterRowsEditorProps {
+ active: boolean
+ tnMapping: Record<string, string>
+ initialFilters?: FilterType[]
+ currentFilters?: FilterType[]
+ type: 'traffic' | 'errors'
+ filterOptions?: string[]
+ onChange: (filters: FilterType[]) => void
+ resetKey?: string
+ prefetchOnOpen?: boolean
+ showCurrentFilters?: boolean
+}
+
+const EMPTY_FILTERS: FilterType[] = []
+
+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 createEmptyFilterRow = (): FilterRow => ({
+ id: crypto.randomUUID(),
+ column: '',
+ operator: 'is',
+ value: '',
+})
+
+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 }
+ }
+}
+
+const filterToOperator = ({
+ isExclusive,
+ isContains,
+}: FilterType): FilterOperator => {
+ if (isContains && isExclusive) return 'notContains'
+ if (isContains) return 'contains'
+ if (isExclusive) return 'isNot'
+ return 'is'
+}
+
+const filtersToRows = (filters: FilterType[] = []): FilterRow[] => {
+ const usedIndexes = new Set<number>()
+
+ return filters.flatMap((filter, index) => {
+ if (usedIndexes.has(index)) {
+ return []
+ }
+
+ if (filter.column === 'br' || filter.column === 'os') {
+ const versionColumn = filter.column === 'br' ? 'brv' : 'osv'
+ const operator = filterToOperator(filter)
+ const versionIndex = filters.findIndex(
+ (candidate, candidateIndex) =>
+ candidateIndex !== index &&
+ !usedIndexes.has(candidateIndex) &&
+ candidate.column === versionColumn &&
+ filterToOperator(candidate) === operator,
+ )
+
+ if (versionIndex !== -1) {
+ usedIndexes.add(index)
+ usedIndexes.add(versionIndex)
+
+ return [
+ {
+ id: crypto.randomUUID(),
+ column: versionColumn,
+ operator,
+ value: createVersionValue(
+ filter.filter,
+ filters[versionIndex].filter,
+ ),
+ },
+ ]
+ }
+ }
+
+ usedIndexes.add(index)
+
+ return [
+ {
+ id: crypto.randomUUID(),
+ column: filter.column,
+ operator: filterToOperator(filter),
+ value: filter.filter,
+ },
+ ]
+ })
+}
+
+const InlineButton = ({
+ text,
+ onClick,
+ className,
+}: {
+ text: string
+ onClick: () => void
+ className?: string
+}) => (
+ <button
+ type='button'
+ onClick={onClick}
+ className={cn(
+ 'text-sm font-medium text-indigo-600 underline decoration-dashed transition-colors hover:decoration-solid dark:text-indigo-400',
+ className,
+ )}
+ >
+ {text}
+ </button>
+)
+
+const filterRowsToFilters = (filterRows: FilterRow[], language: string) => {
+ const validFilters: FilterType[] = []
+
+ filterRows
+ .filter((row) => row.column && row.value)
+ .forEach((row) => {
+ const { isExclusive, isContains } = operatorToFilter(row.operator)
+
+ if (row.column === 'brv') {
+ const parsed = parseVersionValue(row.value)
+ if (parsed) {
+ validFilters.push({
+ column: 'br',
+ filter: parsed.parent,
+ isExclusive,
+ isContains,
+ })
+ validFilters.push({
+ column: 'brv',
+ filter: parsed.version,
+ isExclusive,
+ isContains,
+ })
+ } else {
+ validFilters.push({
+ column: 'brv',
+ filter: row.value,
+ isExclusive,
+ isContains,
+ })
+ }
+ return
+ }
+
+ if (row.column === 'osv') {
+ const parsed = parseVersionValue(row.value)
+ if (parsed) {
+ validFilters.push({
+ column: 'os',
+ filter: parsed.parent,
+ isExclusive,
+ isContains,
+ })
+ validFilters.push({
+ column: 'osv',
+ filter: parsed.version,
+ isExclusive,
+ isContains,
+ })
+ } else {
+ validFilters.push({
+ column: 'osv',
+ filter: row.value,
+ isExclusive,
+ isContains,
+ })
+ }
+ return
+ }
+
+ let processedValue = row.value
+ if (row.column === 'cc') {
+ const alpha2 = countries.getAlpha2Code(row.value, language)
+ if (alpha2) {
+ processedValue = alpha2
+ }
+ }
+
+ validFilters.push({
+ column: row.column,
+ filter: processedValue,
+ isExclusive,
+ isContains,
+ })
+ })
+
+ return validFilters
+}
+
+const FilterRowsEditor = ({
+ active,
+ tnMapping,
+ initialFilters = EMPTY_FILTERS,
+ currentFilters = EMPTY_FILTERS,
+ type,
+ filterOptions,
+ onChange,
+ resetKey,
+ prefetchOnOpen,
+ showCurrentFilters,
+}: FilterRowsEditorProps) => {
+ const { id } = useCurrentProject()
+ const { theme } = useTheme()
+ const {
+ t,
+ i18n: { language },
+ } = useTranslation('common')
+ const [filterRows, setFilterRows] = useState<FilterRow[]>([])
+ const [filterValuesCache, setFilterValuesCache] = useState<
+ Record<string, string[]>
+ >({})
+ const [loadingColumns, setLoadingColumns] = useState<Set<string>>(new Set())
+ const { fetchFilters, fetchErrorsFilters, fetchVersionFilters } =
+ useFiltersProxy()
+
+ const panelOptions = filterOptions?.length
+ ? filterOptions
+ : type === 'traffic'
+ ? FILTERS_PANELS_ORDER
+ : ERRORS_FILTERS_PANELS_ORDER
+
+ const filters = useMemo(
+ () => filterRowsToFilters(filterRows, language),
+ [filterRows, language],
+ )
+
+ useEffect(() => {
+ if (!active) {
+ return
+ }
+
+ onChange(filters)
+ }, [active, filters, onChange])
+
+ 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 (column === 'brv') {
+ const dataType = type === 'errors' ? 'errors' : 'traffic'
+ const pairs = await fetchVersionFilters(id, dataType, 'br')
+ if (pairs) {
+ result = pairs.map((p) => createVersionValue(p.name, p.version))
+ }
+ } else if (column === 'osv') {
+ const dataType = type === 'errors' ? 'errors' : 'traffic'
+ const pairs = await fetchVersionFilters(id, dataType, 'os')
+ if (pairs) {
+ result = pairs.map((p) => createVersionValue(p.name, p.version))
+ }
+ } else if (type === 'errors') {
+ result = (await fetchErrorsFilters(id, column)) || []
+ } else {
+ result = (await fetchFilters(id, column)) || []
+ }
+ setFilterValuesCache((prev) => ({ ...prev, [column]: result }))
+ } catch (error) {
+ console.error('Failed to fetch filter values:', error)
+ setFilterValuesCache((prev) => ({ ...prev, [column]: [] }))
+ } finally {
+ setLoadingColumns((prev) => {
+ const next = new Set(prev)
+ next.delete(column)
+ return next
+ })
+ }
+ },
+ [
+ id,
+ type,
+ filterValuesCache,
+ loadingColumns,
+ fetchFilters,
+ fetchErrorsFilters,
+ fetchVersionFilters,
+ ],
+ )
+
+ useEffect(() => {
+ if (!active) {
+ return
+ }
+
+ const nextRows = filtersToRows(initialFilters)
+ setFilterRows(nextRows.length ? nextRows : [createEmptyFilterRow()])
+ }, [active, initialFilters, resetKey])
+
+ useEffect(() => {
+ if (!active || !prefetchOnOpen) {
+ return
+ }
+
+ panelOptions.forEach((column) => {
+ if (!filterValuesCache[column] && !loadingColumns.has(column)) {
+ fetchFilterValues(column)
+ }
+ })
+ }, [
+ active,
+ prefetchOnOpen,
+ panelOptions,
+ fetchFilterValues,
+ filterValuesCache,
+ loadingColumns,
+ ])
+
+ const addFilterRow = () => {
+ setFilterRows((prev) => [...prev, createEmptyFilterRow()])
+ }
+
+ const removeFilterRow = (rowId: string) => {
+ setFilterRows((prev) => {
+ const nextRows = prev.filter((row) => row.id !== rowId)
+ return nextRows.length ? nextRows : [createEmptyFilterRow()]
+ })
+ }
+
+ const updateFilterRow = (
+ rowId: string,
+ field: keyof FilterRow,
+ fieldValue: string,
+ ) => {
+ setFilterRows((prev) =>
+ prev.map((row) => {
+ if (row.id !== rowId) return row
+
+ if (field === 'column') {
+ if (
+ fieldValue &&
+ !filterValuesCache[fieldValue] &&
+ !loadingColumns.has(fieldValue)
+ ) {
+ fetchFilterValues(fieldValue)
+ }
+ return { ...row, column: fieldValue, value: '' }
+ }
+
+ return { ...row, [field]: fieldValue }
+ }),
+ )
+ }
+
+ const clearAllFilters = () => {
+ setFilterRows([createEmptyFilterRow()])
+ }
+
+ const hasValidFilters = filterRows.some((row) => row.column && row.value)
+
+ return (
+ <div className='space-y-4'>
+ <div className='space-y-3'>
+ {filterRows.map((row) => (
+ <div
+ key={row.id}
+ className='grid gap-2 sm:grid-cols-[minmax(0,11rem)_minmax(0,8rem)_minmax(0,1fr)_auto]'
+ >
+ <Listbox
+ value={row.column}
+ onChange={(value) => updateFilterRow(row.id, 'column', value)}
+ >
+ {({ open }) => (
+ <div className='relative min-w-0'>
+ <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-slate-900 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-800 dark:focus:ring-slate-300'>
+ <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'>
+ <CaretUpDownIcon 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-900'
+ >
+ {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>
+
+ <Listbox
+ value={row.operator}
+ onChange={(value) => updateFilterRow(row.id, 'operator', value)}
+ >
+ {({ open }) => (
+ <div className='relative min-w-0'>
+ <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-slate-900 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-800 dark:focus:ring-slate-300'>
+ <span className='block truncate'>
+ {t(
+ OPERATORS.find(
+ (operator) => operator.value === row.operator,
+ )?.labelKey || '',
+ )}
+ </span>
+ <span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>
+ <CaretUpDownIcon 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-900'
+ >
+ {OPERATORS.map((operator) => (
+ <ListboxOption
+ key={operator.value}
+ value={operator.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(operator.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>
+
+ <FilterValueInput
+ 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}
+ className='min-w-0'
+ />
+
+ <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-800 dark:hover:text-gray-300'
+ title={t('project.removeFilter')}
+ >
+ <TrashIcon className='h-5 w-5' />
+ </button>
+ </div>
+ ))}
+ </div>
+
+ <div className='flex items-center justify-between'>
+ <InlineButton onClick={addFilterRow} text={t('project.addFilter')} />
+
+ {filterRows.length > 1 || hasValidFilters ? (
+ <InlineButton
+ onClick={clearAllFilters}
+ text={t('project.clearAllFilters')}
+ className='text-gray-500 hover:text-red-600 dark:text-gray-400 dark:hover:text-red-400'
+ />
+ ) : null}
+ </div>
+
+ {showCurrentFilters && !_isEmpty(currentFilters) ? (
+ <div className='border-t border-gray-200 pt-4 dark:border-gray-700'>
+ <Text
+ as='p'
+ size='xs'
+ weight='medium'
+ colour='muted'
+ className='mb-2 uppercase'
+ >
+ {t('project.currentFilters')}
+ </Text>
+ <div className='flex flex-wrap gap-2'>
+ {currentFilters.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}-${isExclusive}-${isContains}`}
+ 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>
+ )
+}
+
+export default FilterRowsEditor
diff --git a/web/app/pages/Project/View/components/Filters.tsx b/web/app/pages/Project/View/components/Filters.tsx
index 6dfe51609..e927cd2ad 100644
--- a/web/app/pages/Project/View/components/Filters.tsx
+++ b/web/app/pages/Project/View/components/Filters.tsx
@@ -28,7 +28,7 @@ interface FilterProps {
isContains?: boolean
}
-export const Filter = ({
+const Filter = ({
column,
filter,
isExclusive,
diff --git a/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx b/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
index 79ee0a085..90aba2620 100644
--- a/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
+++ b/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
@@ -26,7 +26,7 @@ import { useViewProjectContext } from '../ViewProject'
import { getFiltersUrlParams } from './SearchFilters'
-export interface ExportType {
+interface ExportType {
label: string
onClick: () => void
}
diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsx
index 19ce47fe7..f4572e6c1 100644
--- a/web/app/pages/Project/View/components/SearchFilters.tsx
+++ b/web/app/pages/Project/View/components/SearchFilters.tsx
@@ -1,42 +1,15 @@
-import {
- Listbox,
- Transition,
- ListboxButton,
- ListboxOptions,
- ListboxOption,
-} from '@headlessui/react'
-import cx from 'clsx'
-import _isEmpty from 'lodash/isEmpty'
-import {
- CheckIcon,
- CaretUpDownIcon,
- PlusIcon,
- SlidersHorizontalIcon,
- TrashIcon,
-} from '@phosphor-icons/react'
-import { useState, useEffect, useCallback, Fragment } from 'react'
+import { SlidersHorizontalIcon } from '@phosphor-icons/react'
+import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useNavigate, useSearchParams } from 'react-router'
-import { useFiltersProxy } from '~/hooks/useAnalyticsProxy'
-import {
- FILTERS_PANELS_ORDER,
- ERRORS_FILTERS_PANELS_ORDER,
-} from '~/lib/constants'
-import { useCurrentProject } from '~/providers/CurrentProjectProvider'
-import { useTheme } from '~/providers/ThemeProvider'
-import FilterValueInput, {
- filterCategoryIcons,
- createVersionValue,
- parseVersionValue,
-} from '~/ui/FilterValueInput'
import Modal from '~/ui/Modal'
-import { Text } from '~/ui/Text'
-import countries from '~/utils/isoCountries'
import { Filter as FilterType } from '../interfaces/traffic'
import { isFilterValid } from '../utils/filters'
+import FilterRowsEditor from './FilterRowsEditor'
+
export const getFiltersUrlParams = (
filters: FilterType[],
newFilters: FilterType[],
@@ -49,17 +22,16 @@ export const getFiltersUrlParams = (
if (override) {
resultingFilters.push(...newFilters)
} 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.isContains ? '~' : ''}${f.column}=${f.filter}`
- finalUniqueFiltersMap.set(mapKey, f)
+ newFilters.forEach((filter) => {
+ const mapKey = `${filter.isExclusive ? '!' : ''}${filter.isContains ? '~' : ''}${filter.column}=${filter.filter}`
+ finalUniqueFiltersMap.set(mapKey, filter)
})
- filters.forEach((f) => {
- const mapKey = `${f.isExclusive ? '!' : ''}${f.isContains ? '~' : ''}${f.column}=${f.filter}`
- finalUniqueFiltersMap.set(mapKey, f)
+ filters.forEach((filter) => {
+ const mapKey = `${filter.isExclusive ? '!' : ''}${filter.isContains ? '~' : ''}${filter.column}=${filter.filter}`
+ finalUniqueFiltersMap.set(mapKey, filter)
})
resultingFilters.push(...Array.from(finalUniqueFiltersMap.values()))
@@ -67,7 +39,6 @@ export const getFiltersUrlParams = (
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('!') || key.startsWith('~') || key.startsWith('^')) {
@@ -78,48 +49,17 @@ export const getFiltersUrlParams = (
}
}
- resultingFilters.forEach((f) => {
- let filterKey = f.isExclusive ? `!${f.column}` : f.column
- if (f.isContains) {
- filterKey = f.isExclusive ? `^${f.column}` : `~${f.column}`
+ resultingFilters.forEach((filter) => {
+ let filterKey = filter.isExclusive ? `!${filter.column}` : filter.column
+ if (filter.isContains) {
+ filterKey = filter.isExclusive ? `^${filter.column}` : `~${filter.column}`
}
- newUrlParams.append(filterKey, f.filter)
+ newUrlParams.append(filterKey, filter.filter)
})
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 }
- }
-}
-
interface SearchFiltersProps {
showModal: boolean
setShowModal: (show: boolean) => void
@@ -137,252 +77,22 @@ const SearchFilters = ({
type,
filterOptions,
}: SearchFiltersProps) => {
- const { id } = useCurrentProject()
- const { theme } = useTheme()
- const {
- t,
- i18n: { language },
- } = useTranslation('common')
- const [filterRows, setFilterRows] = useState<FilterRow[]>([])
- const [filterValuesCache, setFilterValuesCache] = useState<
- Record<string, string[]>
- >({})
- const [loadingColumns, setLoadingColumns] = useState<Set<string>>(new Set())
+ const { t } = useTranslation('common')
+ const [draftFilters, setDraftFilters] = useState<FilterType[]>([])
const [searchParams] = useSearchParams()
const navigate = useNavigate()
- const { fetchFilters, fetchErrorsFilters, fetchVersionFilters } =
- useFiltersProxy()
-
- const panelOptions = filterOptions?.length
- ? filterOptions
- : 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[] = []
-
- // For browser/OS versions, fetch valid combinations from the backend
- if (column === 'brv') {
- const dataType = type === 'errors' ? 'errors' : 'traffic'
- const pairs = await fetchVersionFilters(id, dataType, 'br')
- if (pairs) {
- result = pairs.map((p) => createVersionValue(p.name, p.version))
- }
- } else if (column === 'osv') {
- const dataType = type === 'errors' ? 'errors' : 'traffic'
- const pairs = await fetchVersionFilters(id, dataType, 'os')
- if (pairs) {
- result = pairs.map((p) => createVersionValue(p.name, p.version))
- }
- } else {
- if (type === 'errors') {
- result = (await fetchErrorsFilters(id, column)) || []
- } else {
- result = (await fetchFilters(id, column)) || []
- }
- }
- 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
- })
- }
- },
- [
- id,
- type,
- filterValuesCache,
- loadingColumns,
- fetchFilters,
- fetchErrorsFilters,
- fetchVersionFilters,
- ],
- )
-
- // Pre-fetch all filter values when modal opens
- useEffect(() => {
- 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,
- ])
-
- // 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 addFilterRow = () => {
- setFilterRows((prev) => [
- ...prev,
- { id: crypto.randomUUID(), column: '', operator: 'is', value: '' },
- ])
- }
-
- 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
- })
- }
-
- 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(() => {
- setFilterRows([])
+ setDraftFilters([])
}, 300)
}
- const clearAllFilters = () => {
- setFilterRows([
- { id: crypto.randomUUID(), column: '', operator: 'is', value: '' },
- ])
- }
-
const onSubmit = () => {
- // Convert filter rows to FilterType format
- const validFilters: FilterType[] = []
-
- filterRows
- .filter((row) => row.column && row.value)
- .forEach((row) => {
- const { isExclusive, isContains } = operatorToFilter(row.operator)
-
- // Handle browser version - creates two filters (br + brv)
- if (row.column === 'brv') {
- const parsed = parseVersionValue(row.value)
- if (parsed) {
- validFilters.push({
- column: 'br',
- filter: parsed.parent,
- isExclusive,
- isContains,
- })
- validFilters.push({
- column: 'brv',
- filter: parsed.version,
- isExclusive,
- isContains,
- })
- } else {
- // Fallback: just use the value as-is for the version
- validFilters.push({
- column: 'brv',
- filter: row.value,
- isExclusive,
- isContains,
- })
- }
- return
- }
-
- // Handle OS version - creates two filters (os + osv)
- if (row.column === 'osv') {
- const parsed = parseVersionValue(row.value)
- if (parsed) {
- validFilters.push({
- column: 'os',
- filter: parsed.parent,
- isExclusive,
- isContains,
- })
- validFilters.push({
- column: 'osv',
- filter: parsed.version,
- isExclusive,
- isContains,
- })
- } else {
- // Fallback: just use the value as-is for the version
- validFilters.push({
- column: 'osv',
- filter: row.value,
- isExclusive,
- isContains,
- })
- }
- return
- }
-
- // Handle country codes
- let processedValue = row.value
- if (row.column === 'cc') {
- const alpha2 = countries.getAlpha2Code(row.value, language)
- if (alpha2) {
- processedValue = alpha2
- }
- }
-
- validFilters.push({
- column: row.column,
- filter: processedValue,
- isExclusive,
- isContains,
- })
- })
-
const newUrlParams = getFiltersUrlParams(
filters,
- validFilters,
+ draftFilters,
true,
searchParams,
)
@@ -390,15 +100,13 @@ const SearchFilters = ({
closeModal()
}
- const hasValidFilters = filterRows.some((row) => row.column && row.value)
-
return (
<Modal
size='medium'
onClose={closeModal}
onSubmit={onSubmit}
submitText={t('project.applyFilters')}
- submitDisabled={!hasValidFilters}
+ submitDisabled={draftFilters.length === 0}
title={
<span className='flex items-center gap-2'>
<SlidersHorizontalIcon className='h-5 w-5' />
@@ -407,267 +115,20 @@ const SearchFilters = ({
}
message={
<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-slate-900 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-800 dark:focus:ring-slate-300'>
- <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'>
- <CaretUpDownIcon 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-900'
- >
- {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-slate-900 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-800 dark:focus:ring-slate-300'>
- <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'>
- <CaretUpDownIcon 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-900'
- >
- {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 */}
- <FilterValueInput
- 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}
- />
-
- {/* 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-800 dark:hover:text-gray-300'
- title={t('project.removeFilter')}
- >
- <TrashIcon className='h-5 w-5' />
- </button>
- </div>
- ))}
- </div>
-
- {/* 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-800'
- >
- {t('project.clearAllFilters')}
- </button>
- ) : null}
- </div>
-
- {/* Currently Applied Filters */}
- {!_isEmpty(filters) ? (
- <div className='border-t border-gray-200 pt-4 dark:border-gray-700'>
- <Text
- as='p'
- size='xs'
- weight='medium'
- colour='muted'
- className='mb-2 uppercase'
- >
- {t('project.currentFilters')}
- </Text>
- <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}-${isExclusive}-${isContains}`}
- 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}
+ <FilterRowsEditor
+ active={showModal}
+ tnMapping={tnMapping}
+ currentFilters={filters}
+ type={type}
+ filterOptions={filterOptions}
+ onChange={setDraftFilters}
+ prefetchOnOpen
+ showCurrentFilters
+ />
</div>
}
- submitType='regular'
isOpened={showModal}
+ submitType='regular'
overflowVisible
/>
)
diff --git a/web/app/pages/Project/View/utils/projectViewSegments.ts b/web/app/pages/Project/View/utils/projectViewSegments.ts
index dc51ae4a0..19fbb0b27 100644
--- a/web/app/pages/Project/View/utils/projectViewSegments.ts
+++ b/web/app/pages/Project/View/utils/projectViewSegments.ts
@@ -6,7 +6,7 @@ import {
import { Filter } from '../interfaces/traffic'
-export type ProjectTab = keyof typeof PROJECT_TABS
+type ProjectTab = keyof typeof PROJECT_TABS
const TRAFFIC_FILTER_COLUMNS = [
...FILTERS_PANELS_ORDER,
@@ -97,7 +97,7 @@ const getSupportedColumns = (tab: ProjectTab) => {
return []
}
-export const isProjectTabFilterSupported = (
+const isProjectTabFilterSupported = (
filter: Pick<Filter, 'column'>,
tab: ProjectTab,
) => {
diff --git a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx b/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx
deleted file mode 100644
index ac3483364..000000000
--- a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import ProjectViewHeaderActions, {
- ExportType,
-} from '../../View/components/ProjectViewHeaderActions'
-
-interface TrafficHeaderActionsProps {
- exportTypes: ExportType[]
-}
-
-const TrafficHeaderActions = ({ exportTypes }: TrafficHeaderActionsProps) => {
- return <ProjectViewHeaderActions tnMapping={{}} exportTypes={exportTypes} />
-}
-
-export default TrafficHeaderActions
diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
index c1ed00c3b..dc7a472c6 100644
--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
@@ -910,10 +910,7 @@ const TrafficViewInner = ({
}
const headerRightContent = (
- <ProjectViewHeaderActions
- tnMapping={tnMapping}
- exportTypes={exportTypes}
- />
+ <ProjectViewHeaderActions tnMapping={tnMapping} exportTypes={exportTypes} />
)
// Show no events if data is empty
diff --git a/web/app/ui/Combobox.tsx b/web/app/ui/Combobox.tsx
deleted file mode 100644
index b3ce2309d..000000000
--- a/web/app/ui/Combobox.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import {
- Combobox as HeadlessCombobox,
- Transition,
- ComboboxInput,
- ComboboxButton,
- ComboboxOptions,
- ComboboxOption,
-} from '@headlessui/react'
-import { CheckIcon, CaretUpDownIcon } from '@phosphor-icons/react'
-import cx from 'clsx'
-import _filter from 'lodash/filter'
-import _includes from 'lodash/includes'
-import _isEmpty from 'lodash/isEmpty'
-import _map from 'lodash/map'
-import _toLower from 'lodash/toLower'
-import { Fragment, memo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-
-interface SelectProps {
- title?: string
- className?: string
- buttonClassName?: string
- items: any[]
- labelExtractor?: (item: any, index: number) => string
- keyExtractor?: (item: any, index: number) => string
- onSelect: (item: any) => void
- disabled?: boolean
- placeholder?: string
-}
-
-const Combobox = ({
- title,
- className,
- items,
- labelExtractor,
- keyExtractor,
- onSelect,
- buttonClassName,
- placeholder,
- disabled,
-}: SelectProps) => {
- const { t } = useTranslation('common')
- const [query, setQuery] = useState('')
-
- const filteredItems = _isEmpty(items)
- ? items
- : _filter(items, (item, index) => {
- const label = labelExtractor ? labelExtractor(item, index) : item
-
- return _includes(_toLower(label), _toLower(query))
- })
-
- return (
- <HeadlessCombobox disabled={disabled} value={title} onChange={onSelect}>
- <div className={cx('relative', className)}>
- <div className='relative w-full'>
- <ComboboxInput
- className={cx(
- 'block w-full rounded-md border-0 bg-white py-2 pr-9 pl-3 text-left text-sm text-gray-900 ring-1 ring-gray-300 transition-[background-color,box-shadow] duration-150 ease-out ring-inset placeholder:text-gray-400 hover:ring-gray-400 focus:ring-2 focus:ring-slate-900 focus:outline-hidden disabled:cursor-not-allowed disabled:opacity-60 dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:placeholder:text-gray-500 dark:hover:ring-slate-600 dark:focus:ring-slate-300',
- buttonClassName,
- )}
- // @ts-expect-error
- displayValue={(item) =>
- labelExtractor ? labelExtractor(item, 0) : item
- }
- onChange={(event) => setQuery(event.target.value)}
- placeholder={placeholder}
- />
- <ComboboxButton
- className='absolute inset-y-0 right-0 flex items-center pr-2 text-gray-400 dark:text-gray-500'
- aria-label={t('common.toggleOptions')}
- >
- <CaretUpDownIcon className='size-4' aria-hidden='true' />
- </ComboboxButton>
- </div>
- <Transition
- as={Fragment}
- enter='transition ease-out duration-150'
- enterFrom='opacity-0 -translate-y-0.5'
- enterTo='opacity-100 translate-y-0'
- leave='transition ease-in duration-100'
- leaveFrom='opacity-100 translate-y-0'
- leaveTo='opacity-0 -translate-y-0.5'
- afterLeave={() => setQuery('')}
- >
- <ComboboxOptions className='absolute z-30 mt-1.5 max-h-60 w-full overflow-auto rounded-lg bg-white py-1 text-sm shadow-lg ring-1 ring-gray-200/80 focus:outline-hidden dark:bg-slate-950 dark:ring-slate-700/60'>
- {_isEmpty(filteredItems) && !_isEmpty(query) ? (
- <div className='relative px-3 py-2 text-gray-500 select-none dark:text-gray-400'>
- {t('common.nothingFound')}
- </div>
- ) : (
- _map(filteredItems, (item, index) => (
- <ComboboxOption
- key={keyExtractor ? keyExtractor(item, index) : item}
- className={({ active }) =>
- cx(
- 'relative mx-1 cursor-pointer rounded-md py-2 pr-8 pl-3 transition-colors duration-100 ease-out select-none',
- {
- 'bg-gray-100 text-gray-900 dark:bg-slate-800/80 dark:text-white':
- active,
- 'text-gray-700 dark:text-gray-50': !active,
- },
- )
- }
- value={labelExtractor ? labelExtractor(item, index) : item}
- >
- {({ selected }) => (
- <>
- <span
- className={cx(
- 'block truncate',
- selected ? 'font-semibold' : 'font-normal',
- )}
- >
- {labelExtractor ? labelExtractor(item, index) : item}
- </span>
- {selected ? (
- <span className='absolute inset-y-0 right-2 flex items-center text-slate-900 dark:text-slate-100'>
- <CheckIcon
- weight='bold'
- className='size-4'
- aria-hidden='true'
- />
- </span>
- ) : null}
- </>
- )}
- </ComboboxOption>
- ))
- )}
- </ComboboxOptions>
- </Transition>
- </div>
- </HeadlessCombobox>
- )
-}
-
-export default memo(Combobox)
diff --git a/web/app/ui/FilterValueInput.tsx b/web/app/ui/FilterValueInput.tsx
index 127320266..19aecaae3 100644
--- a/web/app/ui/FilterValueInput.tsx
+++ b/web/app/ui/FilterValueInput.tsx
@@ -259,9 +259,32 @@ const FilterValueInput = ({
return <QuestionMarkIcon className='size-4 shrink-0' />
}
+ if (column === 'lc') {
+ const countryCode = item.split('-').pop()
+ if (countryCode && countries.getName(countryCode, language)) {
+ return (
+ <Flag
+ className='shrink-0 rounded-xs'
+ country={countryCode}
+ size={16}
+ alt=''
+ aria-hidden='true'
+ />
+ )
+ }
+ }
+
+ if (filterCategoryIcons[column]) {
+ return (
+ <span className='shrink-0 text-gray-500 dark:text-gray-400'>
+ {filterCategoryIcons[column]}
+ </span>
+ )
+ }
+
return null
},
- [column, theme],
+ [column, language, theme],
)
// Get icon for the currently selected value (for display in input)