Merge pull request #4496 from justadityaraj/fix/4489-preserve-regex-commas
Keep commas in search filter values
This commit is contained in:
2 files changed
+76
-4
No files matched your search
@@ -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 }) => <button>{children}</button>,
|
||||
Column: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
Grid: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
Icon: ({ children }: { children: ReactNode }) => <span>{children}</span>,
|
||||
Label: ({ children }: { children: ReactNode }) => <label>{children}</label>,
|
||||
ListItem: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
Loading: () => <div>Loading</div>,
|
||||
Select: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
TextField: ({ value }: { value: string }) => (
|
||||
<input aria-label="Filter value" value={value} readOnly />
|
||||
),
|
||||
}));
|
||||
|
||||
vi.mock('@/components/common/Empty', () => ({ Empty: () => <div>Empty</div> }));
|
||||
vi.mock('@/components/common/MultiSelect', () => ({
|
||||
MultiSelect: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
MultiSelectItem: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
}));
|
||||
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(
|
||||
<FilterRecord
|
||||
type="path"
|
||||
startDate={new Date('2026-08-01')}
|
||||
endDate={new Date('2026-08-02')}
|
||||
name="path"
|
||||
operator="re"
|
||||
value={value}
|
||||
/>,
|
||||
);
|
||||
|
||||
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(<FilterRecord {...props} operator="eq" />);
|
||||
|
||||
rerender(<FilterRecord {...props} operator="re" />);
|
||||
|
||||
expect(screen.getByLabelText('Filter value')).toHaveValue(value);
|
||||
});
|
||||
@@ -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<string[]>(initValues);
|
||||
const isSearch = isSearchOperator(operator);
|
||||
const [selected, setSelected] = useState<string[]>(() => 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);
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user