Skip to content

Commit 654bacb

Browse files
committed
OpenConceptLab/ocl_issues#2242 | cleanup locale filter if all removed
1 parent 8233dd8 commit 654bacb

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/components/map-projects/ConfigurationForm.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ const ConfigurationForm = ({ project, handleFileUpload, file, owner, setOwner, n
161161
getOptionLabel={(option) => option}
162162
value={appliedLocales}
163163
onChange={(event, values) => {
164-
setFilters({...filters, locale: values.join(',')})
164+
setFilters(values?.length ? {...filters, locale: values.join(',')} : omit(filters, ['locale']))
165165
}}
166166
sx={{marginTop: '12px'}}
167167
renderInput={(params) => (

src/components/map-projects/MapProject.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import get from 'lodash/get'
5555
import countBy from 'lodash/countBy'
5656
import sum from 'lodash/sum'
5757
import omit from 'lodash/omit'
58+
import omitBy from 'lodash/omitBy'
5859
import reject from 'lodash/reject'
5960
import uniq from 'lodash/uniq'
6061
import compact from 'lodash/compact'
@@ -685,7 +686,7 @@ const MapProject = () => {
685686

686687
const getFilters = () => {
687688
let defaultFilters = (repoVersion?.meta?.display?.default_filter || {})
688-
let allFilters = {...filters, ...defaultFilters}
689+
let allFilters = {...omitBy(filters, value => !value), ...defaultFilters}
689690
return includeDefaultFilter ? allFilters : omit(allFilters, Object.keys(defaultFilters))
690691
}
691692

0 commit comments

Comments
 (0)