From 3609c0939d53006cdf3395be8dd9ed69fede2c48 Mon Sep 17 00:00:00 2001 From: Deepak Kumar Date: Mon, 18 Dec 2023 12:46:38 +0530 Subject: [PATCH] GH-3028 Update filter key and JSON parse assignee selected filter on tasks page (#3045) GH-3028 update key and JSON parse assignee selected filter on tasks page --- .../src/modules/activities/tasks/hooks/useTasks.ts | 4 ++-- packages/twenty-front/src/pages/tasks/TasksEffect.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts b/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts index 1d6293ddf..e194a4d8d 100644 --- a/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts +++ b/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts @@ -46,7 +46,7 @@ export const useTasks = (props?: UseTasksProps) => { type: { eq: 'Task' }, ...(isNonEmptyString(selectedFilter?.value) && { assigneeId: { - eq: selectedFilter?.value, + in: JSON.parse(selectedFilter?.value), }, }), }, @@ -70,7 +70,7 @@ export const useTasks = (props?: UseTasksProps) => { type: { eq: 'Task' }, ...(isNonEmptyString(selectedFilter?.value) && { assigneeId: { - eq: selectedFilter?.value, + in: JSON.parse(selectedFilter?.value), }, }), }, diff --git a/packages/twenty-front/src/pages/tasks/TasksEffect.tsx b/packages/twenty-front/src/pages/tasks/TasksEffect.tsx index 24554d935..859b167f0 100644 --- a/packages/twenty-front/src/pages/tasks/TasksEffect.tsx +++ b/packages/twenty-front/src/pages/tasks/TasksEffect.tsx @@ -26,7 +26,7 @@ export const TasksEffect = ({ filterDropdownId }: TasksEffectProps) => { if (currentWorkspaceMember) { setSelectedFilter({ fieldMetadataId: 'assigneeId', - value: currentWorkspaceMember.id, + value: JSON.stringify(currentWorkspaceMember.id), operand: ViewFilterOperand.Is, displayValue: currentWorkspaceMember.name?.firstName +