ordering-ui-admin-external 1.43.18 → 1.43.19

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

@@ -8,7 +8,6 @@ exports.AllInOne = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
-var _OrdersHeaderFilterGroup = require("../OrdersHeaderFilterGroup");
 var _OrderStatusFilterBar = require("../OrderStatusFilterBar");
 var _OrdersContentHeader = require("../OrdersContentHeader");
 var _OrderDetails = require("../OrderDetails");
@@ -35,6 +34,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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(arr) { if (Array.isArray(arr)) return arr; }
 var OrdersManagerUI = function OrdersManagerUI(props) {
+  var _configState$configs;
   var isSelectedOrders = props.isSelectedOrders,
     searchValue = props.searchValue,
     driverGroupList = props.driverGroupList,
@@ -68,6 +68,12 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
   var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
     _useSession2 = _slicedToArray(_useSession, 1),
     user = _useSession2[0].user;
+  var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
+    _useConfig2 = _slicedToArray(_useConfig, 1),
+    configState = _useConfig2[0];
+  var isSearchFilterValue = ((configState === null || configState === void 0 || (_configState$configs = configState.configs) === null || _configState$configs === void 0 || (_configState$configs = _configState$configs.filter_order_options) === null || _configState$configs === void 0 ? void 0 : _configState$configs.value.split('|').map(function (value) {
+    return value;
+  })) || []).includes('driver_group_general');
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -255,22 +261,19 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setTimeStatus: setTimeStatus,
     setSlaSettingTime: setSlaSettingTime
   }), /*#__PURE__*/_react.default.createElement(_styles.MainContentContainer, null, /*#__PURE__*/_react.default.createElement(_styles.TopContent, null, /*#__PURE__*/_react.default.createElement(_styles.DriversContainer, null, /*#__PURE__*/_react.default.createElement(_DriversManager.DriversManager, {
-    filterValues: filterValues,
-    setMapsData: setMapsData,
-    handleUpdateAssignedOrders: handleUpdateAssignedOrders,
     disableSocketRoomDriver: true,
-    drivers: driversList.drivers,
     showCompressedInfo: true,
-    handleEmtpyOrderSelected: handleBackRedirect
+    filterValues: filterValues,
+    searchFilterValue: searchValue,
+    driverGroupList: driverGroupList,
+    isSearchFilterValue: isSearchFilterValue,
+    drivers: driversList.drivers,
+    setMapsData: setMapsData,
+    handleEmtpyOrderSelected: handleBackRedirect,
+    handleUpdateAssignedOrders: handleUpdateAssignedOrders
   })), /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, {
     showCompressedInfo: true
-  }, /*#__PURE__*/_react.default.createElement(_OrdersHeaderFilterGroup.OrdersHeaderFilterGroup, {
-    driverGroupList: driverGroupList,
-    searchValue: searchValue,
-    driversList: driversList,
-    handleChangeFilterValues: handleChangeFilterValues,
-    handleChangeSearch: handleChangeSearch
-  }), /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
+  }, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
     isUseQuery: isUseQuery,
     selectedOrderStatus: ordersStatusGroup,
     changeOrderStatus: handleOrdersStatusGroupFilter,

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

@@ -8,7 +8,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _DeliveriesLocation = require("../DeliveriesLocation");
 var _OrdersDashboardList = require("../OrdersDashboardList");
-var _OrdersHeaderFilterGroup = require("../OrdersHeaderFilterGroup");
 var _OrderStatusFilterBar = require("../OrderStatusFilterBar");
 var _OrderStatusSubFilter = require("../OrderStatusSubFilter");
 var _styles = require("./styles");
@@ -62,13 +61,7 @@ var DeliveryDashboard = exports.DeliveryDashboard = function DeliveryDashboard(p
       setInterActionMapOrder(_objectSpread({}, order));
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_styles.DeliveryDashboardContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, null, /*#__PURE__*/_react.default.createElement(_OrdersHeaderFilterGroup.OrdersHeaderFilterGroup, {
-    driverGroupList: driverGroupList,
-    searchValue: searchValue,
-    driversList: driversList,
-    handleChangeFilterValues: handleChangeFilterValues,
-    handleChangeSearch: handleChangeSearch
-  }), /*#__PURE__*/_react.default.createElement(_styles.FilterContainer, null, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
+  return /*#__PURE__*/_react.default.createElement(_styles.DeliveryDashboardContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, null, /*#__PURE__*/_react.default.createElement(_styles.FilterContainer, null, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
     isUseQuery: isUseQuery,
     selectedOrderStatus: ordersStatusGroup,
     changeOrderStatus: handleOrdersStatusGroupFilter,

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

@@ -29,11 +29,13 @@ var OrderDashboardSLASettingUI = exports.OrderDashboardSLASettingUI = function O
   var _theme$images$icons, _theme$images$icons2, _theme$images$icons3;
   var settingsState = props.settingsState,
     handleInputChange = props.handleInputChange,
-    handleClickUpdate = props.handleClickUpdate;
+    handleClickUpdate = props.handleClickUpdate,
+    settingOptionOpen = props.settingOptionOpen,
+    setSettingOptionOpen = props.setSettingOptionOpen;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
-  var _useState = (0, _react.useState)(false),
+  var _useState = (0, _react.useState)(settingOptionOpen),
     _useState2 = _slicedToArray(_useState, 2),
     settingOpen = _useState2[0],
     setSettingOpen = _useState2[1];
@@ -91,11 +93,13 @@ var OrderDashboardSLASettingUI = exports.OrderDashboardSLASettingUI = function O
   }];
   var handleCloseSettings = function handleCloseSettings() {
     setSettingOpen(false);
+    setSettingOptionOpen && setSettingOptionOpen(false);
   };
   var onSubmit = function onSubmit(data) {
     if (data && Object.keys(data).length > 0) {
       handleClickUpdate();
       setSettingOpen(false);
+      setSettingOptionOpen && setSettingOptionOpen(false);
     }
   };
   var closeAlert = function closeAlert() {
@@ -127,7 +131,7 @@ var OrderDashboardSLASettingUI = exports.OrderDashboardSLASettingUI = function O
       });
     }
   }, [settingsState === null || settingsState === void 0 ? void 0 : settingsState.result]);
