From 478e03cbe7522af90c30a3183293a49743f47f14 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 22 Apr 2022 11:00:35 -0700 Subject: [PATCH] Resolve PO and Bills search on PLI screen. --- .../bills-list-table.component.jsx | 24 ++++++++++++++++++- .../parts-order-list-table.component.jsx | 20 +++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx index ed4fb70e6..7b5173033 100644 --- a/client/src/components/bills-list-table/bills-list-table.component.jsx +++ b/client/src/components/bills-list-table/bills-list-table.component.jsx @@ -43,6 +43,8 @@ export function BillsListTableComponent({ }); // const search = queryString.parse(useLocation().search); // const selectedBill = search.billid; + const [searchText, setSearchText] = useState(""); + const Templates = TemplateList("bill"); const bills = billsQuery.data ? billsQuery.data.bills : []; const { refetch } = billsQuery; @@ -166,6 +168,24 @@ export function BillsListTableComponent({ setState({ ...state, filteredInfo: filters, sortedInfo: sorter }); }; + const filteredBills = bills + ? searchText === "" + ? bills + : bills.filter( + (b) => + (b.invoice_number || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (b.vendor.name || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (b.total || "") + .toString() + .toLowerCase() + .includes(searchText.toLowerCase()) + ) + : []; + return ( { e.preventDefault(); + setSearchText(e.target.value); }} /> @@ -220,7 +242,7 @@ export function BillsListTableComponent({ }} columns={columns} rowKey="id" - dataSource={bills} + dataSource={filteredBills} onChange={handleTableChange} /> diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx index a554b7f0c..9806b6cca 100644 --- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx +++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx @@ -78,6 +78,7 @@ export function PartsOrderListTableComponent({ }); const search = queryString.parse(useLocation().search); const selectedpartsorder = search.partsorderid; + const [searchText, setSearchText] = useState(""); const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER); @@ -421,6 +422,21 @@ export function PartsOrderListTableComponent({ ); }; + const filteredPartsOrders = parts_orders + ? searchText === "" + ? parts_orders + : parts_orders.filter( + (b) => + (b.order_number || "") + .toString() + .toLowerCase() + .includes(searchText.toLowerCase()) || + (b.vendor.name || "") + .toLowerCase() + .includes(searchText.toLowerCase()) + ) + : []; + return ( { e.preventDefault(); + setSearchText(e.target.value); }} /> @@ -456,7 +474,7 @@ export function PartsOrderListTableComponent({ }} columns={columns} rowKey="id" - dataSource={parts_orders} + dataSource={filteredPartsOrders} onChange={handleTableChange} />