ordering-ui-admin-external 1.33.1 → 1.35.0

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

@@ -10,6 +10,7 @@ var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _CustomerCashWalletDetails = require("../CustomerCashWalletDetails");
 var _CustomerWalletEvents = require("../CustomerWalletEvents");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 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; }
@@ -25,7 +26,6 @@ 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),
@@ -37,10 +37,9 @@ var CustomerCashWalletUI = function CustomerCashWalletUI(props) {
   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, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -16,6 +16,7 @@ var _UserDetails = require("../UserDetails");
 var _CustomerCashWallet = require("../CustomerCashWallet");
 var _Shared = require("../../Shared");
 var _styles = require("../../../styles");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 var _CustomerPointsWallet = require("../CustomerPointsWallet");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
@@ -34,13 +35,13 @@ 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 CustomerDetailsUI = function CustomerDetailsUI(props) {
-  var _userState$user, _userState$user2, _userState$user3, _userState$user4, _userState$user5, _userState$user6, _userState$user7, _userState$user8, _userState$user9, _userState$user10;
+  var _userState$user, _userState$user2, _userState$user3, _userState$user4, _userState$user5, _userState$user6, _userState$user7, _userState$user8, _userState$user9;
   var userState = props.userState,
     handleDeleteUser = props.handleDeleteUser,
     handleParentSidebarMove = props.handleParentSidebarMove,
     handleChangeActiveUser = props.handleChangeActiveUser,
-    setSideBarWidth = props.setSideBarWidth;
-  var history = (0, _reactRouterDom.useHistory)();
+    setSideBarWidth = props.setSideBarWidth,
+    userId = props.userId;
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -51,6 +52,7 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
     optimizeImage = _useUtils2[0].optimizeImage;
   var _useWindowSize = (0, _useWindowSize2.useWindowSize)(),
     width = _useWindowSize.width;
+  var firstRender = (0, _react.useRef)(true);
   var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
     showOption = _useState2[0],
@@ -106,10 +108,11 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
     handleParentSidebarMove(isExpand ? width / 2 : 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));
+      (0, _utils.addQueryToUrl)({
+        section: key
+      });
     }
+    firstRender.current = false;
   };
   var handleCloseMenu = function handleCloseMenu() {
     setSideBarWidth(isExpand ? width : 500);
@@ -117,9 +120,7 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
     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));
