@bjsdistribution/dms-client-return 0.0.91 → 0.0.92

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.91",
+  "version": "0.0.92",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -88,11 +88,13 @@
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^5.15.10",
+    "@reduxjs/toolkit": "^2.5.0",
     "@tanstack/react-table": "^8.11.8",
     "antd": "^5.18.3",
     "dayjs": "^1.11.11",
     "jotai": "^2.6.3",
     "react-custom-scrollbars-2": "^4.5.0",
+    "react-redux": "^9.2.0",
     "react-switch-selector": "^2.2.1"
   }
 }

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

@@ -1,8 +1,14 @@
 import { Checkbox, useApiHook } from '@bjsdistribution/dms-component-library';
-import { Empty, notification } from 'antd';
+import { Empty, notification, Skeleton } from 'antd';
+import { format } from 'date-fns';
 import { useAtom } from 'jotai';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { Skeleton } from 'antd';
+import DownIcon from '../../../../assets/icons/DownIcon';
+import PrinterIcon from '../../../../assets/icons/PrinterIcon';
+import CaretDownFilledIcon from '../../../../common/CaretDownFilledIcon';
+import SortIcon from '../../../../common/SortIcon';
+import PrintDropDownReturn from '../../../order-view/details-filters/left-side-filters/dropdowns/PrintDropDownReturn';
+import { usefetchAgain, useReturnData } from '../../../order-view/store';
 import {
   useGroupedPayload,
   useLocationData,
@@ -11,32 +17,24 @@ import {
   useSelectAll,
   useSelectedOrders,
 } from '../../../store';
-import { usefetchAgain, useReturnData } from '../../../order-view/store';
-import { EmptyDataContainer } from '../../table/table-data/styles';
-import { CustomDrop, StyledTable, StyledTableWrapper } from './returnstyles';
-import PrinterIcon from '../../../../assets/icons/PrinterIcon';
-import DownIcon from '../../../../assets/icons/DownIcon';
+import { ApiResponse } from '../../../types';
+import { filtersReducerAtom } from '../../header-filters/filterStore';
+import { displayValueOrNA } from '../../shared/utlis';
 import {
   useLoading,
   UsePaginationData,
   usePrintOptionTOggle,
 } from '../../store/store';
-import { ApiResponse } from '../../../types';
-import { filtersReducerAtom } from '../../header-filters/filterStore';
-import { displayValueOrNA } from '../../shared/utlis';
-import PrintDropDownReturn from '../../../order-view/details-filters/left-side-filters/dropdowns/PrintDropDownReturn';
-import { format } from 'date-fns';
-import CaretDownFilledIcon from '../../../../common/CaretDownFilledIcon';
-import SortIcon from '../../../../common/SortIcon';
+import { EmptyDataContainer } from '../../table/table-data/styles';
+import { CustomDrop, StyledTable, StyledTableWrapper } from './returnstyles';
+
 const ReturnOrderTable = () => {
   const [state] = useAtom(filtersReducerAtom);
-
   const [selectedReturnOrder, setSelectedReturnOrder] = useSelectedOrders();
   const [selectAll, setSelectAll] = useSelectAll();
   const { 'x-filters': filters, 'x-pagination': pagination } = state;
   const [returnData, setReturnData] = useReturnData();
   const [load, setLoading] = useLoading();
-  // const [postLoading] = usePostLoading();
   const dropdownRefParent = useRef<HTMLDivElement>(null);
   const dropdownRef = useRef<HTMLDivElement>(null);
   const [printToogle, setPrintToggle] = usePrintOptionTOggle();
@@ -171,40 +169,32 @@ const ReturnOrderTable = () => {
   }, [fetchedOrderData, returnDataLoad, locationData, state, callForFetch]);
 
   const handleSelectAll = (e: any) => {
-    setSelectAll(e.target.checked);
-
-    if (e.target.checked) {
-      setSelectedReturnOrder(
-        returnData
-          ?.filter(
-            (loc: any) => loc?.order_product_return_action?.type === 'RTS'
-          )
-          .map((loc: any) => ({
-            id: loc.id,
-            return_locations: loc?.return_locations,
-            return_location: loc?.return_location,
-            products: loc?.legacy_product_id,
-            order_product_return_action: loc?.order_product_return_action,
-            return_location_token: loc?.return_location,
-            // new_location: loc?.new_location,
-          }))
-      );
+    const isChecked = e.target.checked;
+    setSelectAll(isChecked);
 
-      setNewPayload(
-        returnData
-          ?.filter(
-            (loc: any) => loc?.order_product_return_action?.type === 'RTS'
-          )
-          .map((loc: any) => ({
-            id: loc.id,
-            account_number: createReturn?.account_number,
-            customer_id: +createReturn?.customer_id,
-            products: [loc?.legacy_product_id],
-            return_action: loc?.order_product_return_action?.type,
-            return_location_token: loc?.return_location || null,
-            // new_location: loc?.new_location,
-          }))
+    if (isChecked) {
+      const filteredData = returnData?.filter(
+        (loc: any) => loc?.order_product_return_action?.type === 'RTS'
       );
+      const selectedOrders = filteredData.map((loc: any) => ({
+        id: loc.id,
+        return_locations: loc?.return_locations,
+        return_location: loc?.return_location,
+        products: loc?.legacy_product_id,
+        order_product_return_action: loc?.order_product_return_action,
+        return_location_token: loc?.return_location,
+      }));
+      const newPayload = filteredData.map((loc: any) => ({
+        id: loc.id,
+        account_number: createReturn?.account_number,
+        customer_id: +createReturn?.customer_id,
+        products: [loc?.legacy_product_id],
+        return_action: loc?.order_product_return_action?.type,
+        return_location_token: loc?.return_location || null,
+      }));
+
+      setSelectedReturnOrder(selectedOrders);
+      setNewPayload(newPayload);
     } else {
       setSelectedReturnOrder([]);
       setNewPayload([]);
@@ -217,7 +207,6 @@ const ReturnOrderTable = () => {
     return_location: any,
     return_locations: any,
     order_product_return_action: any,
-    // new_location: any,
     legacy_product_id: any
   ) => {
     setSelectedReturnOrder((prevSelectedLocations: any) => {
@@ -242,6 +231,7 @@ const ReturnOrderTable = () => {
           prevPayload.filter((item: any) => item.id !== id)
         );
 
+        setSelectAll(false); // Ensure "select all" is false if one is deselected
         return updatedSelectedLocations;
       } else {
         const newReturnPayload = {
@@ -249,32 +239,28 @@ const ReturnOrderTable = () => {
           account_number: createReturn?.account_number,
           customer_id: +createReturn?.customer_id,
           products: [legacy_product_id],
-          return_action: order_product_return_action?.type
-            ? [order_product_return_action.type]
-            : null,
+          return_action: order_product_return_action?.type || null,
           return_location_token: return_location || null,
         };
 
         setNewPayload((prevPayload: any) => [...prevPayload, newReturnPayload]);
 
-        setReturnPayload(prevState => ({
-          ...prevState,
-          products: legacy_product_id,
-          return_action: order_product_return_action?.type || null,
-          return_location_token: return_location || null,
-          // new_location: new_location,
-        }));
-
-        return [
+        const updatedSelectedLocations = [
           ...prevSelectedLocations,
           {
             id,
             return_location,
             return_locations,
             order_product_return_action,
-            // new_location,
           },
         ];
+        setSelectAll(
+          updatedSelectedLocations?.length ===
+            returnData?.filter(
+              (loc: any) => loc?.order_product_return_action?.type === 'RTS'
+            )?.length
+        );
+        return updatedSelectedLocations;
       }
     });
   };
@@ -397,33 +383,26 @@ const ReturnOrderTable = () => {
               sortedData?.map((item: any, index: any) => (
                 <tr key={item.id}>
                   <td>
-                    {item?.order_product_return_action?.type == 'RTS' ? (
-                      <>
-                        <Checkbox
-                          className="custom-check"
-                          checked={selectedReturnOrder?.some(
-                            (selectedInvoice: any) =>
-                              selectedInvoice?.id === item.id
-                          )}
-                          onChange={() =>
-                            handleSelectOrderReturn(
-                              item.id,
-                              item.return_location,
-                              item.return_locations,
-                              item.order_product_return_action,
-                              // item.new_location,
-                              item.legacy_product_id
-                            )
-                          }
-                        />
-                      </>
+                    {item?.order_product_return_action?.type === 'RTS' ? (
+                      <Checkbox
+                        className="custom-check"
+                        checked={selectedReturnOrder.some(
+                          (selectedInvoice: any) =>
+                            selectedInvoice?.id === item?.id
+                        )}
+                        onChange={() =>
+                          handleSelectOrderReturn(
+                            item?.id,
+                            item?.return_location,
+                            item?.return_locations,
+                            item?.order_product_return_action,
+                            item?.legacy_product_id
+                          )
+                        }
+                      />
                     ) : null}
                   </td>
 
-                  {/* <>
-                      <Checkbox disabled onChange={() => {}} checked={false} />
-                    </> */}
-
                   <td>
                     {item?.orders_products_stock?.location !== null &&
                     item?.orders_products_stock?.location !== undefined ? (