@bjsdistribution/dms-client-return 0.0.59 → 0.0.61

package/dist/components/order-daily-overview/return-after-table/table/OrderTable.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const OrderTable: ({ loadingskeleton }: any) => React.JSX.Element;
+declare const OrderTable: () => React.JSX.Element;
 export default OrderTable;

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

@@ -109,8 +109,9 @@ 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 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;
 };

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);
@@ -855,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
@@ -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 () {
@@ -1223,7 +1224,12 @@ function SelectionFilter() {
     },
     value: selectedClient,
     allowClear: true,
-    onClear: handleClear
+    onClear: handleClear,
+    filterOption: function filterOption(input, option) {
+      var _option$label;
+      return ((_option$label = option == null ? void 0 : option.label) != null ? _option$label : '').toLowerCase().includes(input.toLowerCase());
+    },
+    showSearch: true
   })), React__default.createElement(FilterColumn, null, React__default.createElement(Label, null, "Action Type"), React__default.createElement(StyledAntSelect, {
     options: actionTypeOptions,
     placeholder: "Select Action Type",
@@ -2700,8 +2706,7 @@ var OptionsListLi$1 = /*#__PURE__*/styled__default.li(_templateObject2$8 || (_te
 });
 
 var _templateObject$b;
-var OrderTable = function OrderTable(_ref) {
-  var loadingskeleton = _ref.loadingskeleton;
+var OrderTable = function OrderTable() {
   // const [, setSelectedReturnOrder] = useSelectedOrders();
   // const [selectAll, setSelectAll] = useState(false);
   var dropdownRefParent = React.useRef(null);
@@ -2722,6 +2727,8 @@ var OrderTable = function OrderTable(_ref) {
     setAssign = _useState[1];
   var _useCallApiAgain = useCallApiAgain(),
     setCallAPi = _useCallApiAgain[1];
+  var _useLoading = useLoading(),
+    loading = _useLoading[0];
   //sorting
   var _useState2 = React.useState(null),
     sortConfig = _useState2[0],
@@ -2929,7 +2936,7 @@ var OrderTable = function OrderTable(_ref) {
     className: "sortIconClass"
   }, "Total CBM ", renderSortIcon('cube'))), React__default.createElement("th", null, "Assign"), React__default.createElement("th", null, "Status"), React__default.createElement("th", {
     className: "emailInvoiceShare"
-  }, "Labels"))), React__default.createElement("tbody", null, loadingskeleton ? React__default.createElement("tr", null, React__default.createElement("td", {
+  }, "Labels"))), React__default.createElement("tbody", null, loading ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 16
   }, React__default.createElement(antd.Skeleton, {
     active: true
@@ -5205,6 +5212,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 +5256,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 +5267,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 +5297,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 +5329,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]);
@@ -6599,7 +6609,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]);
@@ -11586,7 +11597,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()}`);
   };
@@ -11612,13 +11624,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'
   }, {
@@ -11858,6 +11869,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) {
@@ -11872,6 +11885,7 @@ function ReturnClient() {
       setLocationOptions([]);
       setSelectedClient(null);
       setSelectedFilterValue(null);
+      setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
   // useEffect(() => {