+    (0, _utils.removeQueryToUrl)(['section', 'tab']);
   };
   var expandSidebar = function expandSidebar() {
     var element = document.getElementById('customer_details');
@@ -129,10 +130,13 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
     });
   };
   (0, _react.useEffect)(function () {
+    if (firstRender.current) return;
     handleParentSidebarMove(0);
     setIsOpenMenu(false);
     setShowOption(null);
-  }, [userState === null || userState === void 0 || (_userState$user = userState.user) === null || _userState$user === void 0 ? void 0 : _userState$user.id]);
+    setSideBarWidth(500);
+    (0, _utils.removeQueryToUrl)(['section', 'tab']);
+  }, [userId]);
   (0, _react.useEffect)(function () {
     if (userState.loading) return;
     var section = query.get('section');
@@ -144,19 +148,19 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
     width: 150
   }) : /*#__PURE__*/_react.default.createElement("span", {
     className: "customer-name"
-  }, (_userState$user2 = userState.user) === null || _userState$user2 === void 0 ? void 0 : _userState$user2.name, " ", (_userState$user3 = userState.user) === null || _userState$user3 === void 0 ? void 0 : _userState$user3.lastname), userState !== null && userState !== void 0 && userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
+  }, (_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, {
     width: 50,
     style: {
       margin: '0px 5px'
     }
   }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, handleChangeActiveUser && /*#__PURE__*/_react.default.createElement(_styles.Switch, {
-    defaultChecked: (userState === null || userState === void 0 || (_userState$user4 = userState.user) === null || _userState$user4 === void 0 ? void 0 : _userState$user4.enabled) || false,
+    defaultChecked: (userState === null || userState === void 0 || (_userState$user3 = userState.user) === null || _userState$user3 === void 0 ? void 0 : _userState$user3.enabled) || false,
     onChange: function onChange(enabled) {
       return handleChangeActiveUser(_objectSpread(_objectSpread({}, userState === null || userState === void 0 ? void 0 : userState.user), {}, {
         enabled: enabled
       }));
     }
-  }))), !!((_userState$user5 = userState.user) !== null && _userState$user5 !== void 0 && _userState$user5.phone_verified) && /*#__PURE__*/_react.default.createElement(_styles2.VerifiedItem, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Phone, null), t('VERIFIED', 'Verified')), !!((_userState$user6 = userState.user) !== null && _userState$user6 !== void 0 && _userState$user6.email_verified) && /*#__PURE__*/_react.default.createElement(_styles2.VerifiedItem, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Envelope, null), t('VERIFIED', 'Verified'))), /*#__PURE__*/_react.default.createElement(_styles2.RightHeader, null, width > 576 && !isOpenMenu && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
+  }))), !!((_userState$user4 = userState.user) !== null && _userState$user4 !== void 0 && _userState$user4.phone_verified) && /*#__PURE__*/_react.default.createElement(_styles2.VerifiedItem, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Phone, null), t('VERIFIED', 'Verified')), !!((_userState$user5 = userState.user) !== null && _userState$user5 !== void 0 && _userState$user5.email_verified) && /*#__PURE__*/_react.default.createElement(_styles2.VerifiedItem, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Envelope, null), t('VERIFIED', 'Verified'))), /*#__PURE__*/_react.default.createElement(_styles2.RightHeader, null, width > 576 && !isOpenMenu && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
     onClick: function onClick() {
       return expandSidebar();
@@ -169,8 +173,8 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
     onClick: function onClick() {
       return onDeleteCustomer();
     }
-  }, t('DELETE', 'Delete')))))), /*#__PURE__*/_react.default.createElement(_styles2.PhotoWrapper, null, userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, null) : (_userState$user7 = userState.user) !== null && _userState$user7 !== void 0 && _userState$user7.photo ? /*#__PURE__*/_react.default.createElement("img", {
-    src: optimizeImage((_userState$user8 = userState.user) === null || _userState$user8 === void 0 ? void 0 : _userState$user8.photo, 'w_220,c_limit'),
+  }, t('DELETE', 'Delete')))))), /*#__PURE__*/_react.default.createElement(_styles2.PhotoWrapper, null, userState.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, null) : (_userState$user6 = userState.user) !== null && _userState$user6 !== void 0 && _userState$user6.photo ? /*#__PURE__*/_react.default.createElement("img", {
+    src: optimizeImage((_userState$user7 = userState.user) === null || _userState$user7 === void 0 ? void 0 : _userState$user7.photo, 'w_220,c_limit'),
     alt: ""
   }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.PersonFill, null)), /*#__PURE__*/_react.default.createElement(_styles2.MenusContainer, {
     isLoading: userState.loading
@@ -215,9 +219,9 @@ var CustomerDetailsUI = function CustomerDetailsUI(props) {
       return setMenuMoveDistance(isOpen ? 500 : 0);
     }
   })), showOption === 'cash_wallet' && /*#__PURE__*/_react.default.createElement(_CustomerCashWallet.CustomerCashWallet, {
-    userId: (_userState$user9 = userState.user) === null || _userState$user9 === void 0 ? void 0 : _userState$user9.id
+    userId: (_userState$user8 = userState.user) === null || _userState$user8 === void 0 ? void 0 : _userState$user8.id
   }), showOption === 'points_wallet' && /*#__PURE__*/_react.default.createElement(_CustomerPointsWallet.CustomerPointsWallet, {
-    userId: (_userState$user10 = userState.user) === null || _userState$user10 === void 0 ? void 0 : _userState$user10.id,
+    userId: (_userState$user9 = userState.user) === null || _userState$user9 === void 0 ? void 0 : _userState$user9.id,
     user: userState.user
   })));
 };

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

@@ -13,6 +13,7 @@ var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skelet
 var _CustomerWalletEvents = require("../CustomerWalletEvents");
 var _styles = require("../../../styles");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles2 = 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); }
@@ -38,7 +39,6 @@ var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
     reduceWalletState = props.reduceWalletState,
     handleAddWalletMoney = props.handleAddWalletMoney,
     handleReduceWalletMoney = props.handleReduceWalletMoney;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -58,10 +58,9 @@ var CustomerPointsWalletUI = function CustomerPointsWalletUI(props) {
   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, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -18,6 +18,7 @@ var _UsersDeleteButton = require("../UsersDeleteButton");
 var _UsersExportCSV = require("../UsersExportCSV");
 var _styles = require("../../../styles");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 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; }