-  return /*#__PURE__*/_react.default.createElement(_styles2.SettingContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
+  return /*#__PURE__*/_react.default.createElement(_styles2.SettingContainer, null, !settingOptionOpen && /*#__PURE__*/_react.default.createElement(_styles.Button, {
     color: "secundary",
     onClick: function onClick() {
       return setSettingOpen(true);

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

@@ -34,7 +34,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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(arr) { if (Array.isArray(arr)) return arr; }
 var OrdersCards = exports.OrdersCards = function OrdersCards(props) {
-  var _configState$configs, _franchisesList$franc, _configState$configs2, _orderList$orders;
+  var _configState$configs, _franchisesList$franc, _orderList$orders;
   var isMessagesView = props.isMessagesView,
     orderList = props.orderList,
     pagination = props.pagination,
@@ -78,13 +78,6 @@ var OrdersCards = exports.OrdersCards = function OrdersCards(props) {
     imageKeys[franchise.id] = franchise.logo;
     return imageKeys;
   }, {}));
-  var filterOptions = (configState === null || configState === void 0 || (_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 || (_configState$configs2 = _configState$configs2.filter_order_options) === null || _configState$configs2 === void 0 ? void 0 : _configState$configs2.value.split('|').map(function (value) {
-    return value;
-  })) || [];
-  var optionsToCheck = ['external_id', 'driver', 'driver_group_general'];
-  var matchingFilterOptions = filterOptions.filter(function (option) {
-    return optionsToCheck.includes(option);
-  }).length;
   var handleChangePage = function handleChangePage(page) {
     getPageOrders(pagination.pageSize, page);
   };
@@ -187,8 +180,8 @@ var OrdersCards = exports.OrdersCards = function OrdersCards(props) {
     }
   }, [orderList === null || orderList === void 0 ? void 0 : orderList.orders]);
   (0, _react.useEffect)(function () {
-    var _configState$configs3;
-    var slaSettings = (configState === null || configState === void 0 || (_configState$configs3 = configState.configs) === null || _configState$configs3 === void 0 || (_configState$configs3 = _configState$configs3.order_deadlines_enabled) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value) === '1';
+    var _configState$configs2;
+    var slaSettings = (configState === null || configState === void 0 || (_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 || (_configState$configs2 = _configState$configs2.order_deadlines_enabled) === null || _configState$configs2 === void 0 ? void 0 : _configState$configs2.value) === '1';
     setAllowColumns(_objectSpread(_objectSpread({}, allowColumns), {}, {
       timer: slaSettings,
       slaBar: slaSettings
@@ -201,9 +194,7 @@ var OrdersCards = exports.OrdersCards = function OrdersCards(props) {
       pageSize: pagination.pageSize
     });
   }, [pagination === null || pagination === void 0 ? void 0 : pagination.currentPage, pagination === null || pagination === void 0 ? void 0 : pagination.pageSize, pagination === null || pagination === void 0 ? void 0 : pagination.total]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.OrdersListContainer, {
-    matchingFilterOptions: matchingFilterOptions
-  }, orderList.loading ? _toConsumableArray(Array(10).keys()).map(function (i) {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.OrdersListContainer, null, orderList.loading ? _toConsumableArray(Array(10).keys()).map(function (i) {
     return /*#__PURE__*/_react.default.createElement(_styles.OrderCard, {
       key: i
     }, /*#__PURE__*/_react.default.createElement(_styles.OrderHeader, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {

package/_modules/components/Orders/OrdersCards/styles.js

@@ -1,5 +1,6 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,35 +9,8 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24;
 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 && Object.prototype.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 _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); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var calculateHeight = function calculateHeight(matchingFilterOptions, customMappings) {
-  var defaultMapping = {
-    3: 'calc(100% - 410px)',
-    2: 'calc(100% - 350px)',
-    1: 'calc(100% - 280px)',
-    default: 'calc(100% - 200px)'
-  };
-  var mappings = _objectSpread(_objectSpread({}, defaultMapping), customMappings);
-  return mappings[matchingFilterOptions] || mappings.default;
-};
-var OrdersListContainer = exports.OrdersListContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: ", ";\n  padding: 0 12px 15px 12px;\n  box-sizing: border-box;\n  overflow-x: hidden;\n\n  @media (min-width: 1024px) and (max-width: 1300px) {\n    height: ", ";\n  }\n"])), function (_ref) {
-  var matchingFilterOptions = _ref.matchingFilterOptions;
-  return calculateHeight(matchingFilterOptions);
-}, function (_ref2) {
-  var matchingFilterOptions = _ref2.matchingFilterOptions;
-  return calculateHeight(matchingFilterOptions, {
-    3: 'calc(100% - 400px)',
-    2: 'calc(100% - 340px)',
-    1: 'calc(100% - 270px)',
-    default: 'calc(100% - 230px)'
-  });
-});
+var OrdersListContainer = exports.OrdersListContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: calc(100% - 200px);\n  padding: 0 12px 15px 12px;\n  box-sizing: border-box;\n  overflow-x: hidden;\n\n  @media (min-width: 1024px) and (max-width: 1300px) {\n    height: calc(100% - 230px);\n  }\n"])));
 var OrderNunberContainer = exports.OrderNunberContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n\n"])));
 var OrderCard = exports.OrderCard = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  position: relative;\n  cursor: pointer;\n  border-radius: 8px;\n  border: 1px solid ", ";\n  margin-bottom: 20px;\n  padding: 15px 20px;\n  padding-left: 25px;\n\n  ", "\n \n\n  &:hover {\n    background-color: ", ";\n  }\n\n  ", "\n\n  p,\n  h2 {\n    color: ", ";\n    margin: 0px;\n  }\n  \n  h2 {\n    font-size: 16px;\n    font-weight: 600;\n  }\n"])), function (props) {
   var _props$theme$colors;
@@ -46,8 +20,8 @@ var OrderCard = exports.OrderCard = _styledComponents.default.div(_templateObjec
   return ((_props$theme = props.theme) === null || _props$theme === void 0 ? void 0 : _props$theme.rtl) && (0, _styledComponents.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    padding-left: 0px;\n    padding-right: 25px;\n "])));
 }, function (props) {
   return props.theme.colors.lightPrimary;
-}, function (_ref3) {
-  var active = _ref3.active;
+}, function (_ref) {
+  var active = _ref.active;
   return active && (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n    background-color: ", ";\n    border: 1px solid ", ";\n  "])), function (props) {
     return props.theme.colors.lightPrimary;
   }, function (props) {
@@ -71,8 +45,8 @@ var InfoItemContainer = exports.InfoItemContainer = _styledComponents.default.di
   var _props$theme$colors2;
   return (_props$theme$colors2 = props.theme.colors) === null || _props$theme$colors2 === void 0 ? void 0 : _props$theme$colors2.headingColor;
 });
-var WrapperImage = exports.WrapperImage = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n  max-width: 45px;\n  max-height: 45px;\n  height: 45px;\n  width: 45px;\n  ", "\n\n  img {\n    width: 100%;\n    height: 100%;\n    border-radius: 7.6px;\n    object-fit: cover;\n  }\n\n  svg {\n    width: 100%;\n    height: 100%;\n    padding: 7px;\n    box-sizing: border-box;\n    border-radius: 50%;\n  }\n"])), function (_ref4) {
-  var isSkeleton = _ref4.isSkeleton;
+var WrapperImage = exports.WrapperImage = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n  max-width: 45px;\n  max-height: 45px;\n  height: 45px;\n  width: 45px;\n  ", "\n\n  img {\n    width: 100%;\n    height: 100%;\n    border-radius: 7.6px;\n    object-fit: cover;\n  }\n\n  svg {\n    width: 100%;\n    height: 100%;\n    padding: 7px;\n    box-sizing: border-box;\n    border-radius: 50%;\n  }\n"])), function (_ref2) {
+  var isSkeleton = _ref2.isSkeleton;
   return !isSkeleton && (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n    border: 1px solid #E3E3E3;\n    border-radius: 10px;\n  "])));
 });
 var CardContent = exports.CardContent = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n\n  @media (min-width: 1300px) {\n    flex-direction: row;\n  }\n"])));
@@ -88,13 +62,13 @@ var UnreadMessageCounter = exports.UnreadMessageCounter = _styledComponents.defa
 var Timestatus = exports.Timestatus = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  position: absolute;\n  width: 4px;\n  height: 130px;\n  border-radius: 20px;\n  left: 10px;\n  top: 17px;\n  ", "\n ", "\n  ", "\n  ", "\n"])), function (props) {
   var _props$theme4;
   return ((_props$theme4 = props.theme) === null || _props$theme4 === void 0 ? void 0 : _props$theme4.rtl) && (0, _styledComponents.css)(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n    left: unset;\n    right: 10px;\n "])));
-}, function (_ref5) {
-  var timeState = _ref5.timeState;
+}, function (_ref3) {
+  var timeState = _ref3.timeState;
   return timeState === 'in_time' && (0, _styledComponents.css)(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["\n    background-color: #00D27A;\n  "])));
-}, function (_ref6) {
-  var timeState = _ref6.timeState;
+}, function (_ref4) {
+  var timeState = _ref4.timeState;
   return timeState === 'at_risk' && (0, _styledComponents.css)(_templateObject23 || (_templateObject23 = _taggedTemplateLiteral(["\n    background-color: #FFC700;\n  "])));
-}, function (_ref7) {
-  var timeState = _ref7.timeState;
+}, function (_ref5) {
+  var timeState = _ref5.timeState;
   return timeState === 'delayed' && (0, _styledComponents.css)(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["\n    background-color: #E63757;\n  "])));
 });

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

@@ -11,13 +11,13 @@ var _Shared = require("../../Shared");
 var _OrdersFilterGroup = require("../OrdersFilterGroup");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _OrdersDashboardSLAControls = require("../OrdersDashboardSLAControls");
-var _OrderDashboardSLASetting = require("../OrderDashboardSLASetting");
 var _styles = require("../../../styles");
 var _InfoShareContext = require("../../../contexts/InfoShareContext");
 var _reactBootstrap = require("react-bootstrap");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 var _GoogleMapsApiKeySettingButton = require("../GoogleMapsApiKeySettingButton");
 var _WebsocketStatus = require("../WebsocketStatus");
+var _OrdersHeaderFilterGroup = require("../OrdersHeaderFilterGroup");
 var _styles2 = require("./styles");
 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 && Object.prototype.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; }
@@ -27,7 +27,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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(arr) { if (Array.isArray(arr)) return arr; }
-var OrdersContentHeader = exports.OrdersContentHeader = /*#__PURE__*/(0, _react.memo)(function (props) {
+var OrdersContentHeader = exports.OrdersContentHeader = function OrdersContentHeader(props) {
   var _configState$configs, _configState$configs2, _configState$configs3;
   var isLateralBar = props.isLateralBar,
     isDisableTitle = props.isDisableTitle,
@@ -78,11 +78,18 @@ var OrdersContentHeader = exports.OrdersContentHeader = /*#__PURE__*/(0, _react.
       return handleOpenTour();
     }
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.LifePreserver, null)))), /*#__PURE__*/_react.default.createElement(_styles2.TopRightSection, {
-    isCustomLayout: isSelectedOrders
-  }, /*#__PURE__*/_react.default.createElement(_WebsocketStatus.WebsocketStatus, null), isShowMapsKeySettingButton && /*#__PURE__*/_react.default.createElement(_GoogleMapsApiKeySettingButton.GoogleMapsApiKeySettingButton, null), (configState === null || configState === void 0 || (_configState$configs3 = configState.configs) === null || _configState$configs3 === void 0 || (_configState$configs3 = _configState$configs3.order_deadlines_enabled) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value) === '1' && /*#__PURE__*/_react.default.createElement(_styles2.SLAControlsWrapper, null, /*#__PURE__*/_react.default.createElement(_OrderDashboardSLASetting.OrderDashboardSLASetting, {
+    isCustomLayout: isSelectedOrders,
+    isCollapse: isCollapse
+  }, /*#__PURE__*/_react.default.createElement(_styles2.WrapperHeaderFilterGroup, null, /*#__PURE__*/_react.default.createElement(_OrdersHeaderFilterGroup.OrdersHeaderFilterGroup, {
+    isSelectedOrders: isSelectedOrders,
+    driverGroupList: driverGroupList,
+    driversList: driversList,
+    searchValue: searchValue,
+    handleChangeFilterValues: handleChangeFilterValues,
+    handleChangeSearch: handleChangeSearch
+  })), /*#__PURE__*/_react.default.createElement(_WebsocketStatus.WebsocketStatus, null), isShowMapsKeySettingButton && /*#__PURE__*/_react.default.createElement(_GoogleMapsApiKeySettingButton.GoogleMapsApiKeySettingButton, null), (configState === null || configState === void 0 || (_configState$configs3 = configState.configs) === null || _configState$configs3 === void 0 || (_configState$configs3 = _configState$configs3.order_deadlines_enabled) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value) === '1' && /*#__PURE__*/_react.default.createElement(_styles2.SLAControlsWrapper, null, /*#__PURE__*/_react.default.createElement(_OrdersDashboardSLAControls.OrdersDashboardSLAControls, {
+    setTimeStatus: setTimeStatus,
     setSlaSettingTime: setSlaSettingTime
-  }), /*#__PURE__*/_react.default.createElement(_OrdersDashboardSLAControls.OrdersDashboardSLAControls, {
-    setTimeStatus: setTimeStatus
   })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperSearchAndFilter, {
     fullWidth: isDisableTitle
   }, isShowSearchFilters && /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
@@ -104,4 +111,4 @@ var OrdersContentHeader = exports.OrdersContentHeader = /*#__PURE__*/(0, _react.
     searchValue: searchValue,
     handleChangeSearch: handleChangeSearch
   })))));
-});
+};

