fix: code optimization

bigcommerce · Nov 22, 2022 · 796a62c · 796a62c
1 parent 87b2a77
commit 796a62c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/apps/storefront/src/pages/order/Order.tsx b/apps/storefront/src/pages/order/Order.tsx
@@ -174,11 +174,10 @@ const Order = ({
     setFilterData(search)
     const initFilter = async () => {
       const fn = isB2BUser ? getOrderStatusType : getBcOrderStatusType
-      const {
-        orderStatuses = [],
-      }: any = await fn()
-      const filterInfo = getFilterMoreData(isB2BUser, isCompanyOrder, orderStatuses)
-      setOrderStatuses(orderStatuses)
+      const orderStatusesName = isB2BUser ? 'orderStatuses' : 'bcOrderStatuses'
+      const orderStatuses: any = await fn()
+      const filterInfo = getFilterMoreData(isB2BUser, isCompanyOrder, orderStatuses[orderStatusesName])
+      setOrderStatuses(orderStatuses[orderStatusesName])
       setFilterInfo(filterInfo)
     }
 

diff --git a/apps/storefront/src/pages/orderDetail/OrderDetail.tsx b/apps/storefront/src/pages/orderDetail/OrderDetail.tsx
@@ -134,14 +134,12 @@ const OrderDetail = () => {
 
   const getOrderStatus = async () => {
     const fn = isB2BUser ? getOrderStatusType : getBcOrderStatusType
-    const {
-      orderStatuses = [],
-    }: any = await fn()
-
+    const orderStatusesName = isB2BUser ? 'orderStatuses' : 'bcOrderStatuses'
+    const orderStatuses: any = await fn()
     dispatch({
       type: 'statusType',
       payload: {
-        orderStatus: orderStatuses,
+        orderStatus: orderStatuses[orderStatusesName],
       },
     })
   }

diff --git a/apps/storefront/src/pages/orderDetail/components/DetailPagination.tsx b/apps/storefront/src/pages/orderDetail/components/DetailPagination.tsx
@@ -125,13 +125,13 @@ const DetailPagination = ({
 
     if (listIndex === totalCount - 1) {
       flag = 'toRight'
-      leftId = list[list.length - 2].node.orderId
+      leftId = list[list.length - 2]?.node.orderId || 0
     } else if (listIndex === 0) {
       flag = 'toLeft'
-      rightId = list[1].node.orderId
+      rightId = list[1]?.node.orderId || 0
     } else {
-      leftId = list[0].node.orderId
-      rightId = list[2].node.orderId
+      leftId = list[0]?.node.orderId || 0
+      rightId = list[2]?.node.orderId || 0
     }
 
     setRightLeftSide({