Add Ability to archive and unarchive
This commit is contained in:
parent
88c11eeeea
commit
53ea81e8ca
3 changed files with 73 additions and 2 deletions
|
@ -65,6 +65,18 @@ const GetArchivedChores = () => {
|
||||||
headers: HEADERS(),
|
headers: HEADERS(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
const ArchiveChore = id => {
|
||||||
|
return Fetch(`${API_URL}/chores/${id}/archive`, {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: HEADERS(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const UnArchiveChore = id => {
|
||||||
|
return Fetch(`${API_URL}/chores/${id}/unarchive`, {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: HEADERS(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
const GetChoreByID = id => {
|
const GetChoreByID = id => {
|
||||||
return Fetch(`${API_URL}/chores/${id}`, {
|
return Fetch(`${API_URL}/chores/${id}`, {
|
||||||
|
@ -348,6 +360,7 @@ const DeleteLabel = id => {
|
||||||
|
|
||||||
export {
|
export {
|
||||||
AcceptCircleMemberRequest,
|
AcceptCircleMemberRequest,
|
||||||
|
ArchiveChore,
|
||||||
CancelSubscription,
|
CancelSubscription,
|
||||||
createChore,
|
createChore,
|
||||||
CreateChore,
|
CreateChore,
|
||||||
|
@ -384,6 +397,7 @@ export {
|
||||||
SaveThing,
|
SaveThing,
|
||||||
signUp,
|
signUp,
|
||||||
SkipChore,
|
SkipChore,
|
||||||
|
UnArchiveChore,
|
||||||
UpdateChoreAssignee,
|
UpdateChoreAssignee,
|
||||||
UpdateChoreHistory,
|
UpdateChoreHistory,
|
||||||
UpdateChorePriority,
|
UpdateChorePriority,
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import {
|
import {
|
||||||
|
Archive,
|
||||||
CancelScheduleSend,
|
CancelScheduleSend,
|
||||||
Check,
|
Check,
|
||||||
Delete,
|
Delete,
|
||||||
|
@ -18,6 +19,7 @@ import {
|
||||||
Report,
|
Report,
|
||||||
SwitchAccessShortcut,
|
SwitchAccessShortcut,
|
||||||
TimesOneMobiledata,
|
TimesOneMobiledata,
|
||||||
|
Unarchive,
|
||||||
Update,
|
Update,
|
||||||
ViewCarousel,
|
ViewCarousel,
|
||||||
Webhook,
|
Webhook,
|
||||||
|
@ -43,8 +45,10 @@ import { useNavigate } from 'react-router-dom'
|
||||||
import { API_URL } from '../../Config'
|
import { API_URL } from '../../Config'
|
||||||
import { UserContext } from '../../contexts/UserContext'
|
import { UserContext } from '../../contexts/UserContext'
|
||||||
import {
|
import {
|
||||||
|
ArchiveChore,
|
||||||
MarkChoreComplete,
|
MarkChoreComplete,
|
||||||
SkipChore,
|
SkipChore,
|
||||||
|
UnArchiveChore,
|
||||||
UpdateChoreAssignee,
|
UpdateChoreAssignee,
|
||||||
} from '../../utils/Fetcher'
|
} from '../../utils/Fetcher'
|
||||||
import { getTextColorFromBackgroundColor } from '../../utils/LabelColors'
|
import { getTextColorFromBackgroundColor } from '../../utils/LabelColors'
|
||||||
|
@ -137,6 +141,30 @@ const ChoreCard = ({
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
const handleArchive = () => {
|
||||||
|
if (chore.isActive) {
|
||||||
|
ArchiveChore(chore.id).then(response => {
|
||||||
|
if (response.ok) {
|
||||||
|
response.json().then(data => {
|
||||||
|
const newChore = { ...chore, isActive: false }
|
||||||
|
|
||||||
|
onChoreUpdate(newChore, 'archive')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
UnArchiveChore(chore.id).then(response => {
|
||||||
|
if (response.ok) {
|
||||||
|
response.json().then(data => {
|
||||||
|
const newChore = { ...chore, isActive: true }
|
||||||
|
onChoreUpdate(newChore, 'unarchive')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
handleMenuClose()
|
||||||
|
}
|
||||||
|
|
||||||
const handleTaskCompletion = () => {
|
const handleTaskCompletion = () => {
|
||||||
setIsPendingCompletion(true)
|
setIsPendingCompletion(true)
|
||||||
|
@ -691,6 +719,12 @@ const ChoreCard = ({
|
||||||
<ViewCarousel />
|
<ViewCarousel />
|
||||||
View
|
View
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
<MenuItem onClick={handleArchive} color='neutral'>
|
||||||
|
{chore.isActive ? <Archive /> : <Unarchive />}
|
||||||
|
{chore.isActive ? 'Archive' : 'Unarchive'}
|
||||||
|
</MenuItem>
|
||||||
|
<Divider />
|
||||||
|
|
||||||
<MenuItem onClick={handleDelete} color='danger'>
|
<MenuItem onClick={handleDelete} color='danger'>
|
||||||
<Delete />
|
<Delete />
|
||||||
Delete
|
Delete
|
||||||
|
|
|
@ -272,22 +272,39 @@ const MyChores = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleChoreUpdated = (updatedChore, event) => {
|
const handleChoreUpdated = (updatedChore, event) => {
|
||||||
const newChores = chores.map(chore => {
|
var newChores = chores.map(chore => {
|
||||||
if (chore.id === updatedChore.id) {
|
if (chore.id === updatedChore.id) {
|
||||||
return updatedChore
|
return updatedChore
|
||||||
}
|
}
|
||||||
return chore
|
return chore
|
||||||
})
|
})
|
||||||
|
|
||||||
const newFilteredChores = filteredChores.map(chore => {
|
var newFilteredChores = filteredChores.map(chore => {
|
||||||
if (chore.id === updatedChore.id) {
|
if (chore.id === updatedChore.id) {
|
||||||
return updatedChore
|
return updatedChore
|
||||||
}
|
}
|
||||||
return chore
|
return chore
|
||||||
})
|
})
|
||||||
|
if (event === 'archive') {
|
||||||
|
newChores = newChores.filter(chore => chore.id !== updatedChore.id)
|
||||||
|
newFilteredChores = newFilteredChores.filter(
|
||||||
|
chore => chore.id !== updatedChore.id,
|
||||||
|
)
|
||||||
|
if (archivedChores !== null) {
|
||||||
|
setArchivedChores([...archivedChores, updatedChore])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (event === 'unarchive') {
|
||||||
|
newChores.push(updatedChore)
|
||||||
|
newFilteredChores.push(updatedChore)
|
||||||
|
setArchivedChores(
|
||||||
|
archivedChores.filter(chore => chore.id !== updatedChore.id),
|
||||||
|
)
|
||||||
|
}
|
||||||
setChores(newChores)
|
setChores(newChores)
|
||||||
setFilteredChores(newFilteredChores)
|
setFilteredChores(newFilteredChores)
|
||||||
setChoreSections(sectionSorter('due_date', newChores))
|
setChoreSections(sectionSorter('due_date', newChores))
|
||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case 'completed':
|
case 'completed':
|
||||||
setSnackBarMessage('Completed')
|
setSnackBarMessage('Completed')
|
||||||
|
@ -298,6 +315,12 @@ const MyChores = () => {
|
||||||
case 'rescheduled':
|
case 'rescheduled':
|
||||||
setSnackBarMessage('Rescheduled')
|
setSnackBarMessage('Rescheduled')
|
||||||
break
|
break
|
||||||
|
case 'unarchive':
|
||||||
|
setSnackBarMessage('Unarchive')
|
||||||
|
break
|
||||||
|
case 'archive':
|
||||||
|
setSnackBarMessage('Archived')
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
setSnackBarMessage('Updated')
|
setSnackBarMessage('Updated')
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue