From 1976622494e8cb3d133580ce247763d916d621a3 Mon Sep 17 00:00:00 2001 From: Aditya Date: Sat, 29 Aug 2026 04:57:36 +0530 Subject: [PATCH 1/2] fix(filters): preserve commas in search values --- src/components/common/FilterRecord.test.tsx | 47 +++++++++++++++++++++ src/components/common/FilterRecord.tsx | 10 ++++- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 src/components/common/FilterRecord.test.tsx diff --git a/src/components/common/FilterRecord.test.tsx b/src/components/common/FilterRecord.test.tsx new file mode 100644 index 000000000..d9e4dbb9b --- /dev/null +++ b/src/components/common/FilterRecord.test.tsx @@ -0,0 +1,47 @@ +import { render, screen } from '@testing-library/react'; +import type { ReactNode } from 'react'; +import { expect, test, vi } from 'vitest'; +import { FilterRecord } from './FilterRecord'; + +vi.mock('@umami/react-zen', () => ({ + Button: ({ children }: { children: ReactNode }) => , + Column: ({ children }: { children: ReactNode }) =>
{children}
, + Grid: ({ children }: { children: ReactNode }) =>
{children}
, + Icon: ({ children }: { children: ReactNode }) => {children}, + Label: ({ children }: { children: ReactNode }) => , + ListItem: ({ children }: { children: ReactNode }) =>
{children}
, + Loading: () =>
Loading
, + Select: ({ children }: { children: ReactNode }) =>
{children}
, + TextField: ({ value }: { value: string }) => ( + + ), +})); + +vi.mock('@/components/common/Empty', () => ({ Empty: () =>
Empty
})); +vi.mock('@/components/common/MultiSelect', () => ({ + MultiSelect: ({ children }: { children: ReactNode }) =>
{children}
, + MultiSelectItem: ({ children }: { children: ReactNode }) =>
{children}
, +})); +vi.mock('@/components/hooks', () => ({ + useFilters: () => ({ fields: [], operators: [] }), + useFormat: () => ({ formatValue: (value: string) => value }), + useWebsiteValuesQuery: () => ({ data: [], isLoading: false }), +})); +vi.mock('@/components/icons', () => ({ X: () => null })); + +test('keeps commas in regex filter values', () => { + const value = '^[a-zA-Z0-9]{21,22}$'; + + render( + , + ); + + expect(screen.getByLabelText('Filter value')).toHaveValue(value); +}); diff --git a/src/components/common/FilterRecord.tsx b/src/components/common/FilterRecord.tsx index d9b52f4bd..b689b76bc 100644 --- a/src/components/common/FilterRecord.tsx +++ b/src/components/common/FilterRecord.tsx @@ -42,7 +42,14 @@ export function FilterRecord({ onChange, }: FilterRecordProps) { const { fields, operators } = useFilters(); - const initValues = Array.isArray(value) ? value : value ? value.split(',') : []; + const isSearch = isSearchOperator(operator); + const initValues = Array.isArray(value) + ? value + : value + ? isSearch + ? [value] + : value.split(',') + : []; const [selected, setSelected] = useState(initValues); const [search, setSearch] = useState(''); const { formatValue } = useFormat(); @@ -53,7 +60,6 @@ export function FilterRecord({ startDate, endDate, }); - const isSearch = isSearchOperator(operator); const items = data?.filter(({ value }) => value) || []; const handleSearch = (value: string) => { From 8928c5f1177fc2d1ef3b0afa7b8ab244760ac79d Mon Sep 17 00:00:00 2001 From: Aditya Date: Sat, 29 Aug 2026 05:40:03 +0530 Subject: [PATCH 2/2] fix(filters): sync values when operators change --- src/components/common/FilterRecord.test.tsx | 16 ++++++++++++++++ src/components/common/FilterRecord.tsx | 21 ++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/components/common/FilterRecord.test.tsx b/src/components/common/FilterRecord.test.tsx index d9e4dbb9b..a55cd48b0 100644 --- a/src/components/common/FilterRecord.test.tsx +++ b/src/components/common/FilterRecord.test.tsx @@ -45,3 +45,19 @@ test('keeps commas in regex filter values', () => { expect(screen.getByLabelText('Filter value')).toHaveValue(value); }); + +test('keeps commas when changing to a search operator', () => { + const value = '^[a-zA-Z0-9]{21,22}$'; + const props = { + type: 'path', + startDate: new Date('2026-08-01'), + endDate: new Date('2026-08-02'), + name: 'path', + value, + }; + const { rerender } = render(); + + rerender(); + + expect(screen.getByLabelText('Filter value')).toHaveValue(value); +}); diff --git a/src/components/common/FilterRecord.tsx b/src/components/common/FilterRecord.tsx index b689b76bc..cb2a1462d 100644 --- a/src/components/common/FilterRecord.tsx +++ b/src/components/common/FilterRecord.tsx @@ -9,7 +9,7 @@ import { Select, TextField, } from '@umami/react-zen'; -import { useState } from 'react'; +import { useEffect, useState } from 'react'; import { Empty } from '@/components/common/Empty'; import { MultiSelect, MultiSelectItem } from '@/components/common/MultiSelect'; import { useFilters, useFormat, useWebsiteValuesQuery } from '@/components/hooks'; @@ -29,6 +29,12 @@ export interface FilterRecordProps { onChange?: (name: string, value: string) => void; } +function getSelectedValues(value: string | string[], operator: string) { + if (Array.isArray(value)) return value; + if (!value) return []; + return isSearchOperator(operator) ? [value] : value.split(','); +} + export function FilterRecord({ websiteId, type, @@ -43,14 +49,7 @@ export function FilterRecord({ }: FilterRecordProps) { const { fields, operators } = useFilters(); const isSearch = isSearchOperator(operator); - const initValues = Array.isArray(value) - ? value - : value - ? isSearch - ? [value] - : value.split(',') - : []; - const [selected, setSelected] = useState(initValues); + const [selected, setSelected] = useState(() => getSelectedValues(value, operator)); const [search, setSearch] = useState(''); const { formatValue } = useFormat(); const { data, isLoading } = useWebsiteValuesQuery({ @@ -62,6 +61,10 @@ export function FilterRecord({ }); const items = data?.filter(({ value }) => value) || []; + useEffect(() => { + setSelected(getSelectedValues(value, operator)); + }, [operator, value]); + const handleSearch = (value: string) => { setSearch(value); };