From 11879ab34662a9054c56f2e9b71180ef0a2573a6 Mon Sep 17 00:00:00 2001 From: Drew Rautenberg Date: Wed, 5 Feb 2025 13:06:36 -0600 Subject: [PATCH] refactored unneeded code --- barkmanui/src/features/inventory/AddItem.tsx | 13 ++++++------- barkmanui/src/features/inventory/InventoryList.tsx | 9 ++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/barkmanui/src/features/inventory/AddItem.tsx b/barkmanui/src/features/inventory/AddItem.tsx index 8ba7709..a335528 100644 --- a/barkmanui/src/features/inventory/AddItem.tsx +++ b/barkmanui/src/features/inventory/AddItem.tsx @@ -13,7 +13,7 @@ function AddItem() { const navigate = useNavigate(); - const rawData = useInventoryList(); + const inventoryQuery = useInventoryList(); const newItemForm = useForm({ mode: 'uncontrolled', @@ -69,15 +69,14 @@ function AddItem() { }) useEffect(() => { - if (rawData.data) { - const data = rawData.data; - const nextBarcode = data[data.length - 1].barcode + 1; + if (inventoryQuery.data) { + const nextBarcode = inventoryQuery.data[inventoryQuery.data.length - 1].barcode + 1; newItemForm.setValues({barcode: nextBarcode}); } - },[rawData.data]); + },[inventoryQuery.data]); - if (rawData.isPending) return 'Loading...' - if (rawData.error) return 'An error has occurred: ' + rawData.error.message + if (inventoryQuery.isPending) return 'Loading...' + if (inventoryQuery.error) return 'An error has occurred: ' + inventoryQuery.error.message diff --git a/barkmanui/src/features/inventory/InventoryList.tsx b/barkmanui/src/features/inventory/InventoryList.tsx index 5a6054c..c6df33f 100644 --- a/barkmanui/src/features/inventory/InventoryList.tsx +++ b/barkmanui/src/features/inventory/InventoryList.tsx @@ -6,13 +6,12 @@ import useInventoryList from "./hooks/useInventoryList.tsx"; function InventoryList() { - const rawData = useInventoryList(); + const inventoryQuery = useInventoryList(); - if (rawData.isPending) return 'Loading...' + if (inventoryQuery.isPending) return 'Loading...' - if (rawData.error) return 'An error has occurred: ' + rawData.error.message + if (inventoryQuery.error) return 'An error has occurred: ' + inventoryQuery.error.message - const data = rawData.data return ( <> @@ -41,7 +40,7 @@ function InventoryList() { - {data?.map((data) => ( + {inventoryQuery.data?.map((data) => ( {data.barcode} {data.brand}