package/_modules/components/Orders/OrdersContentHeader/styles.js

@@ -4,9 +4,9 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperSearchAndFilter = exports.TopRightSection = exports.SLAControlsWrapper = exports.OrderContentHeaderContainer = exports.HeaderTitle = exports.HeaderSection = void 0;
+exports.WrapperSearchAndFilter = exports.WrapperHeaderFilterGroup = exports.TopRightSection = exports.SLAControlsWrapper = exports.OrderContentHeaderContainer = exports.HeaderTitle = exports.HeaderSection = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18;
 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 && Object.prototype.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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -24,23 +24,30 @@ var HeaderSection = exports.HeaderSection = _styledComponents.default.div(_templ
 var HeaderTitle = exports.HeaderTitle = _styledComponents.default.p(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  color: ", ";\n  font-size: 20px;\n  font-weight: bold;\n  margin: 0px;\n  text-transform: capitalize;\n  white-space: nowrap;\n\n  @media (max-width: 560px) {\n    width: calc(100% - 50px);\n  }\n"])), function (props) {
   return props.theme.colors.headingColor;
 });
-var TopRightSection = exports.TopRightSection = _styledComponents.default.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  width: 100%;\n  display: flex;\n  flex-direction: column;\n  flex-wrap: wrap;\n  ", "\n\n  ", "\n\n  @media (min-width: 768px) {\n    flex-direction: row;\n    align-items: center;\n  }\n"])), function (_ref2) {
+var TopRightSection = exports.TopRightSection = _styledComponents.default.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  width: 100%;\n  display: flex;\n  flex-direction: column-reverse;\n  flex-wrap: nowrap;\n  margin: 5px 0px 10px 15px;\n\n  ", "\n\n  ", "\n\n  @media (min-width: 799px) {\n    flex-direction: ", ";\n    align-items: ", ";\n  }\n"])), function (_ref2) {
   var isCustomLayout = _ref2.isCustomLayout;
   return !isCustomLayout && (0, _styledComponents.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n    justify-content: flex-end;\n  "])));
 }, function (_ref3) {
   var isCustomLayout = _ref3.isCustomLayout;
   return isCustomLayout && (0, _styledComponents.css)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n    .websocket-container {\n      padding-bottom: 10px;\n    }\n  "])));
+}, function (_ref4) {
+  var isCustomLayout = _ref4.isCustomLayout;
+  return isCustomLayout ? 'column-reverse' : 'row';
+}, function (_ref5) {
+  var isCustomLayout = _ref5.isCustomLayout;
+  return isCustomLayout ? 'flex-start' : 'center';
 });
