From 3846b7c5fc5617439e1fbac85e69c865d61a5a87 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 23 Feb 2024 13:01:46 -0800
Subject: [PATCH] IO-2640 Adjust Filters and Sorters for Table

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
---
 .../scheduled-in-today.component.jsx             |  8 ++++++--
 .../scheduled-out-today.component.jsx            | 16 +++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
index 3a902950e..fdf083a40 100644
--- a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
@@ -22,6 +22,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
   const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},
+    filteredInfo: {},
   });
   const [isTvModeScheduledIn, setIsTvModeScheduledIn] = useLocalStorage(
     "isTvModeScheduledIn",
@@ -205,6 +206,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
             })
             .sort((a, b) => alphaSort(a.text, b.text))) ||
         [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
       render: (text, record) => (
         <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
           {record.alt_transport}
@@ -406,12 +408,14 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
             })
             .sort((a, b) => alphaSort(a.text, b.text))) ||
         [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
     },
   ];
 
-  const handleTableChange = (sorter) => {
-    setState({ ...state, sortedInfo: sorter });
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
+
   return (
     <Card
       title={t("dashboard.titles.scheduledindate", {
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 2a702a616..c5ac05f58 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
@@ -22,6 +22,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
   const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},
+    filteredInfo: {},
   });
   const [isTvModeScheduledOut, setIsTvModeScheduledOut] = useLocalStorage(
     "isTvModeScheduledOut",
@@ -152,11 +153,9 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
             </span>
           </Link>
         ) : (
-          <span
-            style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}
-          >{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
+          <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>{`${
+            record.v_model_yr || ""
+          } ${record.v_make_desc || ""} ${record.v_model_desc || ""}`}</span>
         );
       },
     },
@@ -182,6 +181,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
             })
             .sort((a, b) => alphaSort(a.text, b.text))) ||
         [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
       render: (text, record) => (
         <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
           {record.alt_transport}
@@ -209,6 +209,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
             })
             .sort((a, b) => alphaSort(a.text, b.text))) ||
         [],
+      onFilter: (value, record) => value.includes(record.status),
       render: (text, record) => (
         <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
           {record.status}
@@ -414,11 +415,12 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
             })
             .sort((a, b) => alphaSort(a.text, b.text))) ||
         [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
     },
   ];
 
-  const handleTableChange = (sorter) => {
-    setState({ ...state, sortedInfo: sorter });
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
   return (