ordering-ui-admin-external 1.43.75 → 1.43.76

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

@@ -63,7 +63,9 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setAllowColumns = props.setAllowColumns,
     isUseQuery = props.isUseQuery,
     adminsList = props.adminsList,
-    assignableDriverGroupList = props.assignableDriverGroupList;
+    assignableDriverGroupList = props.assignableDriverGroupList,
+    mapsData = props.mapsData,
+    setMapsData = props.setMapsData;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -141,15 +143,6 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     _useState26 = _slicedToArray(_useState25, 2),
     ordersAmountByStatus = _useState26[0],
     setOrdersAmountByStatus = _useState26[1];
-  var _useState27 = (0, _react.useState)({
-      driversIsOnline: true,
-      onlineDrivers: [],
-      offlineDrivers: [],
-      selectedDriver: null
-    }),
-    _useState28 = _slicedToArray(_useState27, 2),
-    mapsData = _useState28[0],
-    setMapsData = _useState28[1];
   var handleBackRedirect = function handleBackRedirect() {
     setIsOpenOrderDetail(false);
     setDetailsOrder(null);

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

@@ -30,10 +30,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-var DeliveriesLocationPropsAreEqual = function DeliveriesLocationPropsAreEqual(prevProps, nextProps) {
-  return JSON.stringify(prevProps.interActionMapOrder) === JSON.stringify(nextProps.interActionMapOrder) && JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList);
-};
-var DeliveriesLocation = exports.DeliveriesLocation = /*#__PURE__*/_react.default.memo(function (props) {
+var DeliveriesLocation = exports.DeliveriesLocation = function DeliveriesLocation(props) {
   var _configState$configs, _configState$configs2, _configState$configs3, _interActionMapOrder$6, _interActionMapOrder$7, _interActionMapOrder$8, _interActionMapOrder$9, _interActionMapOrder$10, _interActionMapOrder$11, _interActionMapOrder$12, _interActionMapOrder$13, _interActionMapOrder$14;
   var driversList = props.driversList,
     interActionMapOrder = props.interActionMapOrder;
@@ -355,4 +352,4 @@ var DeliveriesLocation = exports.DeliveriesLocation = /*#__PURE__*/_react.defaul
       bgimage: (driver === null || driver === void 0 ? void 0 : driver.photo) || (theme === null || theme === void 0 || (_theme$images = theme.images) === null || _theme$images === void 0 || (_theme$images = _theme$images.icons) === null || _theme$images === void 0 ? void 0 : _theme$images.noDriver)
     })), /*#__PURE__*/_react.default.createElement(_styles.DriverInfo, null, /*#__PURE__*/_react.default.createElement("p", null, driver.name, " ", driver.lastname), /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER', 'Driver'))));
   })))));
-}, DeliveriesLocationPropsAreEqual);
+};

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

@@ -21,11 +21,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-var DriversLocationPropsAreEqual = function DriversLocationPropsAreEqual(prevProps, nextProps) {
-  var _prevProps$offlineDri, _nextProps$offlineDri;
-  return JSON.stringify(prevProps.selectedDriver) === JSON.stringify(nextProps.selectedDriver) && JSON.stringify(prevProps.assignedOrders) === JSON.stringify(nextProps.assignedOrders) && prevProps.driversIsOnline === nextProps.driversIsOnline && JSON.stringify(prevProps.onlineDrivers) === JSON.stringify(nextProps.onlineDrivers) && JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList) && ((_prevProps$offlineDri = prevProps.offlineDrivers) === null || _prevProps$offlineDri === void 0 ? void 0 : _prevProps$offlineDri.length) === ((_nextProps$offlineDri = nextProps.offlineDrivers) === null || _nextProps$offlineDri === void 0 ? void 0 : _nextProps$offlineDri.length) && JSON.stringify(prevProps.selectedOrder) === JSON.stringify(nextProps.selectedOrder);
-};
-var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo(function (props) {
+var DriversLocation = exports.DriversLocation = function DriversLocation(props) {
   var _configState$configs, _configState$configs2, _configState$configs3, _selectedOrder$custom3, _selectedOrder$custom4, _selectedOrder$custom5, _selectedOrder$custom6, _selectedOrder$custom7, _selectedOrder$busine3, _selectedOrder$busine4, _selectedOrder$busine5, _selectedOrder$driver3, _selectedOrder$driver4, _selectedOrder$driver5, _selectedOrder$driver6, _selectedOrder$driver7, _selectedOrder$driver8, _selectedOrder$driver9, _selectedOrder$driver10, _selectedOrder$driver11, _selectedOrder$driver12, _selectedOrder$driver13, _selectedOrder$driver14, _assignedOrders$order6, _assignedOrders$order7;
   var driversIsOnline = props.driversIsOnline,
     onlineDrivers = props.onlineDrivers,
@@ -165,7 +161,7 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
     if (!mapFitted) {
       mapFit();
     }
-  }, [showDrivers, mapLoaded, mapFitted, selectedOrder, assignedOrders === null || assignedOrders === void 0 ? void 0 : assignedOrders.orders]);
+  }, [JSON.stringify(showDrivers), mapLoaded, mapFitted, selectedOrder, assignedOrders === null || assignedOrders === void 0 ? void 0 : assignedOrders.orders]);
   (0, _react.useEffect)(function () {
     if (selectedDriver) {
       setShowDrivers([selectedDriver]);
@@ -253,4 +249,4 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
       image: order === null || order === void 0 || (_order$business5 = order.business) === null || _order$business5 === void 0 ? void 0 : _order$business5.logo
     });
   }))));