@@ -57,11 +58,11 @@ var CustomersListingUI = function CustomersListingUI(props) {
     orderFilterValue = props.orderFilterValue,
     handleChangeOrderFilterValue = props.handleChangeOrderFilterValue,
     handleChangeMultiFilterValues = props.handleChangeMultiFilterValues,
-    multiFilterValues = props.multiFilterValues;
+    multiFilterValues = props.multiFilterValues,
+    isUseQuery = props.isUseQuery;
   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),
@@ -106,12 +107,12 @@ var CustomersListingUI = function CustomersListingUI(props) {
     setQueryId(null);
     setSideBarWidth(500);
     moveDistance && setMoveDistance(0);
-    var enabled = selectedUserActiveState ? 'active' : 'inactive';
-    history.replace("".concat(location.pathname, "?enabled=").concat(enabled));
+    (0, _utils.removeQueryToUrl)(['id', 'section', 'tab']);
   };
   var handleOpenUserDetails = function handleOpenUserDetails(user) {
-    var enabled = selectedUserActiveState ? 'active' : 'inactive';
-    history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(user === null || user === void 0 ? void 0 : user.id));
+    (0, _utils.addQueryToUrl)({
+      id: user === null || user === void 0 ? void 0 : user.id
+    });
     setOpenUser(user);
     setOpenUserAddForm(false);
     setIsOpenUserDetails(true);
@@ -192,7 +193,8 @@ var CustomersListingUI = function CustomersListingUI(props) {
     userDetailsId: (openUser === null || openUser === void 0 ? void 0 : openUser.id) || queryId,
     handleOpenUserDetails: handleOpenUserDetails,
     handleOpenUserAddForm: handleOpenUserAddForm,
-    setSelectedUsers: setSelectedUsers
+    setSelectedUsers: setSelectedUsers,
+    isUseQuery: isUseQuery
   })), isOpenUserDetails && /*#__PURE__*/_react.default.createElement(_Shared.SideBar, {
     sidebarId: "customer_details",
     open: isOpenUserDetails,
@@ -231,12 +233,19 @@ 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 defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var customersProps = _objectSpread(_objectSpread({}, props), {}, {
     defaultUserActiveState: defaultUserActiveState,
     UIComponent: CustomersListingUI,
     isSearchByUserEmail: true,
     isSearchByUserPhone: true,
-    isSearchByUserName: true
+    isSearchByUserName: true,
+    paginationSettings: {
+      initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
+      pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
+      controlType: 'pages'
+    }
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.UsersList, customersProps);
 };

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

@@ -19,6 +19,7 @@ var _ProfessionalSchedule = require("../ProfessionalSchedule");
 var _ProfessionalBusinessService = require("../ProfessionalBusinessService");
 var _UserMetaFields = require("../UserMetaFields");
 var _styles = require("../../../styles");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -45,7 +46,6 @@ 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)(),
@@ -126,14 +126,9 @@ var ProfessionalDetailUI = function ProfessionalDetailUI(props) {
   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, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -12,6 +12,7 @@ var _FaUserAlt = _interopRequireDefault(require("@meronex/icons/fa/FaUserAlt"));
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _styles = require("../../../styles");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles2 = 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); }
@@ -41,7 +42,8 @@ var ProfessionalList = function ProfessionalList(props) {
     handleSelectedUsers = props.handleSelectedUsers,
     handleOpenUserDetails = props.handleOpenUserDetails,
     handleOpenUserAddForm = props.handleOpenUserAddForm,
-    setSelectedUsers = props.setSelectedUsers;
+    setSelectedUsers = props.setSelectedUsers,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -160,6 +162,13 @@ var ProfessionalList = function ProfessionalList(props) {
     });
     setIsAllChecked(_isAllChecked);
   }, [usersList.users, selectedUsers]);
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.currentPage) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.pageSize) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.totalPages)) return;
+    (0, _utils.addQueryToUrl)({
+      page: paginationProps.currentPage,
+      pageSize: paginationProps.pageSize
+    });
+  }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersConatiner, null, /*#__PURE__*/_react.default.createElement(_styles2.UserTableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.user) && /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.AllCheckWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
     className: "user_checkbox",
     isChecked: !(usersList !== null && usersList !== void 0 && usersList.loading) && isAllChecked,

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

@@ -18,6 +18,7 @@ var _UsersDeleteButton = require("../UsersDeleteButton");
 var _UsersExportCSV = require("../UsersExportCSV");
 var _styles = require("../../../styles");
 var _OccupationsFilter = require("../OccupationsFilter");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 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; }
