ordering-ui-admin-external 1.14.3 → 1.15.1

package/_modules/components/CartRecovery/RecoveryActionDetail/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RecoveryActionDetail = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _Shared = require("../../Shared");
 var _reactBootstrap = require("react-bootstrap");
@@ -18,6 +19,7 @@ var _RecoveryNotificationList = require("../RecoveryNotificationList");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -37,6 +39,8 @@ var RecoveryActionDetailUI = function RecoveryActionDetailUI(props) {
     isAddMode = props.isAddMode,
     actionState = props.actionState,
     handleDeleteRecoveryAction = props.handleDeleteRecoveryAction;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -73,7 +77,7 @@ var RecoveryActionDetailUI = function RecoveryActionDetailUI(props) {
     key: 'notifications',
     name: t('NOTIFICATIONS', 'Notifications')
   }];
-  var handleSelectOption = function handleSelectOption(key) {
+  var handleSelectOption = function handleSelectOption(key, isInitialRender) {
     if (key === 'notifications' && isAddMode) {
       setAlertState({
         open: true,
@@ -82,6 +86,10 @@ var RecoveryActionDetailUI = function RecoveryActionDetailUI(props) {
       return;
     }
     setSelectedOption(key);
+    if (!isInitialRender) {
+      var id = query.get('id');
+      history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(key));
+    }
   };
   var closeAlert = function closeAlert() {
     setAlertState({
@@ -115,6 +123,15 @@ var RecoveryActionDetailUI = function RecoveryActionDetailUI(props) {
       content: actionState === null || actionState === void 0 ? void 0 : actionState.error
     });
   }, [actionState]);
+  (0, _react.useEffect)(function () {
+    if (Object.keys(recoveryActionState.action).length === 0) return;
+    var tab = query.get('tab');
+    if (tab) {
+      handleSelectOption(tab, true);
+    } else {
+      handleSelectOption(selectedOption);
+    }
+  }, [recoveryActionState.action]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.RecoveryActionDetailContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.DetailsHeader, null, /*#__PURE__*/_react.default.createElement(_styles2.LeftHeader, null, (((_formState$changes = formState.changes) === null || _formState$changes === void 0 ? void 0 : _formState$changes.name) || (recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$ = recoveryActionState.action) === null || _recoveryActionState$ === void 0 ? void 0 : _recoveryActionState$.name)) && /*#__PURE__*/_react.default.createElement(_styles2.BusinessName, null, (_formState$changes$na = (_formState$changes2 = formState.changes) === null || _formState$changes2 === void 0 ? void 0 : _formState$changes2.name) !== null && _formState$changes$na !== void 0 ? _formState$changes$na : recoveryActionState === null || recoveryActionState === void 0 ? void 0 : (_recoveryActionState$2 = recoveryActionState.action) === null || _recoveryActionState$2 === void 0 ? void 0 : _recoveryActionState$2.name), /*#__PURE__*/_react.default.createElement(_styles.Switch, {
     defaultChecked: typeof ((_formState$changes3 = formState.changes) === null || _formState$changes3 === void 0 ? void 0 : _formState$changes3.enabled) !== 'undefined' ? (_formState$changes4 = formState.changes) === null || _formState$changes4 === void 0 ? void 0 : _formState$changes4.enabled : (_recoveryActionState$3 = (_recoveryActionState$4 = recoveryActionState.action) === null || _recoveryActionState$4 === void 0 ? void 0 : _recoveryActionState$4.enabled) !== null && _recoveryActionState$3 !== void 0 ? _recoveryActionState$3 : false,
     onChange: function onChange(val) {
@@ -141,7 +158,9 @@ var RecoveryActionDetailUI = function RecoveryActionDetailUI(props) {
         return handleSelectOption(option.key);
       }
     }, option.name);
-  })), selectedOption === 'general' && /*#__PURE__*/_react.default.createElement(_RecoveryGeneral.RecoveryGeneral, props), selectedOption === 'notifications' && /*#__PURE__*/_react.default.createElement(_RecoveryNotificationList.RecoveryNotificationList, props)), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+  })), selectedOption === 'general' && /*#__PURE__*/_react.default.createElement(_RecoveryGeneral.RecoveryGeneral, props), selectedOption === 'notifications' && /*#__PURE__*/_react.default.createElement(_RecoveryNotificationList.RecoveryNotificationList, _extends({}, props, {
+    action: recoveryActionState.action
+  }))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('RECOVERY_ACTIONS', 'Recovery actions'),
     content: alertState.content,
     acceptText: t('ACCEPT', 'Accept'),