-var SLAControlsWrapper = exports.SLAControlsWrapper = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  margin-top: 10px;\n\n  @media (min-width: 768px) {\n    margin-top: 0px;\n  }\n"])));
-var WrapperSearchAndFilter = exports.WrapperSearchAndFilter = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  margin-top: 10px;\n\n  ", "\n\n  input {\n    background: ", ";\n    border: none;\n  }\n\n  > button {\n    ", "\n  }\n\n  @media (min-width: 760px) {\n    margin: 20px 0 10px 0;\n  }\n\n  @media (min-width: 992px) {\n    ", "\n  }\n"])), function (_ref4) {
-  var fullWidth = _ref4.fullWidth;
-  return fullWidth && (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n    width: 100%;\n    > div {\n      width: 100%;\n\n      input {\n        width: 100%;\n      }\n    }\n  "])));
+var WrapperHeaderFilterGroup = exports.WrapperHeaderFilterGroup = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  width: 100%;\n  max-width: 850px\n"])));
+var SLAControlsWrapper = exports.SLAControlsWrapper = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  margin-top: 10px;\n\n  @media (min-width: 768px) {\n    margin-top: 0px;\n  }\n"])));
+var WrapperSearchAndFilter = exports.WrapperSearchAndFilter = _styledComponents.default.div(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  margin-top: 10px;\n\n  ", "\n\n  input {\n    background: ", ";\n    border: none;\n  }\n\n  > button {\n    ", "\n  }\n\n  @media (min-width: 760px) {\n    margin: 20px 0 10px 0;\n  }\n\n  @media (min-width: 992px) {\n    ", "\n  }\n"])), function (_ref6) {
+  var fullWidth = _ref6.fullWidth;
+  return fullWidth && (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n    width: 100%;\n    > div {\n      width: 100%;\n\n      input {\n        width: 100%;\n      }\n    }\n  "])));
 }, function (props) {
   return props.theme.colors.secundary;
 }, function (props) {
   var _props$theme3;
-  return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n      margin-right: 8px;\n    "]))) : (0, _styledComponents.css)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n      margin-left: 8px;\n    "])));
-}, function (_ref5) {
-  var fullWidth = _ref5.fullWidth;
-  return !fullWidth && (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n      margin: 0px;\n    "])));
+  return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n      margin-right: 8px;\n    "]))) : (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n      margin-left: 8px;\n    "])));
+}, function (_ref7) {
+  var fullWidth = _ref7.fullWidth;
+  return !fullWidth && (0, _styledComponents.css)(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["\n      margin: 0px;\n    "])));
 });

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

