@bjsdistribution/dms-client-return 0.0.59 → 0.0.61

package/package.json

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

package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx

@@ -168,7 +168,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()}`);
@@ -272,7 +273,7 @@ function SelectionFilter() {
   useEffect(() => {
     if (clearState) {
       dispatch({ type: 'CLEAR_CLIENT' });
-      window.location.href = '/order/return';
+      window.location.href = '/orders/view/return/';
     }
   }, [clearState]);
 
@@ -330,6 +331,12 @@ function SelectionFilter() {
               value={selectedClient}
               allowClear
               onClear={handleClear}
+              filterOption={(input: any, option: any) =>
+                (option?.label ?? '')
+                  .toLowerCase()
+                  .includes(input.toLowerCase())
+              }
+              showSearch
             />
           </FilterColumn>
 

package/src/components/order-daily-overview/return-after-table/table/OrderTable.tsx

@@ -12,7 +12,7 @@ import {
   CustomDrop,
 } from '../../return-order-table/return-orders-filters/returnstyles';
 import LoadIcon from '../../../../assets/icons/LoadIcon';
-import { usePrintOptionTOggle } from '../../store/store';
+import { useLoading, usePrintOptionTOggle } from '../../store/store';
 import { NavLink } from 'react-router-dom';
 import { displayValueOrNA, formatDate } from '../../shared/utlis';
 import PrintDropDown from '../../shared/elements/PrintDropDown';
@@ -28,7 +28,7 @@ import Loader from '../../header/loader/Loader';
 import CaretDownFilledIcon from '../../../../common/CaretDownFilledIcon';
 import SortIcon from '../../../../common/SortIcon';
 
-const OrderTable = ({ loadingskeleton }: any) => {
+const OrderTable = () => {
   // const [, setSelectedReturnOrder] = useSelectedOrders();
   // const [selectAll, setSelectAll] = useState(false);
   const dropdownRefParent = useRef<HTMLDivElement>(null);
@@ -40,6 +40,7 @@ const OrderTable = ({ loadingskeleton }: any) => {
   const [assignPayload, setAssignPayload] = useAssignPayload();
   const [, setAssign] = useState<boolean>(false);
   const [, setCallAPi] = useCallApiAgain();
+  const [loading] = useLoading();
 
   //sorting
   const [sortConfig, setSortConfig] = useState<{
@@ -254,7 +255,7 @@ const OrderTable = ({ loadingskeleton }: any) => {
             </tr>
           </thead>
           <tbody>
-            {loadingskeleton ? (
+            {loading ? (
               <tr>
                 <td colSpan={16}>
                   <Skeleton active />

package/src/components/order-daily-overview/store/store.ts

@@ -41,7 +41,7 @@ export const useStatsLoading = () => {
   return useAtom(loading);
 };
 
-//this
+//order return page
 const loadingState = atom<boolean>(false);
 export const useLoading = () => {
   return useAtom(loadingState);

package/src/components/order-daily-overview/table/ReturnTable.tsx

@@ -138,7 +138,8 @@ const ReturnTable: React.FC = () => {
       customerId: 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()}`);
