@bjsdistribution/dms-client-return 0.0.34 → 0.0.36

package/package.json

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

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

@@ -67,27 +67,6 @@ function SelectionFilter() {
     localStorage.setItem('clientId', value?.toString());
     localStorage.setItem('account_number', option?.account_number);
 
-    const selectedClient = clientOptions?.find(
-      (client: any) => client?.value === value
-    );
-
-    const clientActions = selectedClient?.actions || [];
-
-    const clientLocations = selectedClient?.return_locations || [];
-
-    setActionTypeOptions(
-      clientActions?.map((action: any) => ({
-        label: action,
-        value: action,
-      }))
-    );
-
-    setLocationOptions(
-      clientLocations?.map((action: any) => ({
-        label: action,
-        value: action,
-      }))
-    );
     //set payload
     setReturnPayload((prevState: any) => ({
       ...prevState,
@@ -164,6 +143,32 @@ function SelectionFilter() {
     if (storedName) {
       setTableName(storedName);
     }
+    const selectedClientValue = clientOptions?.find(
+      (client: any) => client?.value === selectedClient
+    );
+
+    const clientActions = selectedClientValue?.actions || [];
+
+    const clientLocations = selectedClientValue?.return_locations || [];
+
+    setActionTypeOptions(
+      Array.isArray(clientActions)
+        ? clientActions?.map(action => ({
+            label: action,
+            value: action,
+          }))
+        : []
+    );
+
+    setLocationOptions(
+      Array.isArray(clientLocations)
+        ? clientLocations?.map(location => ({
+            label: location,
+            value: location,
+          }))
+        : []
+    );
+
     //client value
     if (storedClientId) {
       dispatch({
@@ -192,7 +197,7 @@ function SelectionFilter() {
       });
     }
     //location value
-    if (selectedLocationValue && selectedLocationValue.length > 0) {
+    if (selectedLocationValue && selectedLocationValue?.length > 0) {
       dispatch({
         type: 'SET_LOCATION_FILTER',
         payload: selectedLocationValue,

package/src/components/order-daily-overview/index.tsx

@@ -1,9 +1,9 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import {
-  useItemsPerOverviewPage,
+  // useItemsPerOverviewPage,
   //useItemsPerPage,
   useLoading,
-  UsePaginationOverviewData,
+  // UsePaginationOverviewData,
   useTableName,
   //UsePaginationData,
 } from './store/store';
@@ -19,29 +19,29 @@ import { Text } from './filters/FilterStyle';
 import ReturnTable from './table/ReturnTable';
 import { overviewfiltersReducerAtom } from './header-filters/overViewFilter';
 // import { notification } from 'antd';
-import Pagination from './table-view/Pagination';
+// import Pagination from './table-view/Pagination';
 // import Pagination from './table-view/Pagination';
 // import { overviewfiltersReducerAtom } from './header-filters/overViewFilter';
 
 function ReturnMainTable() {
   const [state] = useAtom(overviewfiltersReducerAtom);
-  const [paginationObj] = UsePaginationOverviewData();
-  const [, setCurrentPage] = useState(1);
-  const [itemsPerPage, setItemsPerPage] = useItemsPerOverviewPage();
+  // const [paginationObj] = UsePaginationOverviewData();
+  // const [, setCurrentPage] = useState(1);
+  // const [itemsPerPage, setItemsPerPage] = useItemsPerOverviewPage();
   const { 'x-pagination': pagination } = state;
-  const { page, total } = paginationObj;
+  // const { page, total } = paginationObj;
   // const [selectedClient] = useTableName();
   const [isScrolled] = useStickyStatus();
   const [, setLoading] = useLoading();
   const [, setClientData] = useClientData();
   const [tableName] = useTableName();
 
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-  const handleItemsPerPageChange = (itemsPerPage: number) => {
-    setItemsPerPage(itemsPerPage);
-  };
+  // const handlePageChange = (page: number) => {
+  //   setCurrentPage(page);
+  // };
+  // const handleItemsPerPageChange = (itemsPerPage: number) => {
+  //   setItemsPerPage(itemsPerPage);
+  // };
 
   const {
     data: fetchedClientData,
@@ -86,7 +86,7 @@ function ReturnMainTable() {
             </Row>
             <ReturnTable />
           </Container>
-          {total > 0 && (
+          {/* {total > 0 && (
             <Pagination
               currentPage={page}
               totalItems={total}
@@ -94,7 +94,7 @@ function ReturnMainTable() {
               onPageChange={handlePageChange}
               onItemsPerPageChange={handleItemsPerPageChange}
             ></Pagination>
-          )}
+          )} */}
         </div>
       </DashBoardWrapper>
     </>