@@ -8,6 +8,7 @@ exports.OrdersDashboardSLAControls = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _FirstSelect = require("../../../styles/Select/FirstSelect");
+var _OrderDashboardSLASetting = require("../OrderDashboardSLASetting");
 var _styles = require("./styles");
 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 && Object.prototype.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; }
@@ -22,7 +23,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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(arr) { if (Array.isArray(arr)) return arr; }
 var OrdersDashboardSLAControls = exports.OrdersDashboardSLAControls = function OrdersDashboardSLAControls(props) {
-  var setTimeStatus = props.setTimeStatus;
+  var setTimeStatus = props.setTimeStatus,
+    setSlaSettingTime = props.setSlaSettingTime;
   var _useState = (0, _react.useState)('default'),
     _useState2 = _slicedToArray(_useState, 2),
     defaultOptionValue = _useState2[0],
@@ -31,6 +33,10 @@ var OrdersDashboardSLAControls = exports.OrdersDashboardSLAControls = function O
     _useState4 = _slicedToArray(_useState3, 2),
     filteredTimeStatus = _useState4[0],
     setFilteredTimeStatus = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    settingOptionOpen = _useState6[0],
+    setSettingOptionOpen = _useState6[1];
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -66,8 +72,18 @@ var OrdersDashboardSLAControls = exports.OrdersDashboardSLAControls = function O
     }, /*#__PURE__*/_react.default.createElement(_styles.Timestatus, {
       timeState: "delayed"
     }), /*#__PURE__*/_react.default.createElement("p", null, t('DELAYED', 'Delayed')))
