@bjsdistribution/dms-client-return 0.0.24 → 0.0.25

package/package.json

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

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

@@ -7,6 +7,7 @@ import {
   useGroupedPayload,
   useLocationData,
   useNewReturnPayload,
+  usePostLoading,
   useReturnPayload,
   useSelectAll,
   useSelectedOrders,
@@ -26,6 +27,7 @@ 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 Loader from '../../header/loader/Loader';
 const ReturnOrderTable = () => {
   const [state] = useAtom(filtersReducerAtom);
 
@@ -34,6 +36,7 @@ const ReturnOrderTable = () => {
   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();
@@ -256,6 +259,7 @@ const ReturnOrderTable = () => {
 
   return (
     <>
+      {postLoading && <Loader />}
       <StyledTableWrapper className="fortables">
         <StyledTable>
           <thead>

package/src/components/order-view/modalsPopup/CreateReturnModal.tsx

@@ -4,17 +4,14 @@ import styled from 'styled-components';
 import {
   useFinalPayload,
   useGroupedPayload,
-  usePostLoading,
   useSelectedConfirmLoc,
   useSelectedOrders,
 } from '../../store';
 import { displayValueOrNA } from '../../order-daily-overview/shared/utlis';
-import Loader from '../../order-daily-overview/header/loader/Loader';
 
 const CreateReturnModal = () => {
   const [selectedlocation, setSelectedLocations] = useSelectedConfirmLoc();
   const [selectedReturnOrder] = useSelectedOrders();
-  const [load] = usePostLoading();
   const [groupedPayload] = useGroupedPayload();
   const [, setNew] = useFinalPayload();
 
@@ -55,7 +52,6 @@ const CreateReturnModal = () => {
 
   return (
     <>
-      {load && <Loader />}
       <Wrapper>
         <Alert
           onClose={() => {}}

package/src/components/order-view/modalsPopup/ModalManager.tsx

@@ -47,7 +47,7 @@ const ModalManager = () => {
   const [selectedTab] = useAtom(selectedTabKeyAtom);
   const [, setIsFormValid] = useState(false);
   const [newGrouped] = useFinalPayload();
-  const [, SetPostLoading] = usePostLoading();
+  const [postLoading, SetPostLoading] = usePostLoading();
   const [, setSelectedReturnOrder] = useSelectedOrders();
   const [forDisabledCheck, setCheck] = useSelectedConfirmLoc();
   const [, setNewPayload] = useNewReturnPayload();
@@ -155,6 +155,7 @@ const ModalManager = () => {
     if (newGrouped?.length > 0) {
       setShouldPerformAction(true);
       setCallForFetch(true);
+      SetPostLoading(confirmLoading);
     }
     dispatch({ type: 'close' });
   };
@@ -218,40 +219,39 @@ const ModalManager = () => {
       setShouldPerformAction(false);
       setSelectAll(false);
       setError(null);
-      navigate('/order-return');
+      navigate('returnclient/order-return');
     }
-  }, [response, apiError]);
-
-  console.log(apiError, 'apiError apiError');
-  console.log(response, 'response response ');
+  }, [response, apiError, postLoading]);
 
   return (
     <>
-      {popupName?.state == 'create-return' && (
-        <AntModal
-          openStatus={popupName?.state == 'create-return' ? true : false}
-          closeModal={() => closeModal()}
-          PopupHeader={{
-            heading: 'CONFIRM RETURN',
-            subHeading: '',
-          }}
-          PopupFooter={{
-            btns: [
-              {
-                name: 'Submit',
-                btnStyle: 'rounded',
-                onClick: handleConfirmReturn,
-                type: 'button',
-                disabled: forDisabledCheck.length === 0,
-              },
-            ],
+      {popupName?.state === 'create-return' && (
+        <>
+          <AntModal
+            openStatus={popupName?.state == 'create-return' ? true : false}
+            closeModal={() => closeModal()}
+            PopupHeader={{
+              heading: 'CONFIRM RETURN',
+              subHeading: '',
+            }}
+            PopupFooter={{
+              btns: [
+                {
+                  name: 'Submit',
+                  btnStyle: 'rounded',
+                  onClick: handleConfirmReturn,
+                  type: 'button',
+                  disabled: forDisabledCheck.length === 0,
+                },
+              ],
 
-            btnAlign: 'justifyEnd',
-          }}
-          BodyComponent={CreateReturnModal}
-          width={800}
-          classNameAdd={'globalPopup'}
-        />
+              btnAlign: 'justifyEnd',
+            }}
+            BodyComponent={CreateReturnModal}
+            width={800}
+            classNameAdd={'globalPopup'}
+          />
+        </>
       )}
       {popupName?.state === 'qclog' && (
         <AntModal