ordering-ui-admin-external 1.14.3 → 1.15.1

package/_modules/components/Stores/ProductExtras/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProductExtras = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 var _styles = require("../../../styles");
@@ -51,6 +52,8 @@ var ProductExtrasUI = function ProductExtrasUI(props) {
     handleDrop = props.handleDrop,
     handleDragEnd = props.handleDragEnd,
     handleUpdateExtraState = props.handleUpdateExtraState;
+  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),
@@ -89,16 +92,27 @@ var ProductExtrasUI = function ProductExtrasUI(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     isCheckboxClicked = _useState12[0],
     setIsCheckboxClicked = _useState12[1];
-  var handleOpenExtraDetails = function handleOpenExtraDetails(e, extra) {
-    if (e.target.closest('.extra-checkbox') || e.target.closest('.draggable-dots')) return;
+  var handleOpenExtraDetails = function handleOpenExtraDetails(e, extra, isInitialRender) {
+    var _e$target, _e$target2;
+    if (e !== null && e !== void 0 && (_e$target = e.target) !== null && _e$target !== void 0 && _e$target.closest('.extra-checkbox') || e !== null && e !== void 0 && (_e$target2 = e.target) !== null && _e$target2 !== void 0 && _e$target2.closest('.draggable-dots')) return;
     setIsExtendExtraOpen(true);
     setCurrentExtra(extra);
     setOpenExtraDetails(true);
+    if (!isInitialRender) {
+      var category = query.get('category');
+      var product = query.get('product');
+      var section = query.get('section');
+      history.replace("".concat(location.pathname, "?category=").concat(category, "&product=").concat(product, "&section=").concat(section, "&extra=").concat(extra.id));
+    }
   };
   var handleCloseExtraDetails = function handleCloseExtraDetails() {
     setOpenExtraDetails(false);
     setIsExtendExtraOpen(false);
     setCurrentExtra(null);
+    var category = query.get('category');
+    var product = query.get('product');
+    var section = query.get('section');
+    history.replace("".concat(location.pathname, "?category=").concat(category, "&product=").concat(product, "&section=").concat(section));
   };
   var addExtraListener = function addExtraListener(e) {
     var _conatinerRef$current;
@@ -154,6 +168,15 @@ var ProductExtrasUI = function ProductExtrasUI(props) {
       });
     }
   }, [productState, extrasState]);