@@ -59,14 +60,14 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
     handleSelectOccupation = props.handleSelectOccupation,
     setSelectedUsers = props.setSelectedUsers,
     handleChangeMultiFilterValues = props.handleChangeMultiFilterValues,
-    multiFilterValues = props.multiFilterValues;
+    multiFilterValues = props.multiFilterValues,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
   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),
@@ -96,12 +97,12 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
     setIsOpenUserDetails(false);
     setOpenUser(null);
     setQueryId(null);
-    var enabled = selectedUserActiveState ? 'active' : 'inactive';
-    history.replace("".concat(location.pathname, "?enabled=").concat(enabled));
+    (0, _utils.removeQueryToUrl)(['id', 'tab']);
   };
   var handleOpenUserDetails = function handleOpenUserDetails(user) {
-    var enabled = selectedUserActiveState ? 'active' : 'inactive';
-    history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(user === null || user === void 0 ? void 0 : user.id));
+    (0, _utils.addQueryToUrl)({
+      id: user === null || user === void 0 ? void 0 : user.id
+    });
     setOpenUser(user);
     setOpenUserAddForm(false);
     setIsOpenUserDetails(true);
@@ -176,7 +177,8 @@ var ProfessionalListingUI = function ProfessionalListingUI(props) {
     userDetailsId: (openUser === null || openUser === void 0 ? void 0 : openUser.id) || queryId,
     handleOpenUserDetails: handleOpenUserDetails,
     handleOpenUserAddForm: handleOpenUserAddForm,
-    setSelectedUsers: setSelectedUsers
+    setSelectedUsers: setSelectedUsers,
+    isUseQuery: isUseQuery
   })) : /*#__PURE__*/_react.default.createElement(_styles2.WarningText, null, t('APPOINTMENTS_FEATURE_NOT_ENABLED', 'The appointments feature is not enabled.'))), isOpenUserDetails && /*#__PURE__*/_react.default.createElement(_UserDetailsLateralBar.UserDetailsLateralBar, {
     isProfessionals: true,
     open: isOpenUserDetails,
@@ -225,13 +227,20 @@ 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 defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var usersListingProps = _objectSpread(_objectSpread({}, props), {}, {
     defaultUserActiveState: defaultUserActiveState,
     isProfessional: true,
     UIComponent: ProfessionalListingUI,
     isSearchByUserEmail: true,
     isSearchByUserPhone: true,
-    isSearchByUserName: true
+    isSearchByUserName: true,
+    paginationSettings: {
+      initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
+      pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
+      controlType: 'pages'
+    }
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.UsersList, usersListingProps);
 };

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

@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 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; }
@@ -21,19 +22,22 @@ 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));
+    (0, _utils.addQueryToUrl)({
+      enabled: enabled
+    });
     handleChangeUserActiveState();
   };
   (0, _react.useEffect)(function () {
     if (defaultEnabled) return;
-    history.replace("".concat(location.pathname, "?enabled=active"));
+    (0, _utils.addQueryToUrl)({
+      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,

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

@@ -21,6 +21,7 @@ var _Shared = require("../../Shared");
 var _Personalization = require("../../Shared/Personalization");
 var _UserMetaFields = require("../UserMetaFields");
 var _styles = require("../../../styles");
+var _utils = require("../../../utils");
 var _styles2 = 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); }
@@ -44,7 +45,6 @@ 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)(),
@@ -94,14 +94,9 @@ var UserDetailsUI = function UserDetailsUI(props) {
   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, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -12,6 +12,7 @@ var _FaUserAlt = _interopRequireDefault(require("@meronex/icons/fa/FaUserAlt"));
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _styles = require("../../../styles");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles2 = 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); }
@@ -42,7 +43,8 @@ var UsersList = function UsersList(props) {
     handleOpenUserDetails = props.handleOpenUserDetails,
     handleOpenUserAddForm = props.handleOpenUserAddForm,
     setSelectedUsers = props.setSelectedUsers,
-    isCustomer = props.isCustomer;
+    isCustomer = props.isCustomer,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -149,6 +151,13 @@ var UsersList = function UsersList(props) {
       handleChangePage(paginationProps.currentPage - 1);
     }
   }, [usersList.users, paginationProps]);
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.currentPage) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.pageSize) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.totalPages)) return;
+    (0, _utils.addQueryToUrl)({
+      page: paginationProps.currentPage,
+      pageSize: paginationProps.pageSize
+    });
+  }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersConatiner, null, /*#__PURE__*/_react.default.createElement(_styles2.UserTableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.AllCheckWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
     className: "all-checkbox",
     isChecked: !(usersList !== null && usersList !== void 0 && usersList.loading) && isAllChecked,

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

@@ -17,6 +17,7 @@ var _Shared = require("../../Shared");
 var _UserAddForm = require("../UserAddForm");
 var _UsersDeleteButton = require("../UsersDeleteButton");
 var _UsersExportCSV = require("../UsersExportCSV");
+var _utils = require("../../../utils");
 var _styles = require("../../../styles");
 var _styles2 = require("./styles");
 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); }
