ordering-ui-admin-external 1.45.19 → 1.45.21

package/_modules/components/Orders/AllInOne/DriversManager/index.js

@@ -41,7 +41,8 @@ var DriversManagerUI = function DriversManagerUI(props) {
     assignedOrders = props.assignedOrders,
     handleUpdateAssignedOrders = props.handleUpdateAssignedOrders,
     showCompressedInfo = props.showCompressedInfo,
-    handleEmtpyOrderSelected = props.handleEmtpyOrderSelected;
+    handleEmtpyOrderSelected = props.handleEmtpyOrderSelected,
+    orderForMap = props.orderForMap;
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configState = _useConfig2[0];
@@ -92,6 +93,11 @@ var DriversManagerUI = function DriversManagerUI(props) {
       selectedDriver: selectedDriver
     });
   }, [driversIsOnline, selectedDriver, onlineDrivers, offlineDrivers]);
+  (0, _react.useEffect)(function () {
+    if (orderForMap === null) {
+      setSelectedDriver(null);
+    }
+  }, [orderForMap]);
   (0, _react.useEffect)(function () {
     handleUpdateAssignedOrders && handleUpdateAssignedOrders(assignedOrders);
   }, [assignedOrders]);

package/_modules/components/Orders/AllInOne/index.js

@@ -176,6 +176,11 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setOrderForMap(function (prev) {
       return (prev === null || prev === void 0 ? void 0 : prev.id) === (order === null || order === void 0 ? void 0 : order.id) ? null : order;
     });
+    if ((orderForMap === null || orderForMap === void 0 ? void 0 : orderForMap.id) === (order === null || order === void 0 ? void 0 : order.id)) {
+      setMapsData(_objectSpread(_objectSpread({}, mapsData), {}, {
+        selectedDriver: null
+      }));
+    }
     // setIsOpenOrderDetail(true)
     if (!isSelectedOrders) {
       onOrderRedirect(order.id);
@@ -279,7 +284,9 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     drivers: driversList.drivers,
     setMapsData: setMapsData,
     handleEmtpyOrderSelected: handleBackRedirect,
-    handleUpdateAssignedOrders: handleUpdateAssignedOrders
+    handleUpdateAssignedOrders: handleUpdateAssignedOrders,
+    orderForMap: orderForMap,
+    setOrderForMap: setOrderForMap
   })), /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, {
     showCompressedInfo: true
   }, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {

package/_modules/components/Orders/DriversLocation/index.js

@@ -154,7 +154,7 @@ var DriversLocation = exports.DriversLocation = function DriversLocation(props)
       setMapFitted(false);
       return;
     }
-    if (selectedOrder && selectedDriver || selectedDriver && assignedOrders !== null && assignedOrders !== void 0 && (_assignedOrders$order3 = assignedOrders.orders) !== null && _assignedOrders$order3 !== void 0 && _assignedOrders$order3.length) {
+    if (selectedOrder && selectedDriver || selectedDriver && assignedOrders !== null && assignedOrders !== void 0 && (_assignedOrders$order3 = assignedOrders.orders) !== null && _assignedOrders$order3 !== void 0 && _assignedOrders$order3.length || !selectedOrder && !selectedDriver) {
       mapFit();
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.45.19",
+  "version": "1.45.21",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.43.72",
+    "ordering-components-admin-external": "1.43.73",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Orders/AllInOne/DriversManager/index.js

@@ -31,7 +31,8 @@ const DriversManagerUI = (props) => {
     assignedOrders,
     handleUpdateAssignedOrders,
     showCompressedInfo,
-    handleEmtpyOrderSelected
+    handleEmtpyOrderSelected,
+    orderForMap
   } = props
 
   const [configState] = useConfig()
@@ -76,6 +77,12 @@ const DriversManagerUI = (props) => {
     })
   }, [driversIsOnline, selectedDriver, onlineDrivers, offlineDrivers])
 
+  useEffect(() => {
+    if (orderForMap === null) {
+      setSelectedDriver(null)
+    }
+  }, [orderForMap])
+
   useEffect(() => {
     handleUpdateAssignedOrders && handleUpdateAssignedOrders(assignedOrders)
   }, [assignedOrders])

package/src/components/Orders/AllInOne/index.js

@@ -120,6 +120,12 @@ const OrdersManagerUI = (props) => {
     (!configs?.optimize_order_data || (configs?.optimize_order_data?.value === '0')) && setDetailsOrder(order)
     setOrderDetailId(order.id)
     setOrderForMap((prev) => (prev?.id === order?.id ? null : order))
+    if (orderForMap?.id === order?.id) {
+      setMapsData({
+        ...mapsData,
+        selectedDriver: null
+      })
+    }
     // setIsOpenOrderDetail(true)
     if (!isSelectedOrders) {
       onOrderRedirect(order.id)
@@ -241,6 +247,8 @@ const OrdersManagerUI = (props) => {
                 setMapsData={setMapsData}
                 handleEmtpyOrderSelected={handleBackRedirect}
                 handleUpdateAssignedOrders={handleUpdateAssignedOrders}
+                orderForMap={orderForMap}
+                setOrderForMap={setOrderForMap}
               />
             </DriversContainer>
             <OrdersContainer showCompressedInfo>

package/src/components/Orders/DriversLocation/index.js

@@ -131,7 +131,7 @@ export const DriversLocation = (props) => {
       setMapFitted(false)
       return
     }
-    if ((selectedOrder && selectedDriver) || (selectedDriver && assignedOrders?.orders?.length)) {
+    if ((selectedOrder && selectedDriver) || (selectedDriver && assignedOrders?.orders?.length) || (!selectedOrder && !selectedDriver)) {
       mapFit()
       return
     }