@bjsdistribution/dms-client-return 0.1.18-dev → 0.1.20-dev

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

@@ -1,4 +1,4 @@
-import { Checkbox, useAxios } from '@bjsdistribution/dms-component-library';
+import { Checkbox, useApiHook } from '@bjsdistribution/dms-component-library';
 import { Empty, notification, Skeleton } from 'antd';
 import { format } from 'date-fns';
 import { useAtom } from 'jotai';
@@ -10,17 +10,12 @@ 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 {
-  useClientPortal,
-  useEndDate,
   useGroupedPayload,
   useLocationData,
   useNewReturnPayload,
   useReturnPayload,
-  useSearchText,
   useSelectAll,
-  useSelectedClientPortOrders,
   useSelectedOrders,
-  useStartDate,
 } from '../../../store';
 import { ApiResponse } from '../../../types';
 import { filtersReducerAtom } from '../../header-filters/filterStore';
@@ -32,8 +27,7 @@ import {
 } from '../../store/store';
 import { EmptyDataContainer } from '../../table/table-data/styles';
 import { CustomDrop, StyledTable, StyledTableWrapper } from './returnstyles';
-import { NavLink, useParams } from 'react-router-dom';
-import dayjs from 'dayjs';
+import { NavLink } from 'react-router-dom';
 
 const ReturnOrderTable = () => {
   const [state] = useAtom(filtersReducerAtom);
@@ -51,11 +45,6 @@ const ReturnOrderTable = () => {
   const [locationData] = useLocationData();
   const [, setPaginationObject] = UsePaginationData();
   const [callForFetch] = usefetchAgain();
-  const [clientPortal] = useClientPortal();
-  const { status } = useParams();
-  const [selectedOrderIds, setSelectedOrderIds] = useSelectedClientPortOrders();
-  const [selectClientAll, setSelectClientAll] = useState(false);
-  const [modifiedFilters, setModifiedFilters] = useState<any[]>([]);
 
   //sorting
   const [sortConfig, setSortConfig] = useState<{
@@ -122,67 +111,17 @@ const ReturnOrderTable = () => {
     }
   };
 
-  //CP
-  const [startDate] = useStartDate();
-  const [endDate] = useEndDate();
-
-  useEffect(() => {
-    if (!clientPortal) return;
-
-    const stored = JSON.parse(localStorage.getItem('returnDate') || '{}');
-
-    const sDate = startDate?.isValid?.() ? startDate : dayjs(stored?.startDate);
-    const eDate = endDate?.isValid?.()
-      ? endDate
-      : stored?.endDate
-      ? dayjs(stored?.endDate)
-      : null;
-
-    if (!sDate?.isValid?.()) return;
-
-    let dateFilters = [];
-
-    if (eDate && eDate.isValid()) {
-      dateFilters = [
-        { field: 'created_at', op: '>=', value: sDate.format('YYYY-MM-DD') },
-        {
-          field: 'created_at',
-          op: '<=',
-          value: eDate.add(1, 'day').format('YYYY-MM-DD'),
-        },
-      ];
-    } else {
-      dateFilters = [
-        {
-          field: 'created_at',
-          op: '=',
-          value: sDate.format('YYYY-MM-DD'),
-        },
-      ];
-    }
-
-    const updatedFilters =
-      status === 'outstanding_return'
-        ? [
-            { field: 'isdeleted', op: '=', value: 0 },
-            { field: 'product_return_action_id', op: '=', value: 'RTS' },
-            ...dateFilters,
-          ]
-        : dateFilters;
-
-    setModifiedFilters(updatedFilters);
-  }, [startDate, endDate, status]);
-
   const {
     data: fetchedOrderData,
     loading: returnDataLoad,
     paginationData,
-    fetchData,
-  } = useAxios<ApiResponse>({
+    setShouldPerformAction,
+  } = useApiHook<ApiResponse>({
     endpoint: '/v1/return/product/pending/',
     method: 'GET',
-    filters: clientPortal ? modifiedFilters : filters,
+    filters: filters,
     pagination: pagination,
+    performAction: false,
   });
 
   useEffect(() => {
@@ -209,21 +148,9 @@ const ReturnOrderTable = () => {
     }
   }, [fetchedOrderData, returnDataLoad]);
 
-  useEffect(() => {
-    if (!clientPortal) {
-      fetchData();
-    }
-  }, []);
-  const [debouncedSearchText] = useSearchText();
-
-  useEffect(() => {
-    if (clientPortal && debouncedSearchText == '') {
-      fetchData();
-    }
-  }, [debouncedSearchText]);
-
   useEffect(() => {
     setLoading(returnDataLoad);
+    setShouldPerformAction(true);
     if (fetchedOrderData && fetchedOrderData?.data && locationData) {
       const updatedReturnData = fetchedOrderData.data.map(returnItem => {
         const matchingLocation = locationData.find(
@@ -250,7 +177,7 @@ const ReturnOrderTable = () => {
       const filteredData = returnData?.filter(
         (loc: any) => loc?.product_return_action === 'RTS'
       );
-      const selectedOrders = filteredData?.map((loc: any) => ({
+      const selectedOrders = filteredData.map((loc: any) => ({
         id: loc.id,
         return_locations: loc?.return_location_name,
         return_location: loc?.return_location,
@@ -373,24 +300,6 @@ const ReturnOrderTable = () => {
     setGrouped(mergedPayload);
   }, [newpayload]);
 
-  //Client Portal
-  const handleSelectOrderId = (id: string | number) => {
-    setSelectedOrderIds(prev =>
-      prev.includes(id) ? prev.filter(orderId => orderId !== id) : [...prev, id]
-    );
-  };
-
-  const handleClientSelectAll = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const isChecked = e.target.checked;
-    setSelectClientAll(isChecked);
-
-    if (isChecked) {
-      setSelectedOrderIds(returnData?.map((item: any) => item?.order_id) || []);
-    } else {
-      setSelectedOrderIds([]);
-    }
-  };
-
   return (
     <>
       <StyledTableWrapper className="fortables">
@@ -406,23 +315,14 @@ const ReturnOrderTable = () => {
                 <th className="emailInvoiceCheckbox">
                   <Checkbox checked={selectAll} onChange={handleSelectAll} />
                 </th>
-              ) : clientPortal ? (
-                <th className="emailInvoiceCheckbox">
-                  <Checkbox
-                    checked={selectClientAll}
-                    onChange={handleClientSelectAll}
-                  />
-                </th>
               ) : (
                 <th></th>
               )}
-              {!clientPortal && (
-                <th onClick={() => handleSort('location')}>
-                  <div className="sortIconClass">
-                    Product Location {renderSortIcon('location')}
-                  </div>
-                </th>
-              )}
+              <th onClick={() => handleSort('location')}>
+                <div className="sortIconClass">
+                  Product Location {renderSortIcon('location')}
+                </div>
+              </th>
               <th onClick={() => handleSort('return_location_name')}>
                 <div className="sortIconClass">
                   Return Location {renderSortIcon('return_location_name')}
@@ -476,44 +376,33 @@ const ReturnOrderTable = () => {
               sortedData?.map((item: any, index: any) => (
                 <tr key={item.id}>
                   <td>
-                    {clientPortal ? (
+                    {item?.product_return_action === 'RTS' ? (
                       <Checkbox
-                        checked={selectedOrderIds.includes(item?.order_id)}
-                        onChange={() => handleSelectOrderId(item?.order_id)}
+                        className="custom-check"
+                        checked={selectedReturnOrder.some(
+                          (selectedInvoice: any) =>
+                            selectedInvoice?.id === item?.id
+                        )}
+                        onChange={() =>
+                          handleSelectOrderReturn(
+                            item?.id,
+                            item?.return_location,
+                            item?.return_location_name,
+                            item?.product_return_action,
+                            item?.legacy_product_id
+                          )
+                        }
                       />
+                    ) : null}
+                  </td>
+
+                  <td>
+                    {item?.location !== null && item?.location !== undefined ? (
+                      item?.location
                     ) : (
-                      <>
-                        {item?.product_return_action === 'RTS' ? (
-                          <Checkbox
-                            className="custom-check"
-                            checked={selectedReturnOrder?.some(
-                              (selectedInvoice: any) =>
-                                selectedInvoice?.id === item?.id
-                            )}
-                            onChange={() =>
-                              handleSelectOrderReturn(
-                                item?.id,
-                                item?.return_location,
-                                item?.return_location_name,
-                                item?.product_return_action,
-                                item?.legacy_product_id
-                              )
-                            }
-                          />
-                        ) : null}
-                      </>
+                      <div className="awaiting">Awaiting</div>
                     )}
                   </td>
-                  {!clientPortal && (
-                    <td>
-                      {item?.location !== null &&
-                      item?.location !== undefined ? (
-                        item?.location
-                      ) : (
-                        <div className="awaiting">Awaiting</div>
-                      )}
-                    </td>
-                  )}
                   <td> {displayValueOrNA(item?.return_location_name)}</td>
                   <td>
                     <ul style={{ listStyleType: 'none', padding: 0 }}>

package/src/components/store.ts

@@ -125,6 +125,12 @@ function useSelectedClientPortOrders() {
   return useAtom(selectedCPOrderlList);
 }
 
+const selectedCPOrderAfterlList = atom<any[]>([]);
+
+function useSelectedClientAfterOrders() {
+  return useAtom(selectedCPOrderAfterlList);
+}
+
 //start date and end date
 const startCPDate = atom<dayjs.Dayjs | null>(dayjs());
 
@@ -156,6 +162,22 @@ export const useSearchAfterText = () => {
   return useAtom(searchAfter);
 };
 
+const rclientReturnDataAtom = atom<any[]>([]);
+export function useClientOutstandingReturnData() {
+  return useAtom(rclientReturnDataAtom);
+}
+
+const returnConfirmedOrderAtom = atom<any[]>([]);
+
+export function useReturnConfirmedOrderData() {
+  return useAtom(returnConfirmedOrderAtom);
+}
+const statsCPCount = atom<any>(null);
+
+export function useStatsCPCount() {
+  return useAtom(statsCPCount);
+}
+
 function useCustomerData() {
   return useAtom(customerData);
 }
@@ -283,4 +305,5 @@ export {
   useSelectedClientPortOrders,
   useStartDate,
   useEndDate,
+  useSelectedClientAfterOrders,
 };