@bjsdistribution/dms-client-return 0.0.67 → 0.0.68

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.67",
+  "version": "0.0.68",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-daily-overview/index.tsx

@@ -59,13 +59,21 @@ function ReturnMainTable() {
     if (fetchedClientData && fetchedClientData.data) {
       const result = fetchedClientData?.data;
       setClientData(result);
-      if (paginationData !== null) {
-        const { count, ...rest } = JSON.parse(paginationData);
-        setPaginationObject(rest);
+      if (paginationData) {
+        try {
+          const { count, ...rest } = JSON.parse(paginationData);
+          setPaginationObject(rest);
+        } catch (error) {
+          console.error('Error parsing paginationData:', error);
+          notification.error({
+            message: 'Error',
+            description: 'Failed to parse pagination data',
+          });
+        }
       } else {
         notification.error({
           message: 'Error',
-          description: 'Pagination data is null',
+          description: 'Pagination data is null or undefined',
         });
       }
     }

package/src/components/order-daily-overview/return-after-table/ReturnAfterTable.tsx

@@ -57,13 +57,21 @@ const ReturnAfterTable = () => {
     setLoading(loading);
     if (fetchedReturnOrderData && fetchedReturnOrderData?.data) {
       setReturnOrderData(fetchedReturnOrderData?.data);
-      if (paginationData !== null) {
-        const { count, ...rest } = JSON.parse(paginationData);
-        setPaginationObject(rest);
+      if (paginationData) {
+        try {
+          const { count, ...rest } = JSON.parse(paginationData);
+          setPaginationObject(rest);
+        } catch (error) {
+          console.error('Error parsing paginationData:', error);
+          notification.error({
+            message: 'Error',
+            description: 'Failed to parse pagination data',
+          });
+        }
       } else {
         notification.error({
           message: 'Error',
-          description: 'Pagination data is null',
+          description: 'Pagination data is null or undefined',
         });
       }
     }

package/src/components/order-daily-overview/return-after-table/table/OrderTable.tsx

@@ -146,6 +146,8 @@ const OrderTable = () => {
         return { color: '#F4A503', background: '#FFF1D6' };
       case 'Awaiting route':
         return { color: '#845ADF', background: 'rgba(132, 90, 223, 0.15)' };
+      case 'Awaiting':
+        return { color: '#845ADF', background: 'rgba(132, 90, 223, 0.15)' };
       case 'Completed':
         return { color: '#1F9254', background: 'rgba(41, 204, 106, 0.15)' };
       case 'Outstanding':
@@ -277,6 +279,7 @@ const OrderTable = () => {
                   OO: 'On Hold',
                   SC: 'Sub-Contracted',
                   'awaiting route': 'Awaiting route',
+                  'awaiting confirmation': 'Awaiting',
                   completed: 'completed',
                   outstanding: 'Outstanding',
                   routed: 'Routed',

package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx

@@ -131,13 +131,21 @@ const ReturnOrderTable = () => {
     setLoading(returnDataLoad);
     if (fetchedOrderData && fetchedOrderData?.data) {
       setReturnData(fetchedOrderData?.data);
-      if (paginationData !== null) {
-        const { count, ...rest } = JSON.parse(paginationData);
-        setPaginationObject(rest);
+      if (paginationData) {
+        try {
+          const { count, ...rest } = JSON.parse(paginationData);
+          setPaginationObject(rest);
+        } catch (error) {
+          console.error('Error parsing paginationData:', error);
+          notification.error({
+            message: 'Error',
+            description: 'Failed to parse pagination data',
+          });
+        }
       } else {
         notification.error({
           message: 'Error',
-          description: 'Pagination data is null',
+          description: 'Pagination data is null or undefined',
         });
       }
     }

package/src/components/order-view/index.tsx

@@ -221,7 +221,6 @@ function OrderView() {
   useEffect(() => {
     setLoading(depotDataLoading);
     if (fetchedDepotData && fetchedDepotData.data) {
-      console.log(fetchedDepotData, 'fetchedDepotData');
       const requiredData = fetchedDepotData?.data;
       if (requiredData.length > 0) {
         const options = requiredData?.map((x: any) => {

package/src/index.tsx

@@ -43,8 +43,9 @@ function ReturnClient() {
     return parts;
   };
   const paths = splitPath(location.pathname);
+
   useEffect(() => {
-    if (paths[paths.length - 1] === 'orders/view/return') {
+    if (paths.join('/') === 'orders/view/return') {
       setActionTypeOptions([]);
       setLocationOptions([]);
       setSelectedClient(null);
@@ -52,11 +53,7 @@ function ReturnClient() {
       setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
-  // useEffect(() => {
-  //   if (selectedClientId) {
-  //     navigate(`filter/${selectedClientId}`);
-  //   }
-  // }, [selectedClientId]);
+
   //API for client data
   const { data: fetchedCustomerData, loading: loading } = useApiHook<
     ApiResponse
@@ -113,22 +110,18 @@ function ReturnClient() {
       <Suspense fallback={<LoadingMessage />}>
         <Routes>
           {/* for local */}
+          {/* <Route
+            path="/orders/view/return/*"
+            element={<OrderViewQueryHandler />}
+          /> */}
           {/* for dev */}
           <Route path="" element={<OrderViewQueryHandler />} />
           <Route path="overview" element={<ReturnAfterTable />} />
           <Route path="/:id" element={<OrderView />} />
-
+          {/* for local */}
+          {/* <Route path="/orders/view/return/filter" element={<ReturnTable />} /> */}
+          {/* for dev */}
           <Route path="filter" element={<ReturnTable />} />
-          {/* <Route
-          path=""
-          element={
-            selectedClientString ? (
-              <Navigate to={`return/${selectedClientString}`} />
-            ) : (
-              <ReturnMainTable />
-            )
-          }
-        /> */}
         </Routes>
       </Suspense>
     </>