+  (0, _react.useEffect)(function () {
+    var extraId = query.get('extra');
+    if (extraId) {
+      var initExtra = extrasState === null || extrasState === void 0 ? void 0 : extrasState.extras.find(function (extra) {
+        return extra.id === Number(extraId);
+      });
+      initExtra && handleOpenExtraDetails(null, initExtra, true);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_styles2.MainContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.ProductExtrasContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.Header, null, /*#__PURE__*/_react.default.createElement("h1", null, t('PRODUCT_OPTIONS', 'Product options')), /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "8px",
     color: "lightPrimary",

package/_modules/components/Stores/ProductIngredient/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProductIngredient = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 var _styles = require("../../../styles");
@@ -25,6 +26,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var ProductIngredient = function ProductIngredient(props) {
   var product = props.product,
     setIsExtendExtraOpen = props.setIsExtendExtraOpen;
+  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];
@@ -38,16 +41,35 @@ var ProductIngredient = function ProductIngredient(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     currentIngredient = _useState4[0],
     setCurrentIngredient = _useState4[1];
-  var handleOpenIngredient = function handleOpenIngredient(ingredient) {
+  var handleOpenIngredient = function handleOpenIngredient(ingredient, isInitialRender) {
     setCurrentIngredient(ingredient);
     setIsExtendExtraOpen(true);
     setOpenDetails(true);
+    if (!isInitialRender) {
+      var category = query.get('category');
+      var _product = query.get('product');
+      var section = query.get('section');
+      history.replace("".concat(location.pathname, "?category=").concat(category, "&product=").concat(_product, "&section=").concat(section, "&ingredient=").concat(ingredient.id));
+    }
   };
   var handleCloseDetails = function handleCloseDetails() {
     setOpenDetails(false);
     setIsExtendExtraOpen(false);
     setCurrentIngredient(null);
+    var category = query.get('category');
+    var product = query.get('product');
+    var section = query.get('section');
+    history.replace("".concat(location.pathname, "?category=").concat(category, "&product=").concat(product, "&section=").concat(section));
   };
+  (0, _react.useEffect)(function () {
+    var ingredientId = query.get('ingredient');
+    if (ingredientId) {
+      var initIngredient = product.ingredients.find(function (ingredient) {
+        return ingredient.id === Number(ingredientId);
+      });
+      initIngredient && handleOpenIngredient(initIngredient, true);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_styles2.MainContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.IngredientContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.Header, null, /*#__PURE__*/_react.default.createElement("h1", null, t('INGREDIENTS', 'Ingredients'), " / ", t('PROPERTIES', 'Properties')), /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "8px",
     color: "lightPrimary",

package/_modules/components/Stores/ProductMainDetails/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProductMainDetails = 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 _SeoOptions = require("../SeoOptions");
@@ -40,6 +41,8 @@ var ProductMainDetails = function ProductMainDetails(props) {
     fees = props.fees,
     setFees = props.setFees,
     cleanFormState = props.cleanFormState;
+  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];
@@ -60,10 +63,24 @@ var ProductMainDetails = function ProductMainDetails(props) {
     key: 'seo_options',
     content: t('SEO_OPTIONS', 'SEO options')
   }];
-  var handleSelectOption = function handleSelectOption(tab) {
+  var handleSelectOption = function handleSelectOption(tab, isInitialRender) {
     setSelectedOption(tab);
     setIsExtendExtraOpen(false);
+    if (!isInitialRender) {
+      var category = query.get('category');
+      var _product = query.get('product');
+      var section = query.get('section');
+      history.replace("".concat(location.pathname, "?category=").concat(category, "&product=").concat(_product, "&section=").concat(section, "&tab=").concat(tab));
+    }
   };
+  (0, _react.useEffect)(function () {
+    var tab = query.get('tab');
+    if (tab) {
+      handleSelectOption(tab, true);
+    } else {
+      handleSelectOption(selectedOption);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_styles.Container, {
     maxLimit: isExtendExtraOpen
   }, /*#__PURE__*/_react.default.createElement("h1", null, t('PRODUCT_DETAILS', 'Product details')), /*#__PURE__*/_react.default.createElement(_styles.TabsConatiner, null, /*#__PURE__*/_react.default.createElement(_Shared.DragScroll, null, listOptions.map(function (option) {

package/_modules/components/Stores/ProductTagsList/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProductTagsList = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _Shared = require("../../Shared");
@@ -44,6 +45,8 @@ var ProductTagsListUI = function ProductTagsListUI(props) {
     handleChangeProductTag = props.handleChangeProductTag,
     handleSelectNoneTags = props.handleSelectNoneTags,
     handleSelectAllTags = props.handleSelectAllTags;
+  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];
@@ -55,18 +58,41 @@ var ProductTagsListUI = function ProductTagsListUI(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isOpenTagDetail = _useState4[0],
     setIsOpenTagDetail = _useState4[1];
-  var handleOpenProductTagDetail = function handleOpenProductTagDetail(e, tag) {
-    var isInvalid = e.target.closest('.product-tag-checkbox');
+  var handleOpenProductTagDetail = function handleOpenProductTagDetail(e, tag, isInitialRender) {
+    var _e$target;
+    var isInvalid = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.closest('.product-tag-checkbox');
     if (isInvalid) return;
     setSelectedTag(tag);
     setIsExtendExtraOpen(true);
     setIsOpenTagDetail(true);
+    if (!isInitialRender) {
+      var category = query.get('category');
+      var product = query.get('product');
+      var section = query.get('section');
+      var tab = query.get('tab');
+      history.replace("".concat(location.pathname, "?category=").concat(category, "&product=").concat(product, "&section=").concat(section, "&tab=").concat(tab, "&tag=").concat(tag.id));
+    }
   };
   var handleCloseDetail = function handleCloseDetail() {
     setIsOpenTagDetail(false);
     setIsExtendExtraOpen(false);
     setSelectedTag(null);
+    var category = query.get('category');
+    var product = query.get('product');
+    var section = query.get('section');
+    var tab = query.get('tab');
+    history.replace("".concat(location.pathname, "?category=").concat(category, "&product=").concat(product, "&section=").concat(section, "&tab=").concat(tab));
   };
+  (0, _react.useEffect)(function () {
+    if (tagsState.loading) return;
+    var tagId = query.get('tag');
+    if (tagId) {
+      var initTag = tagsState.tags.find(function (tag) {
+        return tag.id === Number(tagId);
+      });
+      handleOpenProductTagDetail(null, initTag, true);
+    }
+  }, [tagsState.loading]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.TagsListContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.SearchBarWrapper, null, /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
     isCustomLayout: true,
     lazyLoad: true,

package/_modules/components/Users/CustomerCashWallet/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CustomerCashWallet = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _CustomerCashWalletDetails = require("../CustomerCashWalletDetails");
 var _CustomerWalletEvents = require("../CustomerWalletEvents");
@@ -24,6 +25,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 CustomerCashWalletUI = function CustomerCashWalletUI(props) {
+  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];
@@ -31,15 +34,32 @@ var CustomerCashWalletUI = function CustomerCashWalletUI(props) {
     _useState2 = _slicedToArray(_useState, 2),
     showOption = _useState2[0],
     setShowOption = _useState2[1];
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setShowOption(tab);
+    if (!isInitialRender) {
+      var enabled = query.get('enabled');
+      var id = query.get('id');
+      var section = query.get('section');
+      history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(id, "&section=").concat(section, "&tab=").concat(tab));
+    }
+  };
+  (0, _react.useEffect)(function () {
+    var tab = query.get('tab');
+    if (tab) {
+      handleTabClick(tab, true);
+    } else {
+      handleTabClick(showOption);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_styles.Container, null, /*#__PURE__*/_react.default.createElement("h1", null, t('CASH_WALLET', 'Cash wallet')), /*#__PURE__*/_react.default.createElement(_styles.Tabs, null, /*#__PURE__*/_react.default.createElement(_styles.Tab, {
     active: showOption === 'cash_wallet',
     onClick: function onClick() {
-      return setShowOption('cash_wallet');
+      return handleTabClick('cash_wallet');
     }
   }, t('CASH_WALLET', 'Cash wallet')), /*#__PURE__*/_react.default.createElement(_styles.Tab, {
     active: showOption === 'history',
     onClick: function onClick() {
-      return setShowOption('history');
+      return handleTabClick('history');
     }
   }, t('TRANSACTION_HISTORY', 'Transaction history'))), showOption === 'cash_wallet' && /*#__PURE__*/_react.default.createElement(_CustomerCashWalletDetails.CustomerCashWalletDetails, props), showOption === 'history' && /*#__PURE__*/_react.default.createElement(_CustomerWalletEvents.CustomerWalletEvents, props));
 };

package/_modules/components/Users/CustomerDetails/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CustomerDetails = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _styledComponents = require("styled-components");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
@@ -38,6 +39,8 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
     handleDeleteUser = props.handleDeleteUser,
     handleParentSidebarMove = props.handleParentSidebarMove,
     handleChangeActiveUser = props.handleChangeActiveUser;
+  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),
@@ -96,16 +99,24 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
       }
     });
   };
-  var handleClickMenu = function handleClickMenu(key) {
+  var handleClickMenu = function handleClickMenu(key, isInitialRender) {
     setShowOption(key);
     handleParentSidebarMove(500);
     setIsOpenMenu(true);
+    if (!isInitialRender) {
+      var enabled = query.get('enabled');
+      var id = query.get('id');
+      history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(id, "&section=").concat(key));
+    }
   };
   var handleCloseMenu = function handleCloseMenu() {
     handleParentSidebarMove(0);
     setShowOption(null);
     setIsOpenMenu(false);
     setMenuMoveDistance(0);
+    var enabled = query.get('enabled');
+    var id = query.get('id');
+    history.replace("".concat(location.pathname, "?eanbled=").concat(enabled, "&id=").concat(id));
   };
   var expandSidebar = function expandSidebar() {
     var element = document.getElementById('customer_details');
@@ -122,6 +133,13 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
   (0, _react.useEffect)(function () {
     if (isOpenMenu) setIsExpand(false);
   }, [isOpenMenu]);
+  (0, _react.useEffect)(function () {
+    if (userState.loading) return;
+    var section = query.get('section');
+    if (section) {
+      handleClickMenu(section, true);
+    }
+  }, [userState.loading]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DetailsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.LeftHeader, null, /*#__PURE__*/_react.default.createElement(_styles2.UserName, null, userState !== null && userState !== void 0 && userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 150
   }) : /*#__PURE__*/_react.default.createElement("span", {

package/_modules/components/Users/CustomerPointsWallet/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CustomerPointsWallet = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _styledComponents = require("styled-components");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
@@ -29,6 +30,8 @@ var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
   var _walletState$wallet, _user$loyalty_level$i, _user$loyalty_level, _user$loyalty_level2;
   var walletState = props.walletState,
     user = props.user;
+  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];
@@ -37,15 +40,32 @@ var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
     _useState2 = _slicedToArray(_useState, 2),
     showOption = _useState2[0],
     setShowOption = _useState2[1];
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setShowOption(tab);
+    if (!isInitialRender) {
+      var enabled = query.get('enabled');
+      var id = query.get('id');
+      var section = query.get('section');
+      history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(id, "&section=").concat(section, "&tab=").concat(tab));
+    }
+  };
+  (0, _react.useEffect)(function () {
+    var tab = query.get('tab');
+    if (tab) {
+      handleTabClick(tab, true);
+    } else {
+      handleTabClick(showOption);
+    }
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_styles.Container, null, /*#__PURE__*/_react.default.createElement("h1", null, t('POINTS_WALLET', 'Points wallet')), /*#__PURE__*/_react.default.createElement(_styles.Tabs, null, /*#__PURE__*/_react.default.createElement(_styles.Tab, {
     active: showOption === 'points_wallet',
     onClick: function onClick() {
-      return setShowOption('points_wallet');
+      return handleTabClick('points_wallet');
     }
   }, t('POINTS_WALLET', 'Points wallet')), /*#__PURE__*/_react.default.createElement(_styles.Tab, {
     active: showOption === 'history',
     onClick: function onClick() {
-      return setShowOption('history');
+      return handleTabClick('history');
     }
   }, t('TRANSACTION_HISTORY', 'Transaction history'))), showOption === 'points_wallet' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, walletState !== null && walletState !== void 0 && walletState.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.PointsWalletContainer, null, /*#__PURE__*/_react.default.createElement(_styles.PointsWrapper, null, /*#__PURE__*/_react.default.createElement("h2", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 70,

package/_modules/components/Users/CustomersListing/index.js

@@ -50,7 +50,6 @@ var CustomersListingUI = function CustomersListingUI(props) {
     handleSelectedUsers = props.handleSelectedUsers,
     deleteUsersActionState = props.deleteUsersActionState,
     handleDeleteSeveralUsers = props.handleDeleteSeveralUsers,
-    onUserRedirect = props.onUserRedirect,
     handleSuccessUpdate = props.handleSuccessUpdate,
     handleSuccessAddUser = props.handleSuccessAddUser,
     handleSuccessDeleteUser = props.handleSuccessDeleteUser,
@@ -62,6 +61,7 @@ var CustomersListingUI = function CustomersListingUI(props) {
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
+  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
@@ -101,10 +101,12 @@ var CustomersListingUI = function CustomersListingUI(props) {
     setOpenUser(null);
     setQueryId(null);
     moveDistance && setMoveDistance(0);
-    onUserRedirect();
+    var enabled = selectedUserActiveState ? 'active' : 'inactive';
+    history.replace("".concat(location.pathname, "?enabled=").concat(enabled));
   };
   var handleOpenUserDetails = function handleOpenUserDetails(user) {
-    onUserRedirect(user === null || user === void 0 ? void 0 : user.id);
+    var enabled = selectedUserActiveState ? 'active' : 'inactive';
+    history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(user === null || user === void 0 ? void 0 : user.id));
     setOpenUser(user);
     setOpenUserAddForm(false);
     setIsOpenUserDetails(true);
@@ -219,7 +221,10 @@ var CustomersListingUI = function CustomersListingUI(props) {
   })));
 };
 var CustomersListing = function CustomersListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultUserActiveState = query.get('enabled') !== 'inactive';
   var customersProps = _objectSpread(_objectSpread({}, props), {}, {
+    defaultUserActiveState: defaultUserActiveState,
     UIComponent: CustomersListingUI,
     isSearchByUserEmail: true,
     isSearchByUserPhone: true,

package/_modules/components/Users/ProfessionalDetail/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProfessionalDetailUI = exports.ProfessionalDetail = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _reactBootstrap = require("react-bootstrap");
@@ -44,6 +45,8 @@ var ProfessionalDetailUI = function ProfessionalDetailUI(props) {
     handleChangeActiveUser = props.handleChangeActiveUser,
     handleGoogleCalendarSync = props.handleGoogleCalendarSync,
     actionStatus = props.actionStatus;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
     _useSession2 = _slicedToArray(_useSession, 1),
@@ -120,6 +123,27 @@ var ProfessionalDetailUI = function ProfessionalDetailUI(props) {
       });
     }
   }, [actionStatus.error]);
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setCurrentMenuSelected(tab);
+    if (!isInitialRender) {
+      var id = query.get('id');
+      var enabled = query.get('enabled');
+      var section = query.get('section');
+      if (section) {
+        history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(id, "&section=").concat(section, "&tab=").concat(tab));
+      } else {
+        history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&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(_styles2.DetailsHeader, null, /*#__PURE__*/_react.default.createElement(_styles2.UserName, null, userState !== null && userState !== void 0 && userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 150
   }) : /*#__PURE__*/_react.default.createElement("span", {
@@ -161,7 +185,7 @@ var ProfessionalDetailUI = function ProfessionalDetailUI(props) {
     }
   }, t('DELETE', 'Delete')))))), /*#__PURE__*/_react.default.createElement(_UserDetailsMenu.UserDetailsMenu, {
     currentMenuSelected: currentMenuSelected,
-    handleChangeMenu: setCurrentMenuSelected,
+    handleChangeMenu: handleTabClick,
     isProfessional: true
   }), !(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, {
     user: userState.user,

package/_modules/components/Users/ProfessionalListing/index.js

@@ -51,7 +51,6 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
     handleSelectedUsers = props.handleSelectedUsers,
     deleteUsersActionState = props.deleteUsersActionState,
     handleDeleteSeveralUsers = props.handleDeleteSeveralUsers,
-    onUserRedirect = props.onUserRedirect,
     handleSuccessUpdate = props.handleSuccessUpdate,
     handleSuccessAddUser = props.handleSuccessAddUser,
     handleSuccessDeleteUser = props.handleSuccessDeleteUser,
@@ -67,6 +66,7 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configs = _useConfig2[0].configs;
+  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
@@ -89,10 +89,12 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
     setIsOpenUserDetails(false);
     setOpenUser(null);
     setQueryId(null);
-    onUserRedirect();
+    var enabled = selectedUserActiveState ? 'active' : 'inactive';
+    history.replace("".concat(location.pathname, "?enabled=").concat(enabled));
   };
   var handleOpenUserDetails = function handleOpenUserDetails(user) {
-    onUserRedirect(user === null || user === void 0 ? void 0 : user.id);
+    var enabled = selectedUserActiveState ? 'active' : 'inactive';
+    history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(user === null || user === void 0 ? void 0 : user.id));
     setOpenUser(user);
     setOpenUserAddForm(false);
     setIsOpenUserDetails(true);
@@ -189,7 +191,10 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
   })));
 };
 var ProfessionalListing = function ProfessionalListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultUserActiveState = query.get('enabled') !== 'inactive';
   var usersListingProps = _objectSpread(_objectSpread({}, props), {}, {
+    defaultUserActiveState: defaultUserActiveState,
     isProfessional: true,
     UIComponent: ProfessionalListingUI,
     isSearchByUserEmail: true,

package/_modules/components/Users/UserActiveStateFilter/index.js

@@ -1,14 +1,17 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UserActiveStateFilter = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _Shared = require("../../Shared");
 var _styles = require("./styles");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,18 +21,29 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var UserActiveStateFilter = function UserActiveStateFilter(props) {
   var selectedUserActiveState = props.selectedUserActiveState,
     handleChangeUserActiveState = props.handleChangeUserActiveState;
+  var history = (0, _reactRouterDom.useHistory)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultEnabled = query.get('enabled');
+  var onChangeUserActiveState = function onChangeUserActiveState(enabled) {
+    history.replace("".concat(location.pathname, "?enabled=").concat(enabled));
+    handleChangeUserActiveState();
+  };
+  (0, _react.useEffect)(function () {
+    if (defaultEnabled) return;
+    history.replace("".concat(location.pathname, "?enabled=active"));
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.UserActiveStateFilterContainer, null, /*#__PURE__*/_react.default.createElement(_Shared.DragScroll, null, /*#__PURE__*/_react.default.createElement(_styles.Tab, {
     active: selectedUserActiveState,
     onClick: function onClick() {
-      return handleChangeUserActiveState();
+      return onChangeUserActiveState('active');
     }
   }, t('ACTIVE', 'Active')), /*#__PURE__*/_react.default.createElement(_styles.Tab, {
     active: !selectedUserActiveState,
     onClick: function onClick() {
-      return handleChangeUserActiveState();
+      return onChangeUserActiveState('inactive');
     }
   }, t('INACTIVE', 'Inactive')))));
 };

package/_modules/components/Users/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 _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _UserDetailsMenu = require("../UserDetailsMenu");
@@ -43,6 +44,8 @@ var UserDetailsUI = function UserDetailsUI(props) {
     handleSuccessUserUpdate = props.handleSuccessUserUpdate,
     handleDeleteUser = props.handleDeleteUser,
     handleChangeActiveUser = props.handleChangeActiveUser;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
     _useSession2 = _slicedToArray(_useSession, 1),
@@ -88,6 +91,27 @@ var UserDetailsUI = function UserDetailsUI(props) {
   (0, _react.useEffect)(function () {
     setExtraOpen(false);
   }, [currentMenuSelected]);
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setCurrentMenuSelected(tab);
+    if (!isInitialRender) {
+      var enabled = query.get('enabled');
+      var id = query.get('id');
+      var section = query.get('section');
+      if (section) {
+        history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(id, "&section=").concat(section, "&tab=").concat(tab));
+      } else {
+        history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&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(_styles2.DetailsHeader, null, /*#__PURE__*/_react.default.createElement(_styles2.UserName, null, userState !== null && userState !== void 0 && userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     width: 150
   }) : /*#__PURE__*/_react.default.createElement("span", {
@@ -120,7 +144,9 @@ var UserDetailsUI = function UserDetailsUI(props) {
     }
   }, t('DELETE', 'Delete'))))))), /*#__PURE__*/_react.default.createElement(_UserDetailsMenu.UserDetailsMenu, {
     currentMenuSelected: currentMenuSelected,
-    handleChangeMenu: setCurrentMenuSelected,
+    handleChangeMenu: function handleChangeMenu(tab) {
+      return handleTabClick(tab);
+    },
     isBusinessOwner: (userState === null || userState === void 0 ? void 0 : (_userState$user8 = userState.user) === null || _userState$user8 === void 0 ? void 0 : _userState$user8.level) === 2
   }), !(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, {
     user: userState.user,