amy/donetick-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor MyChores component to include chore filters in ChoresGrouper calls

Browse source
This commit is contained in:
Mo Tarbin 2025-03-05 21:41:32 -05:00
commit 52b81cc115
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/views/Chores/MyChores.jsx
View file

@ -139,7 +139,11 @@ const MyChores = () => {
const sortedChores = choresData.res.sort(ChoreSorter) const sortedChores = choresData.res.sort(ChoreSorter)
setChores(sortedChores) setChores(sortedChores)
setFilteredChores(sortedChores) setFilteredChores(sortedChores)
const sections = ChoresGrouper(selectedChoreSection, sortedChores) const sections = ChoresGrouper(
selectedChoreSection,
sortedChores,
ChoreFilters(userProfile)[selectedChoreFilter],
)
setChoreSections(sections) setChoreSections(sections)
if (localStorage.getItem('openChoreSections') === null) { if (localStorage.getItem('openChoreSections') === null) {
setSelectedChoreSectionWithCache(selectedChoreSection) setSelectedChoreSectionWithCache(selectedChoreSection)
@ -178,7 +182,7 @@ const MyChores = () => {
} }
const setSelectedChoreFilterWithCache = value => { const setSelectedChoreFilterWithCache = value => {
setSelectedChoreFilter(value) setSelectedChoreFilter(value)
localStorage.setItem('selectedChoreFilter', JSON.stringify(value)) localStorage.setItem('selectedChoreFilter', value)
} }
const updateChores = newChore => { const updateChores = newChore => {
@ -186,7 +190,13 @@ const MyChores = () => {
newChores.push(newChore) newChores.push(newChore)
setChores(newChores) setChores(newChores)
setFilteredChores(newChores) setFilteredChores(newChores)
setChoreSections(ChoresGrouper(selectedChoreSection, newChores)) setChoreSections(
ChoresGrouper(
selectedChoreSection,
newChores,
ChoreFilters(userProfile)[selectedChoreFilter],
),
)
setSearchFilter('All') setSearchFilter('All')
} }
const handleMenuOutsideClick = event => { const handleMenuOutsideClick = event => {
@ -262,7 +272,13 @@ const MyChores = () => {
} }
setChores(newChores) setChores(newChores)
setFilteredChores(newFilteredChores) setFilteredChores(newFilteredChores)
setChoreSections(ChoresGrouper(selectedChoreSection, newChores)) setChoreSections(
ChoresGrouper(
selectedChoreSection,
newChores,
ChoreFilters(userProfile)[selectedChoreFilter],
),
)
switch (event) { switch (event) {
case 'completed': case 'completed':
@ -293,7 +309,13 @@ const MyChores = () => {
) )
setChores(newChores) setChores(newChores)
setFilteredChores(newFilteredChores) setFilteredChores(newFilteredChores)
setChoreSections(ChoresGrouper(selectedChoreSection, newChores)) setChoreSections(
ChoresGrouper(
selectedChoreSection,
newChores,
ChoreFilters(userProfile)[selectedChoreFilter],
),
)
} }
const searchOptions = { const searchOptions = {
@ -449,7 +471,11 @@ const MyChores = () => {
) )
}} }}
onItemSelect={selected => { onItemSelect={selected => {
const section = ChoresGrouper(selected.value, chores) const section = ChoresGrouper(
selected.value,
chores,
ChoreFilters(userProfile)[selectedChoreFilter],
)
setChoreSections(section) setChoreSections(section)
setSelectedChoreSectionWithCache(selected.value) setSelectedChoreSectionWithCache(selected.value)
setOpenChoreSectionsWithCache( setOpenChoreSectionsWithCache(