christianV/CrazeAnalytix
1
0
Fork 0
mirror of https://github.com/christianvidalwolf-prog/CrazeAnalytix.git synced 2026-08-03 12:25:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve DataGrid search and filtering issues by consolidating search logic in filterData and fixing aggregation-aware filtering

Browse Source
This commit is contained in:
Christian Vidal Wolf
2026-04-30 10:51:56 +02:00
parent 4fbe7570a9
commit 4d52928321
2 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/DataGrid.tsx
+4 -37
View File
@@ -435,43 +435,10 @@ const DataGrid: React.FC<DataGridProps> = ({ data, filters, hasCustomerFilter, a
});
}
// 0. Global Search Filter
if (searchTerm) {
const rawTerm = searchTerm.trim();
// Check if it looks like a bulk search (contains newlines or commas)
const isBulk = rawTerm.includes('\n') || rawTerm.includes(',') || rawTerm.includes(' ');
if (isBulk) {
const searchTerms = rawTerm
.split(/[\s,\n]+/)
.map(t => t.trim().toLowerCase())
.filter(t => t.length > 0);
if (searchTerms.length > 0) {
result = result.filter(row => {
const rowSku = row.sku?.toLowerCase() || '';
const rowAsin = row.asin?.toLowerCase() || '';
const rowTitle = row.title?.toLowerCase() || '';
return searchTerms.some(term =>
rowSku.includes(term) ||
rowAsin.includes(term) ||
rowTitle.includes(term)
);
});
}
} else {
const term = rawTerm.toLowerCase();
result = result.filter(row => {
return (
(row.sku?.toLowerCase().includes(term)) ||
(row.asin?.toLowerCase().includes(term)) ||
(row.title?.toLowerCase().includes(term)) ||
(row.line?.toLowerCase().includes(term)) ||
(row.customer?.toLowerCase().includes(term))
);
});
}
}
// Note: Global Search Filter (searchTerm) is now handled at the flat data level
// in pivotRows using filterData. This ensures that even when grouped by
// dimensions like 'customer', the search correctly filters the underlying
// products before aggregation.
// 1. Filter (Legacy Row Filters)
if (rowFilters.length > 0) {