@@ -167,7 +168,8 @@ const ReturnTable: React.FC = () => {
       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()}`);
@@ -176,7 +178,7 @@ const ReturnTable: React.FC = () => {
   return (
     <>
       {statsLoading && <Loader />}
-      <StyledTableWrapper id="tableScrolling">
+      <StyledTableWrapper>
         <StyledTable>
           <thead>
             <tr>

package/src/components/order-view/hooks/useUpdateOrder.ts

@@ -1,10 +1,12 @@
 import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { getCookie } from '../utils';
 import { notification } from 'antd';
+import { useUpdateApiCall } from '../store';
 
 function useUpdateOrder() {
   let controller: AbortController;
   const ssoToken = getCookie('id_token');
+  const [, setCallApi] = useUpdateApiCall(); //single detail
 
   const update = async (data: any) => {
     const endpoint = `${getBaseEndpoint()}/orders/update/`;
@@ -38,6 +40,7 @@ function useUpdateOrder() {
         message: 'Success',
         description: 'Order has been updated.',
       });
+      setCallApi(true);
       return json;
     } catch (err) {
       //   setLoading(false);

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

@@ -58,7 +58,6 @@ function OrderView() {
   const [, setDepotOptions] = useDepotOptions();
   const [, setCustomerInfo] = useCustomerInfo();
   const [, setLocationOptions] = useLocationOptions();
-
   const [orderResources, setOrderResources] = useOrderProductsResources();
   const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   const [GsitCUstomerId, setGsitCUstomerId] = useGsitCUstomerId();

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

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
 import { useDeleteProdsID, useProductDetails } from '../store';
+import { Empty, Skeleton } from 'antd';
 import {
   EmptyDataContainer,
   StyledTable,
   StyledTableWrapper,
-} from '../all-reminder/table-view/ReminderStyles';
-import { Empty, Skeleton } from 'antd';
+} from '../order-actions/actions/confirm-order/tables/ReminderStyles';
 
 const DeleteProduct = () => {
   const [productdata] = useProductDetails();

package/src/components/order-view/order-details/expanded-content/footer/index.tsx

@@ -9,7 +9,7 @@ import {
   errorAtom,
   useCustomerInfo,
   // useLogsCallAPi,
-  useApiCalling,
+  useUpdateApiCall,
   // UseNotesLoading,
 } from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
@@ -23,7 +23,7 @@ function OrderDetailsFooter() {
   const updateOrder = useUpdateOrder();
   const [errorState] = useAtom(errorAtom);
   // const [, setLogsCallAPi] = useLogsCallAPi();
-  const [, setCallApi] = useApiCalling(); //single detail
+  const [, setCallApi] = useUpdateApiCall(); //single detail
   // const [, setNoteLoadingStore] = UseNotesLoading();
 
   const errorFound = () => {
@@ -78,12 +78,10 @@ function OrderDetailsFooter() {
   };
 
   const onSave = async () => {
-    setCallApi(true);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
     const response = await updateOrder([payload]);
-
+    setCallApi(false);
     // setLogsCallAPi(prev => !prev);
-
     if (response && response?.data?.length > 0) {
       setOrderDetails(response?.data[0]);
       setPrevOrderDetails(response?.data[0]);

package/src/components/order-view/products-info/expanded-content/index.tsx

@@ -81,7 +81,8 @@ function ExpandedContent() {
 
     //@ts-ignore
     if (response?.code === 200 && newId) {
-      navigate(`details/${newId}`);
+      // suggested by rahul
+      navigate(`${newId}`);
       setSelectedProducts([]);
     }
   }, [response, newId, navigate, setSelectedProducts]);

package/src/components/order-view/store.ts

@@ -433,10 +433,10 @@ const returnDataAtom = atom<any[]>([]);
 export function useReturnData() {
   return useAtom(returnDataAtom);
 }
-const apiCalling = atom<boolean>(false);
+const apiUpdateCalling = atom<boolean>(false);
 
-export function useApiCalling() {
-  return useAtom(apiCalling);
+export function useUpdateApiCall() {
+  return useAtom(apiUpdateCalling);
 }
 
 
@@ -446,6 +446,14 @@ const liveRecalling = atom<boolean>(false);
 export function useLiveRecalling() {
   return useAtom(liveRecalling);
 }
+
+//delete products
+const onDeleteProduct = atom<boolean>(false);
+
+export function useDeleteRecall() {
+  return useAtom(onDeleteProduct);
+}
+
 export const selectedTabKeyAtom = atom<string>('1');
 export const letselectedProductIdAtom = atom<number | null>(null);
 
@@ -482,12 +490,10 @@ const popupReducer = (state: any, action: any) => {
   } else if (action.type === 'addProduct') {
     state = 'addProduct';
     return { state };
-  }
-  else if (action.type === 'split-order') {
+  } else if (action.type === 'split-order') {
     state = 'split-order';
     return { state };
-  }  
-  else if (action.type === 'deleteProduct') {
+  } else if (action.type === 'deleteProduct') {
     state = 'deleteProduct';
     return { state };
   } else if (action.type === 'defectsModal') {

package/src/index.tsx

@@ -5,6 +5,7 @@ import ReturnAfterTable from './components/order-daily-overview/return-after-tab
 import {
   useSelectedAction,
   useSelectedClient,
+  useSelectedLocation,
 } from './components/order-daily-overview/store/store';
 import { notification } from 'antd';
 import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
@@ -36,6 +37,7 @@ function ReturnClient() {
   const [, setSelectedFilterValue] = useSelectedAction();
   const [, setSelectedClient] = useSelectedClient();
   const [searchParams] = useSearchParams();
+  const [, setSelectedLocationValue] = useSelectedLocation();
   const splitPath = (str: any) => {
     const parts = str?.split('/')?.filter((part: any) => part !== ''); // Filter out empty parts
     return parts;
@@ -47,6 +49,7 @@ function ReturnClient() {
       setLocationOptions([]);
       setSelectedClient(null);
       setSelectedFilterValue(null);
+      setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
   // useEffect(() => {
@@ -114,7 +117,7 @@ function ReturnClient() {
           <Route path="" element={<OrderViewQueryHandler />} />
           <Route path="overview" element={<ReturnAfterTable />} />
           <Route path="/:id" element={<OrderView />} />
-          
+
           <Route path="filter" element={<ReturnTable />} />
           {/* <Route
           path=""
@@ -131,4 +134,4 @@ function ReturnClient() {
     </>
   );
 }
-export default ReturnClient;
+export default ReturnClient;