From 2826360627acf8e5ca2950292eb30b03b8f8343b Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Thu, 18 Jan 2024 20:46:51 -0500 Subject: [PATCH] - fixed scheduled-out-today.component.jsx Signed-off-by: Dave Richer --- .../scheduled-out-today.component.jsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx index 8168bc540..4d155d12a 100644 --- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx +++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx @@ -18,12 +18,13 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) { if (!data.scheduled_out_today) return ; - data.scheduled_out_today.forEach((item) => { - item.scheduled_completion = dayjs(item.scheduled_completion).format("hh:mm a") - }); - data.scheduled_out_today.sort(function (a, b) { - return new Date(a.scheduled_completion) - new Date(b.scheduled_completion); - }); + const filteredScheduledOutToday = data.scheduled_out_today.map((item) => { + return { + ...item, + scheduled_completion: dayjs(item.scheduled_completion).format("hh:mm a"), + timestamp: dayjs(item.scheduled_completion).valueOf(), + } + }).sort((a, b) => a.timestamp - b.timestamp); const columns = [ { @@ -167,7 +168,7 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) { scroll={{x: true, y: "calc(100% - 2em)"}} rowKey="id" style={{height: "85%"}} - dataSource={data.scheduled_out_today} + dataSource={filteredScheduledOutToday} />