diff --git a/src/components/common/FilterRecord.test.tsx b/src/components/common/FilterRecord.test.tsx
new file mode 100644
index 000000000..a55cd48b0
--- /dev/null
+++ b/src/components/common/FilterRecord.test.tsx
@@ -0,0 +1,63 @@
+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);
+});
+
+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 d9b52f4bd..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,
@@ -42,8 +48,8 @@ export function FilterRecord({
onChange,
}: FilterRecordProps) {
const { fields, operators } = useFilters();
- const initValues = Array.isArray(value) ? value : value ? value.split(',') : [];
- const [selected, setSelected] = useState(initValues);
+ const isSearch = isSearchOperator(operator);
+ const [selected, setSelected] = useState(() => getSelectedValues(value, operator));
const [search, setSearch] = useState('');
const { formatValue } = useFormat();
const { data, isLoading } = useWebsiteValuesQuery({
@@ -53,9 +59,12 @@ export function FilterRecord({
startDate,
endDate,
});
- const isSearch = isSearchOperator(operator);
const items = data?.filter(({ value }) => value) || [];
+ useEffect(() => {
+ setSelected(getSelectedValues(value, operator));
+ }, [operator, value]);
+
const handleSearch = (value: string) => {
setSearch(value);
};