Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extra undefined check for table filters (#8008) (#8014)

Browse Source 
* Add extra undefined check for table filters

* Logic fix..

- Do not return early, this is mistake!
- Correctly handle empty activeFilter state

(cherry picked from commit 7d844e02be)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2024-08-28 09:34:26 +10:00 committed by GitHub
parent edf02cd817
commit e89cfd4958
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontend/src/tables/FilterSelectDrawer.tsx
View File

@ -65,8 +65,13 @@ function FilterAddGroup({
availableFilters: TableFilter[]; availableFilters: TableFilter[];
}) { }) {
const filterOptions: TableFilterChoice[] = useMemo(() => { const filterOptions: TableFilterChoice[] = useMemo(() => {
let activeFilterNames = // List of filter names which are already active on this table
tableState.activeFilters?.map((flt) => flt.name) ?? []; let activeFilterNames: string[] = [];
if (tableState.activeFilters && tableState.activeFilters.length > 0) {
activeFilterNames =
tableState.activeFilters?.map((flt) => flt.name) ?? [];
}
return ( return (
availableFilters availableFilters
@ -83,7 +88,7 @@ function FilterAddGroup({
const valueOptions: TableFilterChoice[] = useMemo(() => { const valueOptions: TableFilterChoice[] = useMemo(() => {
// Find the matching filter // Find the matching filter
let filter: TableFilter | undefined = availableFilters.find( let filter: TableFilter | undefined = availableFilters?.find(
(flt) => flt.name === selectedFilter (flt) => flt.name === selectedFilter
); );