package/_modules/components/CartRecovery/RecoveryActionListing/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RecoveryActionListing = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _RecoveryActionHeader = require("../RecoveryActionHeader");
 var _RecoveryActionList = require("../RecoveryActionList");
@@ -27,6 +28,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var RecoveryActionListingUI = function RecoveryActionListingUI(props) {
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     isOpenDetail = _useState2[0],
@@ -35,21 +38,37 @@ var RecoveryActionListingUI = function RecoveryActionListingUI(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedAction = _useState4[0],
     setSelectedAction = _useState4[1];
+  var _useState5 = (0, _react.useState)(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectedActionId = _useState6[0],
+    setSelectedActionId = _useState6[1];
   var handleCloseDetail = function handleCloseDetail() {
     setIsOpenDetail(false);
     setSelectedAction(null);
+    history.replace("".concat(location.pathname));
   };
-  var handleOpenDetail = function handleOpenDetail(action) {
+  var handleOpenDetail = function handleOpenDetail(action, isInitialRender) {
     setSelectedAction(action);
+    setSelectedActionId(action === null || action === void 0 ? void 0 : action.id);
     setIsOpenDetail(true);
+    if (action && !isInitialRender) {
+      history.replace("".concat(location.pathname, "?id=").concat(action.id));
+    }
   };
+  (0, _react.useEffect)(function () {
+    var id = query.get('id');
+    if (id) {
+      setSelectedAction({});
+      setSelectedActionId(Number(id));
+      setIsOpenDetail(true);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.RecoveryActionsContainer, null, /*#__PURE__*/_react.default.createElement(_RecoveryActionHeader.RecoveryActionHeader, _extends({}, props, {
     handleOpenDetail: handleOpenDetail
   })), /*#__PURE__*/_react.default.createElement(_RecoveryActionList.RecoveryActionList, _extends({}, props, {
     handleOpenDetail: handleOpenDetail,
     selectedAction: selectedAction
   }))), isOpenDetail && /*#__PURE__*/_react.default.createElement(_Shared.SideBar, {
-    sidebarId: "loyaltyWallet",
     open: isOpenDetail,
     onClose: function onClose() {
       return handleCloseDetail();
@@ -57,6 +76,7 @@ var RecoveryActionListingUI = function RecoveryActionListingUI(props) {
     defaultSideBarWidth: 550
   }, /*#__PURE__*/_react.default.createElement(_RecoveryActionDetail.RecoveryActionDetail, _extends({}, props, {
     action: selectedAction,
+    actionId: selectedActionId,
     onClose: function onClose() {
       return handleCloseDetail();
     }

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

@@ -63,6 +63,7 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
     handleSuccessUpdate = props.handleSuccessUpdate,
     handleSuccessAddUser = props.handleSuccessAddUser,
     handleSuccessDeleteUser = props.handleSuccessDeleteUser;
+  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
@@ -99,6 +100,7 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
     setOpenUser(user);
     setOpenUserAddForm(false);
     setIsOpenUserDetails(true);
+    history.replace("".concat(location.pathname, "?id=").concat(user.id));
   };
   var handleOpenUserAddForm = function handleOpenUserAddForm() {
     var id = query.get('id');

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DriversCompaniesListing = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _InfoShareContext = require("../../../contexts/InfoShareContext");
 var _styles = require("../../../styles");
@@ -39,6 +40,8 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
     selectedCompanyList = props.selectedCompanyList,
     handleAllSelectCompany = props.handleAllSelectCompany,
     handleDeleteSelectedCompanies = props.handleDeleteSelectedCompanies;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -54,24 +57,32 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     curDriversCompany = _useState4[0],
     setCurDriversCompany = _useState4[1];
-  var _useState5 = (0, _react.useState)({
+  var _useState5 = (0, _react.useState)(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    curDriversCompanyId = _useState6[0],
+    setCurDriversCompanyId = _useState6[1];
+  var _useState7 = (0, _react.useState)({
       open: false,
       content: []
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    alertState = _useState6[0],
-    setAlertState = _useState6[1];
-  var _useState7 = (0, _react.useState)({
+    _useState8 = _slicedToArray(_useState7, 2),
+    alertState = _useState8[0],
+    setAlertState = _useState8[1];
+  var _useState9 = (0, _react.useState)({
       open: false,
       content: null,
       handleOnAccept: null
     }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    confirm = _useState8[0],
-    setConfirm = _useState8[1];
-  var handleOpenDetails = function handleOpenDetails(driverCompany) {
+    _useState10 = _slicedToArray(_useState9, 2),
+    confirm = _useState10[0],
+    setConfirm = _useState10[1];
+  var handleOpenDetails = function handleOpenDetails(driverCompany, isInitialRender) {
     setCurDriversCompany(driverCompany);
+    setCurDriversCompanyId(driverCompany === null || driverCompany === void 0 ? void 0 : driverCompany.id);
     setOpenDetails(true);
+    if (!isInitialRender) {
+      history.replace("".concat(location.pathname, "?id=").concat(driverCompany === null || driverCompany === void 0 ? void 0 : driverCompany.id));
+    }
   };
   (0, _react.useEffect)(function () {
     if (!(actionState !== null && actionState !== void 0 && actionState.error)) return;
@@ -92,6 +103,19 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
       }
     });
   };
+  var handleCloseDetails = function handleCloseDetails() {
+    setCurDriversCompany(null);
+    setCurDriversCompanyId(null);
+    setOpenDetails(false);
+    history.replace("".concat(location.pathname));
+  };
+  (0, _react.useEffect)(function () {
+    var id = query.get('id');
+    if (id) {
+      setCurDriversCompanyId(Number(id));
+      setOpenDetails(true);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_styles2.DriversCompaniesListContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderLeftContainer, null, isCollapse && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
     onClick: function onClick() {
@@ -132,16 +156,15 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
     defaultSideBarWidth: 550,
     open: openDetails,
     onClose: function onClose() {
-      setCurDriversCompany(null);
-      setOpenDetails(false);
+      return handleCloseDetails();
     }
   }, /*#__PURE__*/_react.default.createElement(_DriversCompanyDetailsForm.DriversCompanyDetailsForm, {
     driversCompaniesState: driversCompaniesState,
     setDriversCompaniesState: setDriversCompaniesState,
     driversCompany: curDriversCompany,
+    driversCompanyId: curDriversCompanyId,
     onClose: function onClose() {
-      setCurDriversCompany(null);
-      setOpenDetails(false);
+      return handleCloseDetails();
     }
   })), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('WEB_APPNAME', 'Ordering'),

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DriversCompanyDetailsForm = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactBootstrap = require("react-bootstrap");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
@@ -19,6 +20,7 @@ var _styles2 = require("../../../styles");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -31,12 +33,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DriversCompanyDetailsFormUI = function DriversCompanyDetailsFormUI(props) {
-  var _ref, _changesState$name;
-  var driversCompany = props.driversCompany,
+  var _ref, _changesState$name, _companyState$company;
+  var companyState = props.companyState,
     changesState = props.changesState,
     actionState = props.actionState,
     cleanActionState = props.cleanActionState,
     handleDeleteDriversCompany = props.handleDeleteDriversCompany;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -111,10 +115,25 @@ var DriversCompanyDetailsFormUI = function DriversCompanyDetailsFormUI(props) {
       });
     }
   }, [actionState]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.DetailsContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Header, null, /*#__PURE__*/_react.default.createElement("h1", null, driversCompany ? (_ref = (_changesState$name = changesState === null || changesState === void 0 ? void 0 : changesState.name) !== null && _changesState$name !== void 0 ? _changesState$name : driversCompany === null || driversCompany === void 0 ? void 0 : driversCompany.name) !== null && _ref !== void 0 ? _ref : '' : t('DRIVER_COMPANY_SETTINGS', 'Driver company settings')), /*#__PURE__*/_react.default.createElement(_styles.RightHeader, null, width > 576 && /*#__PURE__*/_react.default.createElement(_styles2.IconButton, {
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setCurrentTabItem(tab);
+    if (!isInitialRender) {
+      var id = query.get('id');
+      history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(tab));
+    }
+  };
+  (0, _react.useEffect)(function () {
+    var tab = query.get('tab');
+    if (tab) {
+      handleTabClick(tab, true);
+    } else {
+      handleTabClick(currentTabItem);
+    }
+  }, []);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.DetailsContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Header, null, /*#__PURE__*/_react.default.createElement("h1", null, companyState.company ? (_ref = (_changesState$name = changesState === null || changesState === void 0 ? void 0 : changesState.name) !== null && _changesState$name !== void 0 ? _changesState$name : (_companyState$company = companyState.company) === null || _companyState$company === void 0 ? void 0 : _companyState$company.name) !== null && _ref !== void 0 ? _ref : '' : t('DRIVER_COMPANY_SETTINGS', 'Driver company settings')), /*#__PURE__*/_react.default.createElement(_styles.RightHeader, null, width > 576 && /*#__PURE__*/_react.default.createElement(_styles2.IconButton, {
     color: "black",
     onClick: expandSidebar
-  }, isExpand ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ArrowsAngleContract, null) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ArrowsAngleExpand, null)), driversCompany && /*#__PURE__*/_react.default.createElement(_styles.ActionSelectorWrapper, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.DropdownButton, {
+  }, isExpand ? /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ArrowsAngleContract, null) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ArrowsAngleExpand, null)), companyState.company && /*#__PURE__*/_react.default.createElement(_styles.ActionSelectorWrapper, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.DropdownButton, {
     menuAlign: theme !== null && theme !== void 0 && theme.rtl ? 'left' : 'right',
     title: /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ThreeDots, null),
     id: theme !== null && theme !== void 0 && theme.rtl ? 'dropdown-menu-align-left' : 'dropdown-menu-align-right'
@@ -127,10 +146,16 @@ var DriversCompanyDetailsFormUI = function DriversCompanyDetailsFormUI(props) {
       key: item.key,
       active: item.key === currentTabItem,
       onClick: function onClick() {
-        return setCurrentTabItem(item.key);
+        return handleTabClick(item.key);
       }
     }, item.content);
-  }))), currentTabItem === 'general' && /*#__PURE__*/_react.default.createElement(_DriversCompanyGeneralDetails.DriversCompanyGeneralDetails, props), currentTabItem === 'schedule' && /*#__PURE__*/_react.default.createElement(_DriversCompanyScheduleDetails.DriversCompanyScheduleDetails, props), currentTabItem === 'webhooks' && /*#__PURE__*/_react.default.createElement(_DriversCompanyWebhooksDetails.DriversCompanyWebhooksDetails, props)), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+  }))), currentTabItem === 'general' && /*#__PURE__*/_react.default.createElement(_DriversCompanyGeneralDetails.DriversCompanyGeneralDetails, _extends({}, props, {
+    driversCompany: companyState.company
+  })), currentTabItem === 'schedule' && /*#__PURE__*/_react.default.createElement(_DriversCompanyScheduleDetails.DriversCompanyScheduleDetails, _extends({}, props, {
+    driversCompany: companyState.company
+  })), currentTabItem === 'webhooks' && /*#__PURE__*/_react.default.createElement(_DriversCompanyWebhooksDetails.DriversCompanyWebhooksDetails, _extends({}, props, {
+    driversCompany: companyState.company
+  }))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('ERROR'),
     content: alertState.content,
     acceptText: t('ACCEPT'),

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DriversGroupDetails = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactBootstrap = require("react-bootstrap");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
@@ -43,6 +44,8 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     handleNextTour = props.handleNextTour,
     handleUpdateDriversGroup = props.handleUpdateDriversGroup,
     setIsExtendExtraOpen = props.setIsExtendExtraOpen;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -174,6 +177,22 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
       content: actionState === null || actionState === void 0 ? void 0 : actionState.error
     });
   }, [actionState === null || actionState === void 0 ? void 0 : actionState.error]);
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setShowMenu(tab);
+    if (!isInitialRender) {
+      var id = query.get('id');
+      history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(tab));
+    }
+  };
+  (0, _react.useEffect)(function () {
+    if (driversGroupState.loading) return;
+    var tab = query.get('tab');
+    if (tab) {
+      handleTabClick(tab, true);
+    } else {
+      handleTabClick(showMenu);
+    }
+  }, [driversGroupState.loading]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DetailsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.Header, null, driversGroupState.driversGroup ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h1", null, (_driversGroupState$dr4 = driversGroupState.driversGroup) === null || _driversGroupState$dr4 === void 0 ? void 0 : _driversGroupState$dr4.name), /*#__PURE__*/_react.default.createElement(_styles.Switch, {
     defaultChecked: (_driversGroupState$dr5 = driversGroupState.driversGroup) === null || _driversGroupState$dr5 === void 0 ? void 0 : _driversGroupState$dr5.enabled,
     onChange: function onChange(enabled) {
@@ -200,16 +219,24 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
       key: menu.key,
       active: menu.key === showMenu,
       onClick: function onClick() {
-        return setShowMenu(menu.key);
+        return handleTabClick(menu.key);
       }
     }, menu.value);
   }))), showMenu === 'general' && /*#__PURE__*/_react.default.createElement(_DriversGroupGeneralForm.DriversGroupGeneralForm, _extends({}, props, {
+    curDriversGroup: driversGroupState.driversGroup,
     useAdvanced: useAdvanced,
     setUseAdvanced: setUseAdvanced,
     handleNextClick: handleNextClick
-  })), showMenu === 'businesses' && /*#__PURE__*/_react.default.createElement(_DriversGroupBusinesses.DriversGroupBusinesses, props), showMenu === 'paymethods' && /*#__PURE__*/_react.default.createElement(_DriversGroupPaymethods.DriversGroupPaymethods, props), showMenu === 'advanced_logistics' && /*#__PURE__*/_react.default.createElement(_DriversGroupLogistics.DriversGroupLogistics, props), showMenu === 'logs' && /*#__PURE__*/_react.default.createElement(_DriversGroupLogs.DriversGroupLogs, {
+  })), showMenu === 'businesses' && /*#__PURE__*/_react.default.createElement(_DriversGroupBusinesses.DriversGroupBusinesses, _extends({}, props, {
+    curDriversGroup: driversGroupState.driversGroup
+  })), showMenu === 'paymethods' && /*#__PURE__*/_react.default.createElement(_DriversGroupPaymethods.DriversGroupPaymethods, _extends({}, props, {
+    curDriversGroup: driversGroupState.driversGroup
+  })), showMenu === 'advanced_logistics' && /*#__PURE__*/_react.default.createElement(_DriversGroupLogistics.DriversGroupLogistics, _extends({}, props, {
+    curDriversGroup: driversGroupState.driversGroup
+  })), showMenu === 'logs' && /*#__PURE__*/_react.default.createElement(_DriversGroupLogs.DriversGroupLogs, {
     driversGroupId: (_driversGroupState$dr6 = driversGroupState.driversGroup) === null || _driversGroupState$dr6 === void 0 ? void 0 : _driversGroupState$dr6.id
   }), showMenu === 'delivery_zones' && /*#__PURE__*/_react.default.createElement(_DriversGroupDeliveryDetails.DriverGroupDeliveryDetails, _extends({}, props, {
+    curDriversGroup: driversGroupState.driversGroup,
     handleParentSidebarMove: handleParentSidebarMove,
     drivergroup: driversGroupState.driversGroup,
     setIsExtendExtraOpen: setIsExtendExtraOpen,

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DriversGroupLogistics = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
@@ -30,6 +31,8 @@ var DriversGroupLogistics = function DriversGroupLogistics(props) {
     handleChangesState = props.handleChangesState,
     handleParentSidebarMove = props.handleParentSidebarMove,
     handleUpdateDriversGroup = props.handleUpdateDriversGroup;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -43,12 +46,17 @@ var DriversGroupLogistics = function DriversGroupLogistics(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     openConfig = _useState4[0],
     setOpenConfig = _useState4[1];
-  var handleOpenConfig = function handleOpenConfig(option) {
+  var handleOpenConfig = function handleOpenConfig(option, isInitialRender) {
     setShowConfig(option);
     setOpenConfig(true);
     if (width >= 1200) {
       handleParentSidebarMove(700);
     }
+    if (!isInitialRender) {
+      var id = query.get('id');
+      var tab = query.get('tab');
+      history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(tab, "&config=").concat(option));
+    }
   };
   var handleCloseSidebar = function handleCloseSidebar() {
     handleParentSidebarMove(0);
@@ -65,6 +73,12 @@ var DriversGroupLogistics = function DriversGroupLogistics(props) {
   (0, _react.useEffect)(function () {
     setOpenConfig(false);
   }, [(_driversGroupState$dr = driversGroupState.driversGroup) === null || _driversGroupState$dr === void 0 ? void 0 : _driversGroupState$dr.id]);
+  (0, _react.useEffect)(function () {
+    var config = query.get('config');
+    if (config) {
+      handleOpenConfig(config, true);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_styles2.LogisticsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.OrderStatusWrapper, {
     onClick: function onClick() {
       return handleChangesState({
@@ -86,7 +100,7 @@ var DriversGroupLogistics = function DriversGroupLogistics(props) {
     onClick: function onClick() {
       return handleOpenConfig('GROUP_ORDERS');
     }
-  }, /*#__PURE__*/_react.default.createElement("span", null, t('GROUP_ORDERS', 'Group Orders')), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ChevronRight, null)), /*#__PURE__*/_react.default.createElement(_styles2.LogisticsConfigItem, {
+  }, "a", /*#__PURE__*/_react.default.createElement("span", null, t('GROUP_ORDERS', 'Group Orders')), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ChevronRight, null)), /*#__PURE__*/_react.default.createElement(_styles2.LogisticsConfigItem, {
     active: showConfig === 'AUTOASSIGN_SETTINGS',
     onClick: function onClick() {
       return handleOpenConfig('AUTOASSIGN_SETTINGS');

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

@@ -51,6 +51,7 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     handleDeleteDriversGroup = props.handleDeleteDriversGroup,
     driversCompanyList = props.driversCompanyList;
   var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -89,18 +90,22 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     curDriversGroup = _useState12[0],
     setCurDriversGroup = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
+  var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    isExtendExtraOpen = _useState14[0],
-    setIsExtendExtraOpen = _useState14[1];
+    curDriversGroupId = _useState14[0],
+    setCurDriversGroupId = _useState14[1];
   var _useState15 = (0, _react.useState)(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    isTourOpen = _useState16[0],
-    setIsTourOpen = _useState16[1];
-  var _useState17 = (0, _react.useState)(4),
+    isExtendExtraOpen = _useState16[0],
+    setIsExtendExtraOpen = _useState16[1];
+  var _useState17 = (0, _react.useState)(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    currentTourStep = _useState18[0],
-    setCurrentTourStep = _useState18[1];
+    isTourOpen = _useState18[0],
+    setIsTourOpen = _useState18[1];
+  var _useState19 = (0, _react.useState)(4),
+    _useState20 = _slicedToArray(_useState19, 2),
+    currentTourStep = _useState20[0],
+    setCurrentTourStep = _useState20[1];
   var handleOpenDetails = function handleOpenDetails(driverGroup) {
     setMoveDistance(0);
     setCurDriversGroup(driverGroup);
@@ -109,6 +114,8 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
       setTimeout(function () {
         setCurrentTourStep(5);
       }, 50);
+    } else {
+      history.replace("".concat(location.pathname, "?id=").concat(driverGroup.id));
     }
   };
   (0, _react.useEffect)(function () {
@@ -175,8 +182,19 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var handleCloseDetail = function handleCloseDetail() {
+    setCurDriversGroup(null);
+    setOpenDetails(false);
+    setIsTourOpen(false);
+    history.replace("".concat(location.pathname));
+  };
   (0, _react.useEffect)(function () {
     getDataFromStorage();
+    var id = query.get('id');
+    if (id) {
+      setCurDriversGroupId(Number(id));
+      setOpenDetails(true);
+    }
   }, []);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DriversGroupsListingContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderLeftContainer, null, isCollapse && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
@@ -230,14 +248,13 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     moveDistance: moveDistance,
     noAnimation: isTourOpen,
     onClose: function onClose() {
-      setCurDriversGroup(null);
-      setOpenDetails(false);
-      setIsTourOpen(false);
+      return handleCloseDetail();
     }
   }, /*#__PURE__*/_react.default.createElement(_DriversGroupDetails.DriversGroupDetails, {
     driversGroupsState: driversGroupsState,
     setDriversGroupsState: setDriversGroupsState,
     curDriversGroup: curDriversGroup,
+    driversGroupId: curDriversGroupId,
     driversManagers: driversManagersList === null || driversManagersList === void 0 ? void 0 : driversManagersList.managers,
     businesses: businessesList === null || businessesList === void 0 ? void 0 : businessesList.businesses,
     paymethods: paymethodsList === null || paymethodsList === void 0 ? void 0 : paymethodsList.paymethods,

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.UserDetailsUI = exports.UserDetails = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _styledComponents = require("styled-components");
 var _reactBootstrap = require("react-bootstrap");
@@ -48,6 +49,8 @@ var UserDetailsUI = function UserDetailsUI(props) {
     scheduleState = props.scheduleState,
     handleScheduleState = props.handleScheduleState,
     handleScheduleUpdateUser = props.handleScheduleUpdateUser;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -81,6 +84,26 @@ var UserDetailsUI = function UserDetailsUI(props) {
   (0, _react.useEffect)(function () {
     setExtraOpen(false);
   }, [currentMenuSelected]);
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setCurrentMenuSelected(tab);
+    if (!isInitialRender) {
+      var id = query.get('id');
+      var section = query.get('section');
+      if (section) {
+        history.replace("".concat(location.pathname, "?id=").concat(id, "&section=").concat(section, "&tab=").concat(tab));
+      } else {
+        history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(tab));
+      }
+    }
+  };
+  (0, _react.useEffect)(function () {
+    var tab = query.get('tab');
+    if (tab) {
+      handleTabClick(tab, true);
+    } else {
+      handleTabClick(currentMenuSelected);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles3.DetailsHeader, null, /*#__PURE__*/_react.default.createElement(_styles3.UserName, null, userState !== null && userState !== void 0 && userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 150
   }) : /*#__PURE__*/_react.default.createElement("span", null, (_userState$user = userState.user) === null || _userState$user === void 0 ? void 0 : _userState$user.name, " ", (_userState$user2 = userState.user) === null || _userState$user2 === void 0 ? void 0 : _userState$user2.lastname), userState !== null && userState !== void 0 && userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
@@ -120,7 +143,7 @@ var UserDetailsUI = function UserDetailsUI(props) {
   }, t('DELETE', 'Delete')))))), /*#__PURE__*/_react.default.createElement(_UserDetailsMenu.UserDetailsMenu, {
     isDriverMenu: isDriversPage,
     currentMenuSelected: currentMenuSelected,
-    handleChangeMenu: setCurrentMenuSelected
+    handleChangeMenu: handleTabClick
   }), !(userState !== null && userState !== void 0 && userState.loading) && (userState === null || userState === void 0 ? void 0 : userState.user) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, currentMenuSelected === 'profile' && /*#__PURE__*/_react.default.createElement(_UserProfileForm.UserProfileForm, {
     isDriversPage: isDriversPage,
     isDriversManagersPage: isDriversManagersPage,