fix: Column filtering logic based on filteredData (#389)

parseablehq · Dec 18, 2024 · 910fd4f · 910fd4f
1 parent 78ab65c
commit 910fd4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/pages/Stream/components/Column.tsx b/src/pages/Stream/components/Column.tsx
@@ -20,14 +20,14 @@ const Column: FC<Column> = (props) => {
 	const [uniqueValues, setUniqueValues] = useState<string[]>([]);
 	const [filteredValues, setFilteredValues] = useState<string[]>([]);
 	const [selectedValues, setSelectedValues] = useState<string[]>([]);
-	const [rawData, setLogsStore] = useLogsStore((store) => store.data.rawData);
+	const [{ rawData, filteredData }, setLogsStore] = useLogsStore((store) => store.data);
 	const [wrapDisabledColumns] = useLogsStore((store) => store.tableOpts.wrapDisabledColumns);
 	const inputValueRef = useRef('');
 
 	useEffect(() => {
-		const uniqueValues = getUniqueValues(rawData, columnName);
+		const uniqueValues = getUniqueValues(filteredData || rawData, columnName);
 		setUniqueValues(uniqueValues);
-	}, [rawData]);
+	}, [rawData, filteredData]);
 
 	const onSearch = useCallback(
 		(e: ChangeEvent<HTMLInputElement>) => {

diff --git a/src/pages/Stream/providers/LogsProvider.tsx b/src/pages/Stream/providers/LogsProvider.tsx
@@ -466,16 +466,10 @@ const filterAndSortData = (
 	data: Log[],
 ) => {
 	const { sortOrder, sortKey, filters } = opts;
+	const filterSets = _.mapValues(filters, (values) => new Set(values));
 	const filteredData = _.isEmpty(filters)
 		? data
-		: (_.reduce(
-				data,
-				(acc: Log[], d: Log) => {
-					const doesMatch = _.some(filters, (value, key) => _.includes(value, _.toString(d[key])));
-					return doesMatch ? [...acc, d] : acc;
-				},
-				[],
-		  ) as Log[]);
+		: _.filter(data, (item) => _.every(filterSets, (valueSet, key) => valueSet.has(_.toString(item[key]))));
 	const sortedData = _.orderBy(filteredData, [sortKey], [sortOrder]);
 	return sortedData;
 };