-}, DriversLocationPropsAreEqual);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.75",
+  "version": "1.43.76",
   "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.49",
+    "ordering-components-admin-external": "1.43.50",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

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

@@ -58,7 +58,9 @@ const OrdersManagerUI = (props) => {
     setAllowColumns,
     isUseQuery,
     adminsList,
-    assignableDriverGroupList
+    assignableDriverGroupList,
+    mapsData,
+    setMapsData
   } = props
 
   const [, t] = useLanguage()
@@ -88,13 +90,6 @@ const OrdersManagerUI = (props) => {
     cancelled: null
   })
 
-  const [mapsData, setMapsData] = useState({
-    driversIsOnline: true,
-    onlineDrivers: [],
-    offlineDrivers: [],
-    selectedDriver: null
-  })
-
   const handleBackRedirect = () => {
     setIsOpenOrderDetail(false)
     setDetailsOrder(null)

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

@@ -16,12 +16,7 @@ import {
   DriverInfo
 } from './styles'
 
-const DeliveriesLocationPropsAreEqual = (prevProps, nextProps) => {
-  return JSON.stringify(prevProps.interActionMapOrder) === JSON.stringify(nextProps.interActionMapOrder) &&
-    JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList)
-}
-
-export const DeliveriesLocation = React.memo((props) => {
+export const DeliveriesLocation = (props) => {
   const {
     driversList,
     interActionMapOrder
@@ -307,4 +302,4 @@ export const DeliveriesLocation = React.memo((props) => {
       )}
     </WrapperMap>
   )
-}, DeliveriesLocationPropsAreEqual)
+}

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

@@ -9,17 +9,7 @@ import {
   WrapperMap
 } from './styles'
 
-const DriversLocationPropsAreEqual = (prevProps, nextProps) => {
-  return JSON.stringify(prevProps.selectedDriver) === JSON.stringify(nextProps.selectedDriver) &&
-    JSON.stringify(prevProps.assignedOrders) === JSON.stringify(nextProps.assignedOrders) &&
-    prevProps.driversIsOnline === nextProps.driversIsOnline &&
-    JSON.stringify(prevProps.onlineDrivers) === JSON.stringify(nextProps.onlineDrivers) &&
-    JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList) &&
-    prevProps.offlineDrivers?.length === nextProps.offlineDrivers?.length &&
-    JSON.stringify(prevProps.selectedOrder) === JSON.stringify(nextProps.selectedOrder)
-}
-
-export const DriversLocation = React.memo((props) => {
+export const DriversLocation = (props) => {
   const {
     driversIsOnline,
     onlineDrivers,
@@ -122,7 +112,6 @@ export const DriversLocation = React.memo((props) => {
         lng: bounds.getSouthWest().lng()
       }
     }
-
     const mapSize = {
       width: mapRef.current.clientWidth,
       height: mapRef.current.clientHeight
@@ -149,7 +138,7 @@ export const DriversLocation = React.memo((props) => {
     if (!mapFitted) {
       mapFit()
     }
-  }, [showDrivers, mapLoaded, mapFitted, selectedOrder, assignedOrders?.orders])
+  }, [JSON.stringify(showDrivers), mapLoaded, mapFitted, selectedOrder, assignedOrders?.orders])
 
   useEffect(() => {
     if (selectedDriver) {
@@ -278,4 +267,4 @@ export const DriversLocation = React.memo((props) => {
       </WrapperMap>
     </>
   )
-}, DriversLocationPropsAreEqual)
+}