+  }, {
+    value: 'sla_settings',
+    name: t('SLA_SETTING', 'SLA’s settings'),
+    content: /*#__PURE__*/_react.default.createElement(_styles.Option, {
+      noPadding: true
+    }, /*#__PURE__*/_react.default.createElement("p", null, t('SLA_SETTING', 'SLA’s settings')))
   }];
   var changeOrderTimeStatus = function changeOrderTimeStatus(val) {
+    if (val === 'sla_settings') {
+      setSettingOptionOpen(true);
+      return;
+    }
     setDefaultOptionValue(val);
     if (val === 'default') {
       setTimeStatus(null);
@@ -98,5 +114,9 @@ var OrdersDashboardSLAControls = exports.OrdersDashboardSLAControls = function O
     isShowSearchBar: true,
     searchBarPlaceholder: t('SEARCH', 'Search'),
     handleChangeSearch: handleChangeSearch
-  })));
+  })), settingOptionOpen && /*#__PURE__*/_react.default.createElement(_OrderDashboardSLASetting.OrderDashboardSLASetting, {
+    setSlaSettingTime: setSlaSettingTime,
+    settingOptionOpen: settingOptionOpen,
+    setSettingOptionOpen: setSettingOptionOpen
+  }));
 };

package/_modules/components/Orders/OrdersDashboardSLAControls/styles.js

@@ -17,7 +17,7 @@ var OrdersDashboardSLAControlsContainer = exports.OrdersDashboardSLAControlsCont
   var _props$theme2;
   return (_props$theme2 = props.theme) !== null && _props$theme2 !== void 0 && _props$theme2.rtl ? (0, _styledComponents.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n        margin-right: 5px;\n      "]))) : (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n        margin-left: 5px;\n      "])));
 });