@@ -56,11 +57,11 @@ var UsersListingUI = function UsersListingUI(props) {
     handleSuccessDeleteUser = props.handleSuccessDeleteUser,
     setSelectedUsers = props.setSelectedUsers,
     handleChangeMultiFilterValues = props.handleChangeMultiFilterValues,
-    multiFilterValues = props.multiFilterValues;
+    multiFilterValues = props.multiFilterValues,
+    isUseQuery = props.isUseQuery;
   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),
@@ -82,12 +83,12 @@ var UsersListingUI = function UsersListingUI(props) {
     setIsOpenUserDetails(false);
     setOpenUser(null);
     setQueryId(null);
-    var enabled = selectedUserActiveState ? 'active' : 'inactive';
-    history.replace("".concat(location.pathname, "?enabled=").concat(enabled));
+    (0, _utils.removeQueryToUrl)(['id', 'tab']);
   };
   var handleOpenUserDetails = function handleOpenUserDetails(user) {
-    var enabled = selectedUserActiveState ? 'active' : 'inactive';
-    history.replace("".concat(location.pathname, "?enabled=").concat(enabled, "&id=").concat(user === null || user === void 0 ? void 0 : user.id));
+    (0, _utils.addQueryToUrl)({
+      id: user === null || user === void 0 ? void 0 : user.id
+    });
     setOpenUser(user);
     setOpenUserAddForm(false);
     setIsOpenUserDetails(true);
@@ -154,7 +155,8 @@ var UsersListingUI = function UsersListingUI(props) {
     userDetailsId: (openUser === null || openUser === void 0 ? void 0 : openUser.id) || queryId,
     handleOpenUserDetails: handleOpenUserDetails,
     handleOpenUserAddForm: handleOpenUserAddForm,
-    setSelectedUsers: setSelectedUsers
+    setSelectedUsers: setSelectedUsers,
+    isUseQuery: isUseQuery
   })), isOpenUserDetails && /*#__PURE__*/_react.default.createElement(_UserDetailsLateralBar.UserDetailsLateralBar, {
     isManagers: true,
     open: isOpenUserDetails,
@@ -183,12 +185,19 @@ var UsersListingUI = function UsersListingUI(props) {
 var UsersListing = function UsersListing(props) {
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var defaultUserActiveState = query.get('enabled') !== 'inactive';
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var usersListingProps = _objectSpread(_objectSpread({}, props), {}, {
     defaultUserActiveState: defaultUserActiveState,
     UIComponent: UsersListingUI,
     isSearchByUserEmail: true,
     isSearchByUserPhone: true,
-    isSearchByUserName: true
+    isSearchByUserName: true,
+    paginationSettings: {
+      initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
+      pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
+      controlType: 'pages'
+    }
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.UsersList, usersListingProps);
 };

package/_modules/index.js

@@ -2415,6 +2415,12 @@ Object.defineProperty(exports, "ZoneDropdownDetails", {
     return _Settings.ZoneDropdownDetails;
   }
 });
+Object.defineProperty(exports, "addQueryToUrl", {
+  enumerable: true,
+  get: function get() {
+    return _utils.addQueryToUrl;
+  }
+});
 Object.defineProperty(exports, "capitalize", {
   enumerable: true,
   get: function get() {
@@ -2427,6 +2433,12 @@ Object.defineProperty(exports, "getStorageItem", {
     return _utils.getStorageItem;
   }
 });
+Object.defineProperty(exports, "removeQueryToUrl", {
+  enumerable: true,
+  get: function get() {
+    return _utils.removeQueryToUrl;
+  }
+});
 Object.defineProperty(exports, "setStorageItem", {
   enumerable: true,
   get: function get() {