From 0bf2144febc68b2d1fbeeb94ca38949f60cb7e58 Mon Sep 17 00:00:00 2001 From: Aaron Chong Date: Mon, 24 Jun 2024 13:33:56 +0800 Subject: [PATCH] Changes to UI to make filters and sorting work Signed-off-by: Aaron Chong --- packages/dashboard/src/components/tasks/tasks-app.tsx | 4 ++-- packages/react-components/lib/tasks/task-table-datagrid.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/dashboard/src/components/tasks/tasks-app.tsx b/packages/dashboard/src/components/tasks/tasks-app.tsx index 3980d3e37..ae9812988 100644 --- a/packages/dashboard/src/components/tasks/tasks-app.tsx +++ b/packages/dashboard/src/components/tasks/tasks-app.tsx @@ -191,8 +191,8 @@ export const TasksApp = React.memo( filterColumn && filterColumn === 'id_' ? filterValue : undefined, filterColumn && filterColumn === 'category' ? filterValue : undefined, filterColumn && filterColumn === 'requester' ? filterValue : undefined, - filterColumn && filterColumn === 'pickup' ? filterValue : undefined, - filterColumn && filterColumn === 'destination' ? filterValue : undefined, + filterColumn && filterColumn === 'label=pickup' ? filterValue : undefined, + filterColumn && filterColumn === 'label=destination' ? filterValue : undefined, filterColumn && filterColumn === 'assigned_to' ? filterValue : undefined, filterColumn && filterColumn === 'status' ? filterValue : undefined, undefined, diff --git a/packages/react-components/lib/tasks/task-table-datagrid.tsx b/packages/react-components/lib/tasks/task-table-datagrid.tsx index 9b2ad8952..506975169 100644 --- a/packages/react-components/lib/tasks/task-table-datagrid.tsx +++ b/packages/react-components/lib/tasks/task-table-datagrid.tsx @@ -218,7 +218,7 @@ export function TaskDataGridTable({ filterable: true, }, { - field: 'pickup', + field: 'label=pickup', headerName: 'Pickup', width: 150, editable: false, @@ -233,7 +233,7 @@ export function TaskDataGridTable({ filterable: true, }, { - field: 'destination', + field: 'label=destination', headerName: 'Destination', width: 150, editable: false,