-var OrderTimeStatusSelectWrapper = exports.OrderTimeStatusSelectWrapper = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  .timeStatusSelect {\n    width: 168px;\n    height: 43px;\n    line-height: 43px;\n    border: none;\n    background: #F8F9FA;\n    margin: 0 10px;\n    >div:first-child {\n      height: 100%;\n    }\n  }\n\n  .list-wrapper {\n    min-width: 168px;\n  }\n\n  .search-bar-container {\n    padding: 7px 11px;\n    width: 100%;\n    input {\n      border-radius: 7.6px;\n      width: 100%;\n    }\n  }\n\n  .search-bar-container {\n    svg {\n      top: 13px;\n    }\n    input {\n      height: 40px;\n    }\n  }\n"])));
+var OrderTimeStatusSelectWrapper = exports.OrderTimeStatusSelectWrapper = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  .timeStatusSelect {\n    width: fit-content;\n    height: 43px;\n    line-height: 43px;\n    border: none;\n    background: #F8F9FA;\n    margin: 0 10px;\n    >div:first-child {\n      height: 100%;\n    }\n  }\n\n  .list-wrapper {\n    min-width: 168px;\n  }\n\n  .search-bar-container {\n    padding: 7px 11px;\n    width: 100%;\n    input {\n      border-radius: 7.6px;\n      width: 100%;\n    }\n  }\n\n  .search-bar-container {\n    svg {\n      top: 13px;\n    }\n    input {\n      height: 40px;\n    }\n  }\n"])));
 var Option = exports.Option = _styledComponents.default.div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  padding: 5px 10px;\n  column-gap: 5px;\n\n  p {\n    margin: 0px;\n    white-space: nowrap;\n    font-size: 14px;\n    line-height: 26px;\n    color: ", ";\n  }\n\n  ", "\n"])), function (props) {
   return props.theme.colors.secundaryContrast;
 }, function (_ref) {

package/_modules/components/Orders/OrdersHeaderFilterGroup/styles.js

@@ -10,14 +10,13 @@ var _templateObject, _templateObject2, _templateObject3;
 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 && Object.prototype.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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var WrapperRow = exports.WrapperRow = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100% !important;\n  flex-direction: column;\n  justify-content: flex-start;\n  padding-top: 10px;\n  padding-bottom: 0px;\n\n  & > div {\n    width: 100%;\n    height: 47px;\n    max-width: 1000px;\n    margin-right: 10px;\n    margin-bottom: 20px;\n    background-color: ", ";\n    border: none;\n    font-size: 14px;\n    border-radius: 8px;\n    > div:first-child {\n      height: 100%;\n    }\n  }\n\n  .order-status-multi-select {\n    p {\n      padding: 0;\n      color: ", " !important;\n    }\n  }\n\n  .date-filter-container {\n    z-index: 100;\n  }\n\n  input {\n    width: 100%;\n    height: 47px;\n    padding: 10px 25px;\n    box-sizing: border-box;\n    &::-webkit-outer-spin-button,\n    &::-webkit-inner-spin-button {\n      -webkit-appearance: none;\n      margin: 0;\n    }\n    -moz-appearance: textfield;\n  }\n\n  .close {\n    right: 8px;\n  }\n\n  .external_id {\n    @media (max-width: 1200px) {\n    flex: auto;\n  }\n\n  }\n\n  @media (min-width: 992px) {\n    flex-direction: row;\n  }\n\n  ", "\n"])), function (props) {
+var WrapperRow = exports.WrapperRow = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  align-items: center;\n  padding-bottom: 0px;\n\n  & > div {\n    width: 100%;\n    height: 47px;\n    max-width: 1000px;\n    margin-right: 10px;\n    background-color: ", ";\n    border: none;\n    font-size: 14px;\n    border-radius: 8px;\n    > div:first-child {\n      height: 100%;\n    }\n  }\n\n  .order-status-multi-select {\n    p {\n      padding: 0;\n      color: ", " !important;\n    }\n  }\n\n  .date-filter-container {\n    z-index: 100;\n  }\n\n  input {\n    width: 100%;\n    height: 47px;\n    padding: 10px 25px;\n    box-sizing: border-box;\n    &::-webkit-outer-spin-button,\n    &::-webkit-inner-spin-button {\n      -webkit-appearance: none;\n      margin: 0;\n    }\n    -moz-appearance: textfield;\n  }\n\n  .close {\n    right: 8px;\n  }\n\n  .external_id {\n    @media (max-width: 1200px) {\n     flex: auto;\n    }\n  }\n\n  @media (max-width: 798px) {\n    flex-direction: column !important;\n    padding: 10px 15px 0 0px;\n    & > div {\n      margin-top: 15px;\n    }\n  }\n\n  ", "\n"])), function (props) {
   return props.theme.colors.secundary;
 }, function (props) {
   return props.theme.colors.headingColor;
 }, function (_ref) {
-  var wrapperWidth = _ref.wrapperWidth,
-    isSelectedOrders = _ref.isSelectedOrders;
-  return wrapperWidth < 992 && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n      flex-direction: column !important;\n      padding: ", ";\n  "])), !isSelectedOrders && '15px 10px 0 10px');
+  var isSelectedOrders = _ref.isSelectedOrders;
+  return isSelectedOrders && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n      flex-direction: column !important;\n      padding: ", ";\n      & > div {\n        margin-top: 15px;\n      }\n  "])), !isSelectedOrders && '10px 15px 0 0px');
 });
 var Option = exports.Option = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  font-weight: 400;\n  font-size: 14px;\n  line-height: 24px;\n  color: ", ";\n  display: flex;\n  align-items: center;\n  padding: 5px;\n"])), function (props) {
   return props.theme.colors.secundaryContrast;

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

