ordering-ui-admin-external 1.45.17 → 1.45.19

package/_modules/components/Delivery/DriversGroupsList/index.js

@@ -34,9 +34,9 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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 DriversGroupsList = exports.DriversGroupsList = function DriversGroupsList(props) {
+  var _driversGroupsState$g, _driversGroupsState$g2;
   var curDriversGroup = props.curDriversGroup,
     driversGroupsState = props.driversGroupsState,
-    searchValue = props.searchValue,
     handleOpenDetails = props.handleOpenDetails,
     handleUpdateDriversGroup = props.handleUpdateDriversGroup,
     selectedGroupList = props.selectedGroupList,
@@ -50,16 +50,6 @@ var DriversGroupsList = exports.DriversGroupsList = function DriversGroupsList(p
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
-
-  // Get current groups
-  var _useState = (0, _react.useState)([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentGroups = _useState2[0],
-    setCurrentGroups = _useState2[1];
-  var _useState3 = (0, _react.useState)(null),
-    _useState4 = _slicedToArray(_useState3, 2),
-    totalPages = _useState4[0],
-    setTotalPages = _useState4[1];
   var handleChangePage = function handleChangePage(page) {
     setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
       currentPage: page
@@ -70,20 +60,6 @@ var DriversGroupsList = exports.DriversGroupsList = function DriversGroupsList(p
       pageSize: pageSize
     }));
   };
-  (0, _react.useEffect)(function () {
-    if (driversGroupsState.loading) return;
-    var groups = [];
-    if (searchValue) {
-      groups = driversGroupsState.groups.filter(function (plugin) {
-        var _plugin$name;
-        return (_plugin$name = plugin.name) === null || _plugin$name === void 0 ? void 0 : _plugin$name.toLowerCase().includes(searchValue === null || searchValue === void 0 ? void 0 : searchValue.toLowerCase());
-      });
-    } else {
-      groups = _toConsumableArray(driversGroupsState.groups);
-    }
-    setTotalPages(pagination.totalPages);
-    setCurrentGroups(groups);
-  }, [driversGroupsState, searchValue]);
   var handleClickDriverGroup = function handleClickDriverGroup(e, group) {
     var isInvalid = e.target.closest('.group-checkbox') || e.target.closest('.group-enabled');
     if (isInvalid) return;
@@ -98,12 +74,12 @@ var DriversGroupsList = exports.DriversGroupsList = function DriversGroupsList(p
     }
   };
   (0, _react.useEffect)(function () {
-    if (!isUseQuery || !totalPages) return;
+    if (!isUseQuery || !pagination.totalPages) return;
     (0, _utils.addQueryToUrl)({
       page: pagination.currentPage,
       pageSize: pagination.pageSize
     });
-  }, [pagination, totalPages]);
+  }, [pagination, pagination.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DriversGroupsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.TableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.GroupsTable, {
     "data-tour": "tour_delivery_completed",
     disabled: isFromStore
@@ -145,7 +121,7 @@ var DriversGroupsList = exports.DriversGroupsList = function DriversGroupsList(p
     }))), !isFromStore && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.EnableWrapper, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
       width: 50
     }))))));
-  }) : currentGroups.map(function (group) {
+  }) : driversGroupsState === null || driversGroupsState === void 0 || (_driversGroupsState$g = driversGroupsState.groups) === null || _driversGroupsState$g === void 0 ? void 0 : _driversGroupsState$g.map(function (group) {
     var _group$administrator, _group$administrator2, _group$administrator3, _group$administrator4, _group$administrator5;
     return /*#__PURE__*/_react.default.createElement("tbody", {
       key: group.id,
@@ -179,7 +155,7 @@ var DriversGroupsList = exports.DriversGroupsList = function DriversGroupsList(p
       return handleOpenDetails(null);
     },
     disabled: actionDisabled
-  }, t('ADD_NEW_DRIVER_GROUP', 'Add new driver group')), (currentGroups === null || currentGroups === void 0 ? void 0 : currentGroups.length) > 0 && /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
+  }, t('ADD_NEW_DRIVER_GROUP', 'Add new driver group')), (driversGroupsState === null || driversGroupsState === void 0 || (_driversGroupsState$g2 = driversGroupsState.groups) === null || _driversGroupsState$g2 === void 0 ? void 0 : _driversGroupsState$g2.length) > 0 && /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
     currentPage: pagination.currentPage,
     totalPages: pagination.totalPages,
     handleChangePage: handleChangePage,

