Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

Commit f3efabd

Browse files
authored
fix: LSDV-5031: Adding new region after filter it is not filtered (#1352)
* fix: lsdv-5031: if filter contains all regions it should be null * filter list applied to new additions --------- Co-authored-by: Travis1282 <[email protected]>
1 parent 54aa11e commit f3efabd

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/components/Filter/Filter.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const Filter: FC<FilterInterface> = ({
1919

2020
useEffect(() => {
2121
if(filterList.length > 0) {
22-
onChange(FilterItems(filterData, filterList[0]));
22+
onChange(FilterItems(filterData, filterList));
2323
}
2424
}, [filterData]);
2525

src/stores/RegionStore.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ export default types.model('RegionStore', {
430430
setView(view) {
431431
if (isFF(FF_DEV_2755)) {
432432
window.localStorage.setItem(localStorageKeys.view, view);
433-
console.log('setView', window.localStorage.getItem(localStorageKeys.view));
434433
}
435434
self.view = view;
436435
},
@@ -455,15 +454,21 @@ export default types.model('RegionStore', {
455454
},
456455

457456
setFilteredRegions(filter) {
458-
self.filter = filter;
459-
460-
const filteredIds = filter.map((filter) => filter.id);
461-
462-
self.regions.forEach((region) => {
463-
if (!region.hideable || (region.hidden && !region.filtered)) return;
464-
if (filteredIds.includes(region.id)) region.hidden && region.toggleFiltered();
465-
else if (!region.hidden) region.toggleFiltered();
466-
});
457+
458+
if (self.regions.length === filter.length) {
459+
self.filter = null;
460+
self.regions.forEach((region) => region.filtered && region.toggleFiltered());
461+
} else {
462+
const filteredIds = filter.map((filter) => filter.id);
463+
464+
self.filter = filter;
465+
466+
self.regions.forEach((region) => {
467+
if (!region.hideable || (region.hidden && !region.filtered)) return;
468+
if (filteredIds.includes(region.id)) region.hidden && region.toggleFiltered();
469+
else if (!region.hidden) region.toggleFiltered();
470+
});
471+
}
467472
},
468473

469474
/**

0 commit comments

Comments
 (0)