admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GH-3028 Update filter key and JSON parse assignee selected filter on tasks page (#3045)

Browse Source 
GH-3028 update key and JSON parse assignee selected filter on tasks page
This commit is contained in:
Deepak Kumar
2023-12-18 12:46:38 +05:30
committed by GitHub
parent f6041f560d
commit 3609c0939d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts
View File

@ -46,7 +46,7 @@ export const useTasks = (props?: UseTasksProps) => {
type: { eq: 'Task' }, type: { eq: 'Task' },
...(isNonEmptyString(selectedFilter?.value) && { ...(isNonEmptyString(selectedFilter?.value) && {
assigneeId: { assigneeId: {
eq: selectedFilter?.value, in: JSON.parse(selectedFilter?.value),
}, },
}), }),
}, },
@ -70,7 +70,7 @@ export const useTasks = (props?: UseTasksProps) => {
type: { eq: 'Task' }, type: { eq: 'Task' },
...(isNonEmptyString(selectedFilter?.value) && { ...(isNonEmptyString(selectedFilter?.value) && {
assigneeId: { assigneeId: {
eq: selectedFilter?.value, in: JSON.parse(selectedFilter?.value),
}, },
}), }),
}, },

2
packages/twenty-front/src/pages/tasks/TasksEffect.tsx
View File

@ -26,7 +26,7 @@ export const TasksEffect = ({ filterDropdownId }: TasksEffectProps) => {
if (currentWorkspaceMember) { if (currentWorkspaceMember) {
setSelectedFilter({ setSelectedFilter({
fieldMetadataId: 'assigneeId', fieldMetadataId: 'assigneeId',
value: currentWorkspaceMember.id, value: JSON.stringify(currentWorkspaceMember.id),
operand: ViewFilterOperand.Is, operand: ViewFilterOperand.Is,
displayValue: displayValue:
currentWorkspaceMember.name?.firstName + currentWorkspaceMember.name?.firstName +