@@ -232,13 +232,6 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setTimeStatus: setTimeStatus,
     setSlaSettingTime: setSlaSettingTime,
     isLateralBar: isLateralBar
-  }), /*#__PURE__*/_react.default.createElement(_OrdersHeaderFilterGroup.OrdersHeaderFilterGroup, {
-    isSelectedOrders: isSelectedOrders,
-    driverGroupList: driverGroupList,
-    driversList: driversList,
-    searchValue: searchValue,
-    handleChangeFilterValues: handleChangeFilterValues,
-    handleChangeSearch: handleChangeSearch
   }), /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
     isUseQuery: isUseQuery,
     selectedOrderStatus: ordersStatusGroup,

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

@@ -79,7 +79,7 @@ var SocketStatusUI = function SocketStatusUI(props) {
     onClick: function onClick() {
       return setOpenModal(true);
     }
-  }, /*#__PURE__*/_react.default.createElement(_styles2.StatusContainer, null, /*#__PURE__*/_react.default.createElement("span", null, t('CONNECTION_STATUS', 'Connection status')), /*#__PURE__*/_react.default.createElement(_styles2.WebsocketStatusDot, {
+  }, /*#__PURE__*/_react.default.createElement(_styles2.StatusContainer, null, /*#__PURE__*/_react.default.createElement("span", null, t('CONNECTION', 'Connection')), /*#__PURE__*/_react.default.createElement(_styles2.WebsocketStatusDot, {
     status: socketStatus
   }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
     open: openModal,

package/package.json

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

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

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { useLocation } from 'react-router-dom'
-import { useLanguage, useSession, OrdersManage as OrdersManageController } from 'ordering-components-admin-external'
-import { OrdersHeaderFilterGroup } from '../OrdersHeaderFilterGroup'
+import { useLanguage, useConfig, useSession, OrdersManage as OrdersManageController } from 'ordering-components-admin-external'
 import { OrderStatusFilterBar } from '../OrderStatusFilterBar'
 import { OrdersContentHeader } from '../OrdersContentHeader'
 import { OrderDetails } from '../OrderDetails'
@@ -62,6 +61,9 @@ const OrdersManagerUI = (props) => {
 
   const [, t] = useLanguage()
   const [{ user }] = useSession()
+  const [configState] = useConfig()
+
+  const isSearchFilterValue = (configState?.configs?.filter_order_options?.value.split('|').map(value => (value)) || []).includes('driver_group_general')
 
   const query = new URLSearchParams(useLocation().search)
   const [isOpenOrderDetail, setIsOpenOrderDetail] = useState(false)
@@ -221,23 +223,19 @@ const OrdersManagerUI = (props) => {
           <TopContent>
             <DriversContainer>
               <DriversManager
-                filterValues={filterValues}
-                setMapsData={setMapsData}
-                handleUpdateAssignedOrders={handleUpdateAssignedOrders}
                 disableSocketRoomDriver
-                drivers={driversList.drivers}
                 showCompressedInfo
+                filterValues={filterValues}
+                searchFilterValue={searchValue}
+                driverGroupList={driverGroupList}
+                isSearchFilterValue={isSearchFilterValue}
+                drivers={driversList.drivers}
+                setMapsData={setMapsData}
                 handleEmtpyOrderSelected={handleBackRedirect}
+                handleUpdateAssignedOrders={handleUpdateAssignedOrders}
               />
             </DriversContainer>
             <OrdersContainer showCompressedInfo>
-              <OrdersHeaderFilterGroup
-                driverGroupList={driverGroupList}
-                searchValue={searchValue}
-                driversList={driversList}
-                handleChangeFilterValues={handleChangeFilterValues}
-                handleChangeSearch={handleChangeSearch}
-              />
               <OrderStatusFilterBar
                 isUseQuery={isUseQuery}
                 selectedOrderStatus={ordersStatusGroup}

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

@@ -2,7 +2,6 @@ import React, { useState } from 'react'
 import { useConfig } from 'ordering-components-admin-external'
 import { DeliveriesLocation } from '../DeliveriesLocation'
 import { OrdersDashboardList } from '../OrdersDashboardList'
-import { OrdersHeaderFilterGroup } from '../OrdersHeaderFilterGroup'
 import { OrderStatusFilterBar } from '../OrderStatusFilterBar'
 import { OrderStatusSubFilter } from '../OrderStatusSubFilter'
 
@@ -57,13 +56,6 @@ export const DeliveryDashboard = (props) => {
   return (
     <DeliveryDashboardContainer>
       <OrdersContainer>
-        <OrdersHeaderFilterGroup
-          driverGroupList={driverGroupList}
-          searchValue={searchValue}
-          driversList={driversList}
-          handleChangeFilterValues={handleChangeFilterValues}
-          handleChangeSearch={handleChangeSearch}
-        />
         <FilterContainer>
           <OrderStatusFilterBar
             isUseQuery={isUseQuery}