diff --git a/web-console/src/bootstrap/react-table-defaults.tsx b/web-console/src/bootstrap/react-table-defaults.tsx index 531bc8127bce..fe5cfe99f5aa 100644 --- a/web-console/src/bootstrap/react-table-defaults.tsx +++ b/web-console/src/bootstrap/react-table-defaults.tsx @@ -21,13 +21,9 @@ import type { Filter } from 'react-table'; import { ReactTableDefaults } from 'react-table'; import { Loader } from '../components'; -import { - booleanCustomTableFilter, - DEFAULT_TABLE_CLASS_NAME, - GenericFilterInput, - ReactTablePagination, -} from '../react-table'; +import { DEFAULT_TABLE_CLASS_NAME, GenericFilterInput, ReactTablePagination } from '../react-table'; import { countBy } from '../utils'; +import { TableFilter } from '../utils/table-filters'; const NoData = React.memo(function NoData(props: { children?: React.ReactNode }) { const { children } = props; @@ -41,10 +37,11 @@ export function bootstrapReactTable() { defaultFilterMethod: (filter: Filter, row: any) => { const id = filter.pivotId || filter.id; const subRows = row._subRows; + const tableFilter = TableFilter.fromFilter(filter); if (Array.isArray(subRows)) { - return subRows.some(r => booleanCustomTableFilter(filter, r[id])); + return subRows.some(r => tableFilter.matches(r[id])); } else { - return booleanCustomTableFilter(filter, row[id]); + return tableFilter.matches(row[id]); } }, LoadingComponent: Loader, diff --git a/web-console/src/components/show-json-or-stages/__snapshots__/show-json-or-stages.spec.tsx.snap b/web-console/src/components/show-json-or-stages/__snapshots__/show-json-or-stages.spec.tsx.snap index 052bb7e9d6c9..5110584105c9 100644 --- a/web-console/src/components/show-json-or-stages/__snapshots__/show-json-or-stages.spec.tsx.snap +++ b/web-console/src/components/show-json-or-stages/__snapshots__/show-json-or-stages.spec.tsx.snap @@ -10,6 +10,18 @@ exports[`ShowJsonOrStages matches snapshot 1`] = `
+