@bjsdistribution/dms-client-return 0.0.58 → 0.0.60

package/dist/components/order-view/store.d.ts

@@ -86,7 +86,6 @@ declare function useSelectedProductId(): [number | undefined, (args_0: number |
 export declare function useReturnAfterOrderData(): [any[], (args_0: any[] | ((prev: any[]) => any[])) => void];
 declare function useClientData(): [ClientData[], (args_0: ClientData[] | ((prev: ClientData[]) => ClientData[])) => void];
 export { useAtom, useOrderDetails, useCustomerDetails, useProductDetails, useDepotDetails, useStatusDetails, useDepotOptions, usePrevOrderDetails, useEscData, useDeleteProdsID, useCreateOrderProducts, useRecieveOrderProducts, useUpdateOrderProducts, useOrderProductsResources, useOrderProductsToolbox, useOrderProductSystemLogs, useEventNotesData, useSelectedProductId, useSelectedProductActionTabKey, useClientData, };
-export declare const UseNotesLoading: () => [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
 export declare function usegetNotes(): [any, (args_0: any) => void];
 export declare function usemoduleIds(): [{
     id?: string | undefined;
@@ -110,16 +109,17 @@ export declare function useRouteId(): [number | undefined, (args_0: number | ((p
 export declare function useGsitOrderId(): [number | undefined, (args_0: number | ((prev: number | undefined) => number | undefined) | undefined) => void];
 export declare function useOrderProductId(): [number | undefined, (args_0: number | ((prev: number | undefined) => number | undefined) | undefined) => void];
 export declare function useReturnData(): [any[], (args_0: any[] | ((prev: any[]) => any[])) => void];
-export declare function useApiCalling(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
-export declare function useGlobalStateHitAuditLog(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
+export declare function useUpdateApiCall(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
 export declare function useLiveRecalling(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
+export declare function useDeleteRecall(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
 export declare const selectedTabKeyAtom: import("jotai/esm/").PrimitiveAtom<string> & {
     init: string;
 };
 export declare const letselectedProductIdAtom: import("jotai/esm/").PrimitiveAtom<number | null> & {
     init: number | null;
 };
-export declare const SeteauditLogToggle: () => [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
+export declare function useAuditLogLoadingState(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
+export declare function useGlobalStateHitAuditLog(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
 export declare const countReducerAtom: import("jotai/esm/").WritableAtom<{
     state: any;
 } | null, [any?], void>;

package/dist/dms-client-return.cjs.development.js

@@ -593,7 +593,7 @@ var loading = /*#__PURE__*/jotai.atom(false);
 var useStatsLoading = function useStatsLoading() {
   return jotai.useAtom(loading);
 };
-//this
+//order return page
 var loadingState = /*#__PURE__*/jotai.atom(false);
 var useLoading = function useLoading() {
   return jotai.useAtom(loadingState);
@@ -823,10 +823,6 @@ var clientDataAtom = /*#__PURE__*/jotai.atom([]);
 function useClientData() {
   return jotai.useAtom(clientDataAtom);
 }
-var NotesLoading = /*#__PURE__*/jotai.atom(true);
-var UseNotesLoading = function UseNotesLoading() {
-  return jotai.useAtom(NotesLoading);
-};
 var notes = /*#__PURE__*/jotai.atom([]);
 function usegetNotes() {
   return jotai.useAtom(notes);
@@ -859,9 +855,9 @@ var returnDataAtom = /*#__PURE__*/jotai.atom([]);
 function useReturnData() {
   return jotai.useAtom(returnDataAtom);
 }
-var apiCalling = /*#__PURE__*/jotai.atom(false);
-function useApiCalling() {
-  return jotai.useAtom(apiCalling);
+var apiUpdateCalling = /*#__PURE__*/jotai.atom(false);
+function useUpdateApiCall() {
+  return jotai.useAtom(apiUpdateCalling);
 }
 var liveRecalling = /*#__PURE__*/jotai.atom(false);
 //re api call of live status
@@ -872,10 +868,14 @@ function useLiveRecalling() {
 // export const useBulkUPdateDisabledState = () => {
 //   return useAtom(BulkUPdateDisabledState);
 // };
-var auditLogToggle = /*#__PURE__*/jotai.atom(true);
-var SeteauditLogToggle = function SeteauditLogToggle() {
-  return jotai.useAtom(auditLogToggle);
-};
+var auditLogLoadingState = /*#__PURE__*/jotai.atom(true);
+function useAuditLogLoadingState() {
+  return jotai.useAtom(auditLogLoadingState);
+}
+var globalStateHitAuditLog = /*#__PURE__*/jotai.atom(false);
+function useGlobalStateHitAuditLog() {
+  return jotai.useAtom(globalStateHitAuditLog);
+}
 // Popup state Manage
 var initialState$1 = null;
 var popupReducer = function popupReducer(state, action) {
@@ -1080,7 +1080,8 @@ function SelectionFilter() {
       if (!currentSearch.includes('filter')) {
         console.log('inside include');
         // for dev
-        navigate("filter?" + queryParams.toString());
+        //navigate(`filter?${queryParams.toString()}`);
+        navigate("/orders/view/return/filter?" + queryParams.toString());
         // for local
         //navigate(`/filter?${queryParams.toString()}`);
       }
@@ -1173,7 +1174,7 @@ function SelectionFilter() {
       dispatch({
         type: 'CLEAR_CLIENT'
       });
-      window.location.href = '/order/return';
+      window.location.href = '/orders/view/return/';
     }
   }, [clearState]);
   React.useEffect(function () {
@@ -5205,6 +5206,8 @@ var Container$y = /*#__PURE__*/styled__default.div(_templateObject3$h || (_templ
 function useUpdateOrder() {
   var controller;
   var ssoToken = getCookie('id_token');
+  var _useUpdateApiCall = useUpdateApiCall(),
+    setCallApi = _useUpdateApiCall[1]; //single detail
   var update = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, signal, requestOptions, response, json;
@@ -5247,9 +5250,10 @@ function useUpdateOrder() {
               message: 'Success',
               description: 'Order has been updated.'
             });
+            setCallApi(true);
             return _context.abrupt("return", json);
-          case 18:
-            _context.prev = 18;
+          case 19:
+            _context.prev = 19;
             _context.t0 = _context["catch"](4);
             //   setLoading(false);
             // console.log(err, 'error');
@@ -5257,14 +5261,14 @@ function useUpdateOrder() {
               message: 'Error',
               description: "" + _context.t0 || 'An error has occurred. Please try again later.'
             });
-          case 21:
-            _context.prev = 21;
-            return _context.finish(21);
-          case 23:
+          case 22:
+            _context.prev = 22;
+            return _context.finish(22);
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 18, 21, 23]]);
+      }, _callee, null, [[4, 19, 22, 24]]);
     }));
     return function update(_x) {
       return _ref.apply(this, arguments);
@@ -5287,8 +5291,8 @@ function OrderDetailsFooter() {
   var _useAtom = jotai.useAtom(errorAtom),
     errorState = _useAtom[0];
   // const [, setLogsCallAPi] = useLogsCallAPi();
-  var _useApiCalling = useApiCalling(),
-    setCallApi = _useApiCalling[1]; //single detail
+  var _useUpdateApiCall = useUpdateApiCall(),
+    setCallApi = _useUpdateApiCall[1]; //single detail
   // const [, setNoteLoadingStore] = UseNotesLoading();
   var errorFound = function errorFound() {
     var isError = errorState.w3wError.length > 0 || errorState.emailError.length > 0 || errorState.homeContactError.length > 0 || errorState.workCOntanctError.length > 0 || errorState.mobileError.length > 0 || errorState.postCodeError.length > 0;
@@ -5319,12 +5323,12 @@ function OrderDetailsFooter() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setCallApi(true);
             payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
-            _context.next = 4;
+            _context.next = 3;
             return updateOrder([payload]);
-          case 4:
+          case 3:
             response = _context.sent;
+            setCallApi(false);
             // setLogsCallAPi(prev => !prev);
             if (response && (response == null || (_response$data = response.data) == null ? void 0 : _response$data.length) > 0) {
               setOrderDetails(response == null ? void 0 : response.data[0]);
@@ -5424,25 +5428,25 @@ function AddNote() {
   var ssoToken = getCookie('id_token');
   var _usemoduleIds = usemoduleIds(),
     moduleIds = _usemoduleIds[0];
-  var _UseNotesLoading = UseNotesLoading(),
-    NoteLoadingStore = _UseNotesLoading[0],
-    setNoteLoadingStore = _UseNotesLoading[1];
+  var _useGlobalStateHitAud = useGlobalStateHitAuditLog(),
+    setRecallAuditLog = _useGlobalStateHitAud[1];
   // Save New Note
   var _useState2 = React.useState(null),
     notificationData = _useState2[0],
     setNotificationData = _useState2[1];
   var saveNote = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var endpoint, payload, response, message, error;
+      var endpoint, payload, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            setRecallAuditLog(false);
             if (noteText) {
-              _context.next = 2;
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return");
-          case 2:
+          case 3:
             endpoint = dmsComponentLibrary.getBaseEndpoint() + "/audit_logs/orders/";
             payload = {
               audit_logs: [{
@@ -5456,8 +5460,8 @@ function AddNote() {
                 manual: 1
               }]
             };
-            _context.prev = 4;
-            _context.next = 7;
+            _context.prev = 5;
+            _context.next = 8;
             return fetch(endpoint, {
               method: 'POST',
               headers: {
@@ -5466,42 +5470,36 @@ function AddNote() {
               },
               body: JSON.stringify(payload)
             });
-          case 7:
+          case 8:
             response = _context.sent;
             // setNoteLoadingStore(false);
-            message = response.message, error = response.error;
-            if (response) {
-              setNotificationData({
-                type: 'success',
+            if (response.ok) {
+              antd.notification.success({
                 message: 'Success',
-                description: message || 'Successfully Created Note.'
+                description: 'Note saved successfully.'
               });
-              setNoteLoadingStore(!NoteLoadingStore);
               setNoteText('');
-            } else if (error) {
-              // Error: Set error notification
-              setNotificationData({
-                type: 'error',
+              setRecallAuditLog(true);
+            } else {
+              antd.notification.error({
                 message: 'Error',
-                description: error || 'Something went wrong. Please try again.'
+                description: 'Failed to save note.'
               });
             }
             _context.next = 15;
             break;
           case 12:
             _context.prev = 12;
-            _context.t0 = _context["catch"](4);
-            // console.error('Error saving note:', error);
-            // alert('Failed to save note');
+            _context.t0 = _context["catch"](5);
             antd.notification.error({
               message: 'Error',
-              description: "" + _context.t0 || 'An error has occurred. Please try again later.'
+              description: 'Failed to save note due to an error.'
             });
           case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 12]]);
+      }, _callee, null, [[5, 12]]);
     }));
     return function saveNote() {
       return _ref.apply(this, arguments);
@@ -5608,22 +5606,23 @@ function AuditLogs() {
 var Container$C = /*#__PURE__*/styled__default.div(_templateObject$Z || (_templateObject$Z = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  height: 295px; /* Set height to limit container size */\n  overflow: auto; /* Enable scrolling */\n  scrollbar-width: thin;\n"])));
 
 var _templateObject$_, _templateObject2$L, _templateObject3$m;
+// import { useLocation } from 'react-router-dom';
 function Notes() {
   var _usemoduleIds = usemoduleIds(),
     moduleIds = _usemoduleIds[0],
     setModuleIds = _usemoduleIds[1];
   var _useOrderId = useOrderId(),
     orderId = _useOrderId[0];
-  var location = reactRouterDom.useLocation();
-  var pathname = location.pathname;
-  var orderIdLocaation = pathname.split('/')[1];
-  var _UseNotesLoading = UseNotesLoading(),
-    apiBaseLoading = _UseNotesLoading[0];
+  // const location = useLocation();
+  // const pathname = location.pathname;
+  // const orderIdLocaation = pathname.split('/')[1];
+  var _useGlobalStateHitAud = useGlobalStateHitAuditLog(),
+    recallAuditLog = _useGlobalStateHitAud[0];
+  var _useAuditLogLoadingSt = useAuditLogLoadingState(),
+    setAuditLogLoading = _useAuditLogLoadingSt[1];
   var _usegetNotes = usegetNotes(),
     setNotes = _usegetNotes[1];
   // const [loderStatus] = useCallAPi();
-  var _SeteauditLogToggle = SeteauditLogToggle(),
-    auditState = _SeteauditLogToggle[0];
   // Fetch module IDs
   var _useApiHook = dmsComponentLibrary.useApiHook({
       endpoint: 'audit_logs/modules/',
@@ -5654,7 +5653,7 @@ function Notes() {
     }
   }, [apiLoading, fetchedData]);
   var _useApiHook2 = dmsComponentLibrary.useApiHook({
-      endpoint: "audit_logs/?module_id=" + (moduleIds == null ? void 0 : moduleIds.parentId) + "&module_object_id=" + (orderId || orderIdLocaation),
+      endpoint: "audit_logs/?module_id=" + (moduleIds == null ? void 0 : moduleIds.parentId) + "&module_object_id=" + orderId,
       method: 'GET',
       performAction: false
     }),
@@ -5662,7 +5661,6 @@ function Notes() {
     NotesLoading = _useApiHook2.loading,
     setShouldPerformAction = _useApiHook2.setShouldPerformAction;
   React.useEffect(function () {
-    var combinedArray = [];
     if (moduleIds && orderId) {
       setShouldPerformAction(true);
     }
@@ -5672,16 +5670,18 @@ function Notes() {
       }).map(function (item) {
         return [item['ORDER-NOTE'], item['ORDER']];
       }).flat().filter(Boolean);
-      combinedArray = updatedData.flat();
+      // const orderData = NotesData?.data[0]?.ORDER || [];
+      // const orderNotesData = NotesData?.data[1]?.['ORDER-NOTE'] || [];
+      // const allNotes = [...orderData, ...orderNotesData];
+      var combinedArray = updatedData.flat();
       combinedArray.sort(function (a, b) {
         return new Date(b.created_at).getTime() - new Date(a.created_at).getTime();
       });
+      setNotes(combinedArray);
+      recallAuditLog ? setShouldPerformAction(true) : setShouldPerformAction(false);
     }
-    setNotes({
-      data: combinedArray,
-      loading: NotesLoading
-    });
-  }, [moduleIds, NotesLoading, auditState, apiBaseLoading]);
+    setAuditLogLoading(NotesLoading);
+  }, [moduleIds, orderId, NotesLoading, recallAuditLog]);
   return React__default.createElement(Container$D, null, React__default.createElement(CardHeader, null, "NOTES"), React__default.createElement(CustomizedFormSection, null, React__default.createElement(AddNote, null), React__default.createElement(AuditLogs, null)));
 }
 var Container$D = /*#__PURE__*/styled__default.div(_templateObject$_ || (_templateObject$_ = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border-radius: 5px;\n"])));
@@ -6603,7 +6603,8 @@ function ExpandedContent$2() {
     }
     //@ts-ignore
     if ((response == null ? void 0 : response.code) === 200 && newId) {
-      navigate("details/" + newId);
+      // suggested by rahul
+      navigate("" + newId);
       setSelectedProducts([]);
     }
   }, [response, newId, navigate, setSelectedProducts]);
@@ -11590,7 +11591,8 @@ var ReturnTable$1 = function ReturnTable() {
       customerId: customerId == null ? void 0 : customerId.toString()
     });
     //for dev
-    navigate("filter?" + queryParams.toString());
+    //navigate(`filter?${queryParams.toString()}`);
+    navigate("/orders/view/return/filter?" + queryParams.toString());
     //for local
     //navigate(`/filter?${queryParams.toString()}`);
   };
@@ -11616,13 +11618,12 @@ var ReturnTable$1 = function ReturnTable() {
       type: RTS
     });
     //for dev
-    navigate("filter?" + queryParams.toString());
+    //navigate(`filter?${queryParams.toString()}`);
+    navigate("/orders/view/return/filter?" + queryParams.toString());
     //for local
     //navigate(`/filter?${queryParams.toString()}`);
   };
-  return React__default.createElement(React__default.Fragment, null, statsLoading && React__default.createElement(Loader, null), React__default.createElement(StyledTableWrapper, {
-    id: "tableScrolling"
-  }, React__default.createElement(StyledTable, null, React__default.createElement("thead", null, React__default.createElement("tr", null, [{
+  return React__default.createElement(React__default.Fragment, null, statsLoading && React__default.createElement(Loader, null), React__default.createElement(StyledTableWrapper, null, React__default.createElement(StyledTable, null, React__default.createElement("thead", null, React__default.createElement("tr", null, [{
     label: 'Trading Name',
     key: 'trading_as'
   }, {
@@ -11862,6 +11863,8 @@ function ReturnClient() {
     setSelectedClient = _useSelectedClient[1];
   var _useSearchParams = reactRouterDom.useSearchParams(),
     searchParams = _useSearchParams[0];
+  var _useSelectedLocation = useSelectedLocation(),
+    setSelectedLocationValue = _useSelectedLocation[1];
   var splitPath = function splitPath(str) {
     var _str$split;
     var parts = str == null || (_str$split = str.split('/')) == null ? void 0 : _str$split.filter(function (part) {
@@ -11876,6 +11879,7 @@ function ReturnClient() {
       setLocationOptions([]);
       setSelectedClient(null);
       setSelectedFilterValue(null);
+      setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
   // useEffect(() => {