@bjsdistribution/dms-client-return 0.0.65 → 0.0.67

package/package.json

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

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

@@ -95,6 +95,11 @@ const ReturnOrderFilter = () => {
     });
   };
 
+  const assigneeOptions = assignData?.map(client => ({
+    label: client.type,
+    value: client.id,
+  }));
+
   const handleAssigneeChange = (value: any) => {
     const bjsDeliveryValue = assignData.find(client => client.id === value)
       ?.bjs_delivery;
@@ -189,7 +194,7 @@ const ReturnOrderFilter = () => {
                   className="custom-select"
                   placeholder="Status of Order"
                   onChange={handleStatusOfOrder}
-                  style={{ minWidth: '130px' }}
+                  style={{ width: '145px' }}
                   value={statusOrder}
                   onClear={handleClear}
                   allowClear
@@ -220,15 +225,12 @@ const ReturnOrderFilter = () => {
               </div>
               <StyledAntSelect>
                 <Select
-                  options={assignData?.map(client => ({
-                    label: client.type,
-                    value: client.id,
-                  }))}
+                  options={assigneeOptions}
                   className="custom-select"
                   placeholder="Assignee"
                   onChange={handleAssigneeChange}
                   value={selectedAssignee}
-                  style={{ minWidth: '120px' }}
+                  style={{ minWidth: '140px' }}
                   allowClear
                   onClear={handleClearAssignee}
                 />

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

@@ -31,7 +31,7 @@ import { OrdersType } from './types';
 import { useLocation } from 'react-router-dom';
 import useSystemLogs from './hooks/useGetSystemLogs';
 import { notification } from 'antd';
-import { useAssignData } from '../store';
+// import { useAssignData } from '../store';
 import DetailsFilters from './details-filters/DetailsFilters';
 
 interface ApiResponse {
@@ -66,7 +66,7 @@ function OrderView() {
   const [, setRouteId] = useRouteId();
   const [liveRecalling] = useLiveRecalling();
   const systemLogsData = useSystemLogs();
-  const [, setAssignData] = useAssignData();
+  // const [, setAssignData] = useAssignData();
 
   // query param
   const location = useLocation();
@@ -173,11 +173,11 @@ function OrderView() {
     if (fetchedStaticData && fetchedStaticData.data) {
       const result = fetchedStaticData?.data;
       setOrderStaticData(result[0]);
-      setAssignData(
-        fetchedStaticData?.data?.flatMap(
-          (i: any) => i?.resource_visibility_type
-        )
-      );
+      // setAssignData(
+      //   fetchedStaticData?.data?.flatMap(
+      //     (i: any) => i?.resource_visibility_type
+      //   )
+      // );
     }
   }, [staticDataLoading]);
 
@@ -221,9 +221,10 @@ function OrderView() {
   useEffect(() => {
     setLoading(depotDataLoading);
     if (fetchedDepotData && fetchedDepotData.data) {
+      console.log(fetchedDepotData, 'fetchedDepotData');
       const requiredData = fetchedDepotData?.data;
       if (requiredData.length > 0) {
-        const options = requiredData.map((x: any) => {
+        const options = requiredData?.map((x: any) => {
           return {
             label: x.name,
             value: x.id,