@bjsdistribution/dms-client-return 0.0.14 → 0.0.16

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.14",
+  "version": "0.0.16",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -59,7 +59,7 @@
     "testEnvironment": "jest-environment-jsdom-sixteen"
   },
   "devDependencies": {
-    "@bjsdistribution/dms-component-library": "^0.1.3",
+    "@bjsdistribution/dms-component-library": "0.1.3",
     "@size-limit/preset-small-lib": "^11.0.1",
     "@tippyjs/react": "^4.2.6",
     "@types/react": "^18.2.47",

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

@@ -73,7 +73,7 @@ function OrderView() {
   const paths = splitPath(location.pathname);
   const [, setLocationOptions] = useLocationOptions();
   const [apiCalling] = useApiCalling();
-
+  console.log(paths, 'paths');
   const [orderResources, setOrderResources] = useOrderProductsResources();
   const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   const [GsitCUstomerId, setGsitCUstomerId] = useGsitCUstomerId();
@@ -138,7 +138,7 @@ function OrderView() {
 
   useEffect(() => {
     if (paths.length > 1) {
-      setOrderId(paths[1]);
+      setOrderId(paths[2]);
     }
     // for local
     // if (paths.length >= 0) {

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

@@ -16,7 +16,7 @@ const CreateReturnModal = () => {
   const [selectedReturnOrder] = useSelectedOrders();
   const [load] = usePostLoading();
   const [groupedPayload] = useGroupedPayload();
-  const [forDisabledCheck] = useSelectedConfirmLoc();
+  // const [forDisabledCheck] = useSelectedConfirmLoc();
   const [, setNew] = useFinalPayload();
 
   const handleSelectLocations = (id: number) => {
@@ -42,9 +42,9 @@ const CreateReturnModal = () => {
   }, []);
 
   useEffect(() => {
-    if (groupedPayload?.length > 0 && forDisabledCheck?.length > 0) {
+    if (groupedPayload?.length > 0 && selectedlocation?.length > 0) {
       const matchedItems = groupedPayload?.filter((item: any) =>
-        forDisabledCheck.includes(item.id)
+        selectedlocation.includes(item.id)
       );
 
       if (matchedItems.length > 0) {
@@ -52,7 +52,7 @@ const CreateReturnModal = () => {
         setNew(finalPayload);
       }
     }
-  }, [forDisabledCheck]);
+  }, [selectedlocation]);
 
   return (
     <>

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

@@ -49,6 +49,7 @@ const ModalManager = () => {
   const [, setNewPayload] = useNewReturnPayload();
   const [, setGrouped] = useGroupedPayload();
   const [, setSelectAll] = useSelectAll();
+  const [forCheck, setStateCheck] = useState(false);
 
   console.log(orderProduct, 'abcabcabcabcabcabcabcabcabcabcabc');
 
@@ -259,24 +260,11 @@ const ModalManager = () => {
     SetPostLoading(confirmLoading);
   }, [confirmLoading]);
 
-  console.log(response);
-
-  useEffect(() => {
-    if (response === null || (response && response?.data)) {
-      dispatch({ type: 'close' });
-      setNewGrouped([]);
-      setSelectedReturnOrder([]);
-      setCheck([]);
-      setNewPayload([]);
-      setGrouped([]);
-      setShouldPerformAction(false);
-      setSelectAll(false);
-    }
-  }, [response]);
+  console.log(response, 'response');
 
   const handleConfirmReturn = () => {
     setShouldPerformAction(false);
-
+    setStateCheck(!forCheck);
     if (newGrouped.length > 0) {
       setShouldPerformAction(true);
     } else {
@@ -285,6 +273,17 @@ const ModalManager = () => {
     dispatch({ type: 'close' });
   };
 
+  useEffect(() => {
+    dispatch({ type: 'close' });
+    setNewGrouped([]);
+    setSelectedReturnOrder([]);
+    setCheck([]);
+    setNewPayload([]);
+    setGrouped([]);
+    setShouldPerformAction(false);
+    setSelectAll(false);
+  }, [response, forCheck]);
+
   return (
     <>
       {popupName?.state == 'create-return' && (