@bjsdistribution/dms-client-return 0.0.39 → 0.0.41

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.39",
+  "version": "0.0.41",
   "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.4",
+    "@bjsdistribution/dms-component-library": "0.1.11",
     "@size-limit/preset-small-lib": "^11.0.1",
     "@tippyjs/react": "^4.2.6",
     "@types/react": "^18.2.47",

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

@@ -48,15 +48,19 @@ function SelectionFilter() {
   const [actionTypeOptions, setActionTypeOptions] = useActionTypeOptions();
   const [locationOptions, setLocationOptions] = useLocationOptions();
 
-  const clientOptions = customers?.map((option: any) => ({
-    label:
-      option?.customer_name?.charAt(0)?.toUpperCase() +
-      option?.customer_name?.slice(1),
-    value: option?.customer_id,
-    actions: option?.actions,
-    return_locations: option?.return_locations,
-    account_number: option?.account_number,
-  }));
+  const clientOptions = customers
+    ?.filter(
+      (option: any) => 'customer_id' in option && option.customer_id != null
+    )
+    .map((option: any) => ({
+      label:
+        option?.customer_name?.charAt(0)?.toUpperCase() +
+        option?.customer_name?.slice(1),
+      value: option?.customer_id,
+      actions: option?.actions,
+      return_locations: option?.return_locations,
+      account_number: option?.account_number,
+    }));
 
   //client change
   const handleClientChange = (value: any, option: any) => {
@@ -66,6 +70,31 @@ function SelectionFilter() {
     localStorage.setItem('clientName', option?.label);
     localStorage.setItem('clientId', value?.toString());
     localStorage.setItem('account_number', option?.account_number);
+    const storedClientId = localStorage.getItem('clientId');
+
+    const filteredClient = clientOptions?.find(
+      (client: any) => client?.value == storedClientId
+    );
+
+    if (filteredClient) {
+      const mappedActions = Array.isArray(filteredClient?.actions)
+        ? filteredClient?.actions?.map((action: any) => ({
+            label: action,
+            value: action,
+          }))
+        : [];
+
+      setActionTypeOptions(mappedActions);
+
+      const mappedLocations = Array.isArray(filteredClient?.return_locations)
+        ? filteredClient?.return_locations?.map((location: any) => ({
+            label: location?.location_name,
+            value: location?.token,
+          }))
+        : [];
+
+      setLocationOptions(mappedLocations);
+    }
 
     //set payload
     setReturnPayload((prevState: any) => ({

package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx

@@ -306,7 +306,6 @@ const ReturnOrderTable = () => {
 
     const mergedPayload = Object.values(groupedPayload);
     setGrouped(mergedPayload);
-    console.log(mergedPayload, 'mergedPayload');
   }, [newpayload]);
 
   return (
@@ -428,7 +427,10 @@ const ReturnOrderTable = () => {
                       <div className="awaiting">Awaiting</div>
                     )}
                   </td>
-                  <td> {displayValueOrNA(item?.new_location)}</td>
+                  <td>
+                    {' '}
+                    {displayValueOrNA(item?.return_locations?.location_name)}
+                  </td>
                   <td>
                     <ul style={{ listStyleType: 'none', padding: 0 }}>
                       <li

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

@@ -32,7 +32,7 @@ interface ApiResponse {
 const ReturnTable: React.FC = () => {
   const [clientData] = useClientData();
   const [updatedData, setUpdatedData] = useState<any>([]);
-  const [statsLoading, setLoading] = useStatsLoading();
+  const [statsLoading] = useStatsLoading();
   const [, setOrderStaticData] = useOrderStaticData();
   const [, dispatch] = useAtom(filtersReducerAtom);
   const navigate = useNavigate();
@@ -93,7 +93,7 @@ const ReturnTable: React.FC = () => {
   });
 
   useEffect(() => {
-    setLoading(staticDataLoading);
+    // setLoading(staticDataLoading);
     if (fetchedStaticData && fetchedStaticData.data) {
       const result = fetchedStaticData?.data;
       setOrderStaticData(result[0]);
@@ -148,6 +148,8 @@ const ReturnTable: React.FC = () => {
     // navigate(`/filter/${customerId}`);
   };
 
+  console.log(statsLoading, 'statsLoading');
+
   return (
     <>
       {statsLoading && <Loader />}

package/src/components/order-view/details-filters/left-side-filters/dropdowns/PrintDropDownReturn.tsx

@@ -11,8 +11,6 @@ const PrintDropDownReturn = ({
 }: {
   legacyProductId: number;
 }) => {
-  console.log(legacyProductId, 'legacyProductId');
-
   const downloadFiles = () => {
     const url = `https://us.toolbox.bjshomedelivery.com/offload/return_label?gsit_products_id=${legacyProductId}`;
     window.open(url, '_blank'); // Opens the URL in a new tab

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

@@ -76,7 +76,7 @@ const CreateReturnModal = () => {
                   onChange={() => handleSelectLocations(returnLoc.id)}
                 />
                 <StyledText style={{ marginLeft: '8px' }}>
-                  {displayValueOrNA(returnLoc?.new_location)}
+                  {displayValueOrNA(returnLoc?.return_locations?.location_name)}
                 </StyledText>
               </li>
             ))}

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

@@ -55,7 +55,7 @@ const ModalManager = () => {
     data: response,
     setShouldPerformAction,
     loading: confirmLoading,
-    error: apiError,
+    // error: apiError,
     setError,
   } = useApiHook<{
     data: ApiResponse[];
@@ -80,11 +80,12 @@ const ModalManager = () => {
 
   useEffect(() => {
     // @ts-ignore
-    if (apiError && apiError?.code !== 200) {
+    if (response && response?.code == 500) {
+      // @ts-ignore
       notification.error({
         message: 'Failure',
         // @ts-ignore
-        description: `${apiError?.message}`,
+        description: `${response?.message}`,
       });
       dispatch({ type: 'close' });
       setSelectedReturnOrder([]);
@@ -115,7 +116,7 @@ const ModalManager = () => {
       // for dev
       navigate('/returnclient/order-return');
     }
-  }, [response, apiError, postLoading]);
+  }, [postLoading]);
 
   return (
     <>