package/_modules/components/Delivery/DriversGroupsListing/index.js

@@ -54,7 +54,9 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     actionDisabled = props.actionDisabled,
     isUseQuery = props.isUseQuery,
     pagination = props.pagination,
-    setPagination = props.setPagination;
+    setPagination = props.setPagination,
+    searchValue = props.searchValue,
+    onSearch = props.onSearch;
   var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -64,57 +66,53 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     _useInfoShare2 = _slicedToArray(_useInfoShare, 2),
     isCollapse = _useInfoShare2[0].isCollapse,
     handleMenuCollapse = _useInfoShare2[1].handleMenuCollapse;
-  var _useState = (0, _react.useState)(null),
-    _useState2 = _slicedToArray(_useState, 2),
-    searchValue = _useState2[0],
-    setSearchValue = _useState2[1];
-  var _useState3 = (0, _react.useState)({
+  var _useState = (0, _react.useState)({
       open: false,
       content: []
     }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    alertState = _useState4[0],
-    setAlertState = _useState4[1];
-  var _useState5 = (0, _react.useState)({
+    _useState2 = _slicedToArray(_useState, 2),
+    alertState = _useState2[0],
+    setAlertState = _useState2[1];
+  var _useState3 = (0, _react.useState)({
       open: false,
       content: null,
       handleOnAccept: null
     }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    confirm = _useState4[0],
+    setConfirm = _useState4[1];
+  var _useState5 = (0, _react.useState)(0),
     _useState6 = _slicedToArray(_useState5, 2),
-    confirm = _useState6[0],
-    setConfirm = _useState6[1];
-  var _useState7 = (0, _react.useState)(0),
+    moveDistance = _useState6[0],
+    setMoveDistance = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    moveDistance = _useState8[0],
-    setMoveDistance = _useState8[1];
-  var _useState9 = (0, _react.useState)(false),
+    openDetails = _useState8[0],
+    setOpenDetails = _useState8[1];
+  var _useState9 = (0, _react.useState)(null),
     _useState10 = _slicedToArray(_useState9, 2),
-    openDetails = _useState10[0],
-    setOpenDetails = _useState10[1];
+    curDriversGroup = _useState10[0],
+    setCurDriversGroup = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    curDriversGroup = _useState12[0],
-    setCurDriversGroup = _useState12[1];
-  var _useState13 = (0, _react.useState)(null),
+    curDriversGroupId = _useState12[0],
+    setCurDriversGroupId = _useState12[1];
+  var _useState13 = (0, _react.useState)(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    curDriversGroupId = _useState14[0],
-    setCurDriversGroupId = _useState14[1];
+    isExtendExtraOpen = _useState14[0],
+    setIsExtendExtraOpen = _useState14[1];
   var _useState15 = (0, _react.useState)(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    isExtendExtraOpen = _useState16[0],
-    setIsExtendExtraOpen = _useState16[1];
+    isAddMode = _useState16[0],
+    setIsAddMode = _useState16[1];
   var _useState17 = (0, _react.useState)(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    isAddMode = _useState18[0],
-    setIsAddMode = _useState18[1];
-  var _useState19 = (0, _react.useState)(false),
+    isTourOpen = _useState18[0],
+    setIsTourOpen = _useState18[1];
+  var _useState19 = (0, _react.useState)(4),
     _useState20 = _slicedToArray(_useState19, 2),
-    isTourOpen = _useState20[0],
-    setIsTourOpen = _useState20[1];
-  var _useState21 = (0, _react.useState)(4),
-    _useState22 = _slicedToArray(_useState21, 2),
-    currentTourStep = _useState22[0],
-    setCurrentTourStep = _useState22[1];
+    currentTourStep = _useState20[0],
+    setCurrentTourStep = _useState20[1];
   var handleOpenDetails = function handleOpenDetails(driverGroup) {
     setMoveDistance(0);
     setCurDriversGroup(driverGroup);
@@ -241,9 +239,7 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     }
   }, t('DELETE', 'Delete')), /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
     lazyLoad: true,
-    onSearch: function onSearch(val) {
-      return setSearchValue(val);
-    },
+    onSearch: onSearch,
     search: searchValue,
     placeholder: t('SEARCH', 'Search')
   }))), !isAddMode ? /*#__PURE__*/_react.default.createElement(_DriversGroupsList.DriversGroupsList, {

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

@@ -15,6 +15,7 @@ var _OrdersDashboardControls = require("../OrdersDashboardControls");
 var _Shared = require("../../Shared");
 var _DriversManager = require("./DriversManager");
 var _DriversLocation = require("../DriversLocation");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 var _OrdersDashboard = require("../OrdersDashboard");
 var _OrderStatusSubFilter = require("../OrderStatusSubFilter");
@@ -33,6 +34,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 DEBOUNCE_DELAY = 300;
 var OrdersManagerUI = function OrdersManagerUI(props) {
   var _configs$filter_order;
   var isSelectedOrders = props.isSelectedOrders,
@@ -101,49 +103,54 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     assignedOrders = _useState8[0],
     setAssignedOrders = _useState8[1];
-  var _useState9 = (0, _react.useState)(false),
+  var _useState9 = (0, _react.useState)(detailsOrder),
     _useState10 = _slicedToArray(_useState9, 2),
-    isTourOpen = _useState10[0],
-    setIsTourOpen = _useState10[1];
-  var _useState11 = (0, _react.useState)(0),
+    orderForMap = _useState10[0],
+    setOrderForMap = _useState10[1];
+  var _useState11 = (0, _react.useState)(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    currentTourStep = _useState12[0],
-    setCurrentTourStep = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
+    isTourOpen = _useState12[0],
+    setIsTourOpen = _useState12[1];
+  var _useState13 = (0, _react.useState)(0),
     _useState14 = _slicedToArray(_useState13, 2),
-    isTourFlag = _useState14[0],
-    setIsTourFlag = _useState14[1];
-  var _useState15 = (0, _react.useState)({
+    currentTourStep = _useState14[0],
+    setCurrentTourStep = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    isTourFlag = _useState16[0],
+    setIsTourFlag = _useState16[1];
+  var _useState17 = (0, _react.useState)({
       open: false,
       content: []
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    alertState = _useState16[0],
-    setAlertState = _useState16[1];
-  var _useState17 = (0, _react.useState)(null),
     _useState18 = _slicedToArray(_useState17, 2),
-    timeStatus = _useState18[0],
-    setTimeStatus = _useState18[1];
-  var _useState19 = (0, _react.useState)(60000),
+    alertState = _useState18[0],
+    setAlertState = _useState18[1];
+  var _useState19 = (0, _react.useState)(null),
     _useState20 = _slicedToArray(_useState19, 2),
-    slaSettingTime = _useState20[0],
-    setSlaSettingTime = _useState20[1];
-  var _useState21 = (0, _react.useState)(0),
+    timeStatus = _useState20[0],
+    setTimeStatus = _useState20[1];
+  var _useState21 = (0, _react.useState)(60000),
     _useState22 = _slicedToArray(_useState21, 2),
-    totalSelectedOrder = _useState22[0],
-    setTotalSelectedOrder = _useState22[1];
-  var _useState23 = (0, _react.useState)({
+    slaSettingTime = _useState22[0],
+    setSlaSettingTime = _useState22[1];
+  var _useState23 = (0, _react.useState)(0),
+    _useState24 = _slicedToArray(_useState23, 2),
+    totalSelectedOrder = _useState24[0],
+    setTotalSelectedOrder = _useState24[1];
+  var _useState25 = (0, _react.useState)({
       pending: null,
       inProgress: null,
       completed: null,
       cancelled: null
     }),
-    _useState24 = _slicedToArray(_useState23, 2),
-    ordersAmountByStatus = _useState24[0],
-    setOrdersAmountByStatus = _useState24[1];
+    _useState26 = _slicedToArray(_useState25, 2),
+    ordersAmountByStatus = _useState26[0],
+    setOrdersAmountByStatus = _useState26[1];
   var handleBackRedirect = function handleBackRedirect() {
     setIsOpenOrderDetail(false);
     setDetailsOrder(null);
+    setOrderForMap(null);
     setOrderDetailId(null);
     if (!isSelectedOrders) {
       onOrderRedirect();
@@ -157,7 +164,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
       content: []
     });
   };
-  var handleOpenOrderDetail = function handleOpenOrderDetail(order) {
+  var handleOpenOrderDetailBase = function handleOpenOrderDetailBase(order) {
     var _configs$optimize_ord;
     var isKeydown = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (isTourOpen && currentTourStep === 4 && !isKeydown) {
@@ -166,6 +173,9 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     }
     (!(configs !== null && configs !== void 0 && configs.optimize_order_data) || (configs === null || configs === void 0 || (_configs$optimize_ord = configs.optimize_order_data) === null || _configs$optimize_ord === void 0 ? void 0 : _configs$optimize_ord.value) === '0') && setDetailsOrder(order);
     setOrderDetailId(order.id);
+    setOrderForMap(function (prev) {
+      return (prev === null || prev === void 0 ? void 0 : prev.id) === (order === null || order === void 0 ? void 0 : order.id) ? null : order;
+    });
     // setIsOpenOrderDetail(true)
     if (!isSelectedOrders) {
       onOrderRedirect(order.id);
@@ -181,6 +191,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
       }, 1);
     }
   };
+  var handleOpenOrderDetail = (0, _utils.usePreventDoubleClick)(handleOpenOrderDetailBase, DEBOUNCE_DELAY);
   var handleSetOpenOrderDetail = function handleSetOpenOrderDetail(state) {
     setIsOpenOrderDetail(state);
   };
@@ -325,7 +336,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     selectedDriver: mapsData.selectedDriver,
     onlineDrivers: mapsData.onlineDrivers,
     offlineDrivers: mapsData.offlineDrivers,
-    selectedOrder: detailsOrder,
+    selectedOrder: orderForMap,
     assignedOrders: assignedOrders
   })))), isOpenOrderDetail && /*#__PURE__*/_react.default.createElement(_OrderDetails.OrderDetails, {
     isSelectedOrders: isSelectedOrders,

package/_modules/utils/index.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.removeQueryToUrl = exports.queryStringToObject = exports.orderStatus = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatusPrefix = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getLocale = exports.getIconCard = exports.getHours = exports.getCurrenySymbol = exports.getCurrentDiffDays = exports.getAttributeName = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCountryPhoneCode = exports.findExitingCode = exports.fieldsToSort = exports.disableReasons = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.addQueryToUrl = exports.TwentyFourHours = exports.TwelveHours = exports.DriverTipsOptions = void 0;
-var _react = _interopRequireDefault(require("react"));
+exports.widgetURL = exports.verifyDecimals = exports.usePreventDoubleClick = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.removeQueryToUrl = exports.queryStringToObject = exports.orderStatus = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatusPrefix = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getLocale = exports.getIconCard = exports.getHours = exports.getCurrenySymbol = exports.getCurrentDiffDays = exports.getAttributeName = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCountryPhoneCode = exports.findExitingCode = exports.fieldsToSort = exports.disableReasons = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.addQueryToUrl = exports.TwentyFourHours = exports.TwelveHours = exports.DriverTipsOptions = void 0;
+var _react = _interopRequireWildcard(require("react"));
 var _FaCcMastercard = _interopRequireDefault(require("@meronex/icons/fa/FaCcMastercard"));
 var _FaCcVisa = _interopRequireDefault(require("@meronex/icons/fa/FaCcVisa"));
 var _FaCreditCard = _interopRequireDefault(require("@meronex/icons/fa/FaCreditCard"));
@@ -12,6 +12,8 @@ var _moment = _interopRequireDefault(require("moment"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _currency = require("../config/currency.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -896,6 +898,8 @@ var removeQueryToUrl = exports.removeQueryToUrl = function removeQueryToUrl(remo
     history.replaceState(null, '', "".concat(location.pathname));
   }
 };
+var TwelveHours = exports.TwelveHours = ['12:00 AM', '01:00 AM', '02:00 AM', '03:00 AM', '04:00 AM', '05:00 AM', '06:00 AM', '07:00 AM', '08:00 AM', '09:00 AM', '10:00 AM', '11:00 AM', '12:00 PM', '01:00 PM', '02:00 PM', '03:00 PM', '04:00 PM', '05:00 PM', '06:00 PM', '07:00 PM', '08:00 PM', '09:00 PM', '10:00 PM', '11:00 PM'];
+var TwentyFourHours = exports.TwentyFourHours = ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'];
 var disableReasons = exports.disableReasons = function disableReasons() {
   var _useLanguage3 = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage4 = _slicedToArray(_useLanguage3, 2),
@@ -933,8 +937,6 @@ var disableReasons = exports.disableReasons = function disableReasons() {
   };
   return disableReasonDictionary;
 };
-var TwelveHours = exports.TwelveHours = ['12:00 AM', '01:00 AM', '02:00 AM', '03:00 AM', '04:00 AM', '05:00 AM', '06:00 AM', '07:00 AM', '08:00 AM', '09:00 AM', '10:00 AM', '11:00 AM', '12:00 PM', '01:00 PM', '02:00 PM', '03:00 PM', '04:00 PM', '05:00 PM', '06:00 PM', '07:00 PM', '08:00 PM', '09:00 PM', '10:00 PM', '11:00 PM'];
-var TwentyFourHours = exports.TwentyFourHours = ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'];
 var getAttributeName = exports.getAttributeName = function getAttributeName(key) {
   var _useLanguage5 = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage6 = _slicedToArray(_useLanguage5, 2),
@@ -1011,4 +1013,17 @@ var getAttributeName = exports.getAttributeName = function getAttributeName(key)
   } else {
     return key;
   }
+};
+var usePreventDoubleClick = exports.usePreventDoubleClick = function usePreventDoubleClick(_callback) {
+  var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 300;
+  var clickTimeRef = (0, _react.useRef)(0);
+  var handleClick = (0, _react.useCallback)(function () {
+    var currentTime = new Date().getTime();
+    if (currentTime - clickTimeRef.current < delay) {
+      return;
+    }
+    clickTimeRef.current = currentTime;
+    _callback.apply(void 0, arguments);
+  }, [_callback, delay]);
+  return handleClick;
 };

package/package.json

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

package/src/components/Delivery/DriversGroupsList/index.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect } from 'react'
 import { useLanguage } from 'ordering-components-admin-external'
 import Skeleton from 'react-loading-skeleton'
 import MdCheckBoxOutlineBlank from '@meronex/icons/md/MdCheckBoxOutlineBlank'
@@ -29,7 +29,6 @@ export const DriversGroupsList = (props) => {
   const {
     curDriversGroup,
     driversGroupsState,
-    searchValue,
     handleOpenDetails,
     handleUpdateDriversGroup,
     selectedGroupList,
@@ -44,10 +43,6 @@ export const DriversGroupsList = (props) => {
 
   const [, t] = useLanguage()
 
-  // Get current groups
-  const [currentGroups, setCurrentGroups] = useState([])
-  const [totalPages, setTotalPages] = useState(null)
-
   const handleChangePage = (page) => {
     setPagination({
       ...pagination,
@@ -62,18 +57,6 @@ export const DriversGroupsList = (props) => {
     })
   }
 
-  useEffect(() => {
-    if (driversGroupsState.loading) return
-    let groups = []
-    if (searchValue) {
-      groups = driversGroupsState.groups.filter(plugin => plugin.name?.toLowerCase().includes(searchValue?.toLowerCase()))
-    } else {
-      groups = [...driversGroupsState.groups]
-    }
-    setTotalPages(pagination.totalPages)
-    setCurrentGroups(groups)
-  }, [driversGroupsState, searchValue])
-
   const handleClickDriverGroup = (e, group) => {
     const isInvalid = e.target.closest('.group-checkbox') || e.target.closest('.group-enabled')
     if (isInvalid) return
@@ -90,12 +73,12 @@ export const DriversGroupsList = (props) => {
   }
 
   useEffect(() => {
-    if (!isUseQuery || !totalPages) return
+    if (!isUseQuery || !pagination.totalPages) return
     addQueryToUrl({
       page: pagination.currentPage,
       pageSize: pagination.pageSize
     })
-  }, [pagination, totalPages])
+  }, [pagination, pagination.totalPages])
 
   return (
     <>
@@ -191,7 +174,7 @@ export const DriversGroupsList = (props) => {
                 </tbody>
               ))
             ) : (
-              currentGroups.map(group => (
+              driversGroupsState?.groups?.map(group => (
                 <tbody
                   key={group.id}
                   className={group.id === parseInt(curDriversGroup?.id) ? 'active' : null}
@@ -275,7 +258,7 @@ export const DriversGroupsList = (props) => {
                 {t('ADD_NEW_DRIVER_GROUP', 'Add new driver group')}
               </LinkButton>
             )}
-            {currentGroups?.length > 0 && (
+            {driversGroupsState?.groups?.length > 0 && (
               <Pagination
                 currentPage={pagination.currentPage}
                 totalPages={pagination.totalPages}

package/src/components/Delivery/DriversGroupsListing/index.js

@@ -38,14 +38,15 @@ const DriversGroupsListingUI = (props) => {
     actionDisabled,
     isUseQuery,
     pagination,
-    setPagination
+    setPagination,
+    searchValue,
+    onSearch
   } = props
 
   const history = useHistory()
   const query = new URLSearchParams(useLocation().search)
   const [, t] = useLanguage()
   const [{ isCollapse }, { handleMenuCollapse }] = useInfoShare()
-  const [searchValue, setSearchValue] = useState(null)
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const [confirm, setConfirm] = useState({ open: false, content: null, handleOnAccept: null })
   const [moveDistance, setMoveDistance] = useState(0)
@@ -193,7 +194,7 @@ const DriversGroupsListingUI = (props) => {
             </Button>
             <SearchBar
               lazyLoad
-              onSearch={val => setSearchValue(val)}
+              onSearch={onSearch}
               search={searchValue}
               placeholder={t('SEARCH', 'Search')}
             />

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

@@ -8,7 +8,7 @@ import { OrdersDashboardControls } from '../OrdersDashboardControls'
 import { Alert } from '../../Shared'
 import { DriversManager } from './DriversManager'
 import { DriversLocation } from '../DriversLocation'
-
+import { usePreventDoubleClick } from '../../../utils'
 import {
   MainContentContainer,
   TopContent,
@@ -28,6 +28,8 @@ import { OrderStatusSubFilter } from '../OrderStatusSubFilter'
 import { OrderNotification } from '../OrderNotification'
 import { WizardOrders } from '../WizardOrders'
 
+const DEBOUNCE_DELAY = 300
+
 const OrdersManagerUI = (props) => {
   const {
     isSelectedOrders,
@@ -76,7 +78,7 @@ const OrdersManagerUI = (props) => {
   const [orderDetailId, setOrderDetailId] = useState(null)
   const [filterModalOpen, setFilterModalOpen] = useState(false)
   const [assignedOrders, setAssignedOrders] = useState({ loading: false, error: null, orders: [] })
-
+  const [orderForMap, setOrderForMap] = useState(detailsOrder)
   const [isTourOpen, setIsTourOpen] = useState(false)
   const [currentTourStep, setCurrentTourStep] = useState(0)
   const [isTourFlag, setIsTourFlag] = useState(false)
@@ -94,6 +96,7 @@ const OrdersManagerUI = (props) => {
   const handleBackRedirect = () => {
     setIsOpenOrderDetail(false)
     setDetailsOrder(null)
+    setOrderForMap(null)
     setOrderDetailId(null)
     if (!isSelectedOrders) {
       onOrderRedirect()
@@ -109,13 +112,14 @@ const OrdersManagerUI = (props) => {
     })
   }
 
-  const handleOpenOrderDetail = (order, isKeydown = false) => {
+  const handleOpenOrderDetailBase = (order, isKeydown = false) => {
     if (isTourOpen && currentTourStep === 4 && !isKeydown) {
       setIsTourOpen(false)
       return
     }
     (!configs?.optimize_order_data || (configs?.optimize_order_data?.value === '0')) && setDetailsOrder(order)
     setOrderDetailId(order.id)
+    setOrderForMap((prev) => (prev?.id === order?.id ? null : order))
     // setIsOpenOrderDetail(true)
     if (!isSelectedOrders) {
       onOrderRedirect(order.id)
@@ -132,6 +136,8 @@ const OrdersManagerUI = (props) => {
     }
   }
 
+  const handleOpenOrderDetail = usePreventDoubleClick(handleOpenOrderDetailBase, DEBOUNCE_DELAY)
+
   const handleSetOpenOrderDetail = (state) => {
     setIsOpenOrderDetail(state)
   }
@@ -305,7 +311,7 @@ const OrdersManagerUI = (props) => {
               selectedDriver={mapsData.selectedDriver}
               onlineDrivers={mapsData.onlineDrivers}
               offlineDrivers={mapsData.offlineDrivers}
-              selectedOrder={detailsOrder}
+              selectedOrder={orderForMap}
               assignedOrders={assignedOrders}
             />
           </WrapperDriversLocation>