@bjsdistribution/dms-client-return 0.0.26 → 0.0.28

package/package.json

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

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

@@ -11,6 +11,7 @@ import {
 import { atom, useAtom } from 'jotai';
 import {
   useActionType,
+  useClearState,
   useCustomerData,
   useGroupedPayload,
   useLocationData,
@@ -57,6 +58,7 @@ function SelectionFilter() {
   const [, setSelectedReturnOrder] = useSelectedOrders();
   const [, setSelectAll] = useSelectAll();
   const [, setCheck] = useSelectedConfirmLoc();
+  const [clearState, setClear] = useClearState();
 
   //client options
   const clientOptions = customers?.map((option: any) => ({
@@ -81,9 +83,8 @@ function SelectionFilter() {
   }));
 
   //client change
-  const handleSelectChange = (value: unknown, option: DefaultOptionType) => {
+  const handleSelectChange = (_value: unknown, option: DefaultOptionType) => {
     setNewPayload([]);
-    console.log(value, 'value');
     const selectedLabel = option?.label as string;
     const selectedValue = option?.id as number;
     const selectedUuids = option?.uuid as string;
@@ -91,6 +92,8 @@ function SelectionFilter() {
     const selectedCustomerId = option.gsit_customer_id as number;
     setSelectedClient(selectedValue);
     setName(selectedLabel);
+    // storedName(selectedLabel);
+    //set items in local storage
     localStorage.setItem('clientName', selectedLabel);
     localStorage.setItem('clientId', selectedValue.toString());
     localStorage.setItem('account_number', selectAccountNumber);
@@ -100,11 +103,15 @@ function SelectionFilter() {
     const storedCustomerId = localStorage.getItem('customer_id');
     const storedUuid = localStorage.getItem('uuid');
     setUuid(storedUuid);
+
+    //set payload
     setReturnPayload((prevState: any) => ({
       ...prevState,
       account_number: storedAccNo,
       customer_id: storedCustomerId,
     }));
+
+    //filtering locations
     const filteredSubLocations = locationData
       ?.filter((subCat: any) => subCat?.customer_id === storedUuid)
       .map((subCat: any) => ({
@@ -113,6 +120,8 @@ function SelectionFilter() {
       }));
 
     setFilteredLocationOptions(filteredSubLocations);
+
+    //clearing states
     setUuid('');
     setSelectedReturnOrder([]);
     setNewPayload([]);
@@ -163,8 +172,6 @@ function SelectionFilter() {
   const handleActionClick = (value: any) => {
     setSelectedFilterValue(value);
   };
-  const storedName = localStorage.getItem('clientName');
-  const storedClientId = localStorage.getItem('clientId');
 
   //Apply filters
   const applyFilters = () => {
@@ -211,6 +218,9 @@ function SelectionFilter() {
     }
   };
 
+  const storedName = localStorage.getItem('clientName');
+  const storedClientId = localStorage.getItem('clientId');
+
   useEffect(() => {
     if (storedClientId) {
       dispatch({
@@ -243,7 +253,19 @@ function SelectionFilter() {
     }
   }, [selectedFilterValue, selectedLocationValue]);
 
-  console.log(storedName, 'storedName');
+  const handleClear = () => {
+    setClear(false);
+    localStorage.removeItem('clientName');
+    localStorage.removeItem('clientId');
+    setClear(true);
+  };
+
+  useEffect(() => {
+    if (clearState) {
+      dispatch({ type: 'CLEAR_CLIENT' });
+      window.location.href = '/returnclient';
+    }
+  }, [clearState]);
 
   return (
     <Wrapper>
@@ -257,6 +279,8 @@ function SelectionFilter() {
               onChange={handleSelectChange}
               style={{ minWidth: '14vw' }}
               value={storedName}
+              allowClear
+              onClear={handleClear}
             />
           </FilterColumn>
 

package/src/components/order-daily-overview/header-filters/filterStore.ts

@@ -98,13 +98,13 @@ const filterReducer = (state: FilterState, action: any): FilterState => {
         ],
       };
 
-    // case 'CLEAR_CLIENT':
-    //   return {
-    //     ...state,
-    //     'x-filters': state['x-filters'].filter(
-    //       f => f.field !== 'order.customer_id'
-    //     ),
-    //   };
+    case 'CLEAR_CLIENT':
+      return {
+        ...state,
+        'x-filters': state['x-filters'].filter(
+          f => f.field !== 'order.customer_id'
+        ),
+      };
 
     case 'CLEAR_ACTION':
       return {

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

@@ -219,7 +219,13 @@ const ModalManager = () => {
       setShouldPerformAction(false);
       setSelectAll(false);
       setError(null);
-      navigate('returnclient/order-return');
+
+      // for local
+      // navigate('/order-return');
+
+      // for dev
+      // navigate('returnclient/order-return');
+      navigate('returnclient/order-return', { replace: true });
     }
   }, [response, apiError, postLoading]);
 

package/src/components/store.ts

@@ -51,6 +51,8 @@ const postLoading = atom<boolean>(false);
 
 const final = atom<any[]>([]);
 
+const clearState = atom<boolean>(false);
+
 function useReminderData() {
   return useAtom(reminderTableData);
 }
@@ -135,6 +137,10 @@ function useFinalPayload() {
   return useAtom(final);
 }
 
+function useClearState() {
+  return useAtom(clearState);
+}
+
 export {
   useAtom,
   useFilter,
@@ -157,4 +163,5 @@ export {
   useSelectAll,
   usePostLoading,
   useFinalPayload,
+  useClearState,
 };

package/src/index.tsx

@@ -1,19 +1,15 @@
 import React, { Suspense, useEffect } from 'react';
 import { Route, Routes, useNavigate } from 'react-router-dom';
-// import AddOrder from './components/add-order';
 import OrderView from './components/order-view';
-// import AllReminder from './components/order-view/all-reminder/AllReminder';
 import ReturnTable from './components/order-daily-overview/return-order-table/ReturnTable';
 import ReturnAfterTable from './components/order-daily-overview/return-after-table/ReturnAfterTable';
 import { useTableName } from './components/order-daily-overview/store/store';
-// import ReturnOrderTable from './components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable';
 import ReturnMainTable from './components/order-daily-overview';
 import { notification } from 'antd';
 import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
 import {
   useActionType,
   // useAtom,
-  // useAtom,
   useCustomerData,
   useLocationData,
   useStatusOrderData,
@@ -35,18 +31,19 @@ function ReturnClient() {
   const [, setActionType] = useActionType();
   const [, setLocationData] = useLocationData();
   const [, setStatusOfOrders] = useStatusOrderData();
+  // const [dispatchvalue] = useAtom(filtersReducerAtom);
 
   const splitPath = (str: any) => {
     const parts = str?.split('/')?.filter((part: any) => part !== ''); // Filter out empty parts
     return parts;
   };
   const paths = splitPath(location.pathname);
-
   useEffect(() => {
     if (paths[paths.length - 1] === 'returnclient') {
       localStorage.removeItem('clientName');
       localStorage.removeItem('clientId');
       localStorage.removeItem('uuid');
+      // dispatch({ type: 'CLEAR_CLIENT' });
     }
   }, [location.pathname]);