ordering-ui-admin-external 1.33.1 → 1.35.0

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

@@ -13,6 +13,7 @@ var _reactBootstrap = require("react-bootstrap");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _styles = require("../../../styles");
 var _styledComponents = require("styled-components");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 var _RecoveryGeneral = require("../RecoveryGeneral");
 var _RecoveryNotificationList = require("../RecoveryNotificationList");
@@ -39,7 +40,6 @@ 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)(),
@@ -87,8 +87,9 @@ var RecoveryActionDetailUI = function RecoveryActionDetailUI(props) {
     }
     setSelectedOption(key);
     if (!isInitialRender) {
-      var id = query.get('id');
-      history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(key));
+      (0, _utils.addQueryToUrl)({
+        tab: key
+      });
     }
   };
   var closeAlert = function closeAlert() {

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

@@ -11,6 +11,7 @@ var _orderingComponentsAdminExternal = require("ordering-components-admin-extern
 var _Shared = require("../../Shared");
 var _styles = require("../../../styles");
 var _styledComponents = require("styled-components");
+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,8 @@ var RecoveryActionList = function RecoveryActionList(props) {
     getRecoveryList = props.getRecoveryList,
     handleOpenDetail = props.handleOpenDetail,
     handleUpdateAction = props.handleUpdateAction,
-    selectedAction = props.selectedAction;
+    selectedAction = props.selectedAction,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -83,6 +85,13 @@ var RecoveryActionList = function RecoveryActionList(props) {
     if (inValid) return;
     handleOpenDetail(action);
   };
+  (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.Container, null, /*#__PURE__*/_react.default.createElement(_styles2.Table, {
     isRelative: (recoveryActionList === null || recoveryActionList === void 0 || (_recoveryActionList$a = recoveryActionList.actions) === null || _recoveryActionList$a === void 0 ? void 0 : _recoveryActionList$a.length) > 5
   }, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, t('ACTION', 'Action')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.description) && /*#__PURE__*/_react.default.createElement("th", null, t('DESCRIPTION', 'Description')), /*#__PURE__*/_react.default.createElement("th", {

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

@@ -13,6 +13,7 @@ var _RecoveryActionList = require("../RecoveryActionList");
 var _Shared = require("../../Shared");
 var _RecoveryActionDetail = require("../RecoveryActionDetail");
 var _RecoveryActionAdd = require("../RecoveryActionAdd");
+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; }
@@ -29,7 +30,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 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),
@@ -51,7 +51,7 @@ var RecoveryActionListingUI = function RecoveryActionListingUI(props) {
     setIsOpenDetail(false);
     setSelectedAction(null);
     setIsAddMode(false);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['id', 'tab']);
   };
   var handleOpenDetail = function handleOpenDetail(action, isInitialRender) {
     setSelectedAction(action);
@@ -59,13 +59,15 @@ var RecoveryActionListingUI = function RecoveryActionListingUI(props) {
     setIsOpenDetail(true);
     if (!Object.keys(action || {}).length) {
       setIsAddMode(true);
-      history.replace("".concat(location.pathname));
+      (0, _utils.removeQueryToUrl)(['id']);
       return;
     } else {
       setIsAddMode(false);
     }
     if (action && !isInitialRender) {
-      history.replace("".concat(location.pathname, "?id=").concat(action.id));
+      (0, _utils.addQueryToUrl)({
+        id: action.id
+      });
     }
   };
   (0, _react.useEffect)(function () {
@@ -102,10 +104,18 @@ var RecoveryActionListingUI = function RecoveryActionListingUI(props) {
   }))));
 };
 var RecoveryActionListing = function RecoveryActionListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var recoveryActionsProps = _objectSpread(_objectSpread({}, props), {}, {
     UIComponent: RecoveryActionListingUI,
     isSearchByName: true,
-    isSearchByDescription: true
+    isSearchByDescription: 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.RecoveryActionListing, recoveryActionsProps);
 };

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

@@ -67,12 +67,13 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
     actionDisabled = props.actionDisabled,
     driversGroupsState = props.driversGroupsState,
     setSelectedUsers = props.setSelectedUsers,
-    actionStatus = props.actionStatus;
+    actionStatus = props.actionStatus,
+    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 firstRender = (0, _react.useRef)(true);
   var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
     queryId = _useState2[0],
@@ -115,7 +116,9 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
     setOpenUser(user);
     setOpenUserAddForm(false);
     setIsOpenUserDetails(true);
-    history.replace("".concat(location.pathname, "?id=").concat(user.id));
+    (0, _utils.addQueryToUrl)({
+      id: user.id
+    });
   };
   var handleOpenUserAddForm = function handleOpenUserAddForm() {
     var id = query.get('id');
@@ -137,7 +140,7 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
     setIsTourOpen(true);
   };
   (0, _react.useEffect)(function () {
-    if (usersList.loading) return;
+    if (usersList.loading || !firstRender.current) return;
     var id = query.get('id');
     if (id === null) {
       !isDriversManagersPage && setIsOpenUserDetails(false);
@@ -152,6 +155,7 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
       }
       setIsOpenUserDetails(true);
     }
+    firstRender.current = false;
   }, [usersList]);
   var handleCloseAddForm = function handleCloseAddForm() {
     setOpenUserAddForm(false);
@@ -268,7 +272,8 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
     handleOpenUserDetails: handleOpenUserDetails,
     handleOpenUserAddForm: handleOpenUserAddForm,
     actionDisabled: actionDisabled,
-    setSelectedUsers: setSelectedUsers
+    setSelectedUsers: setSelectedUsers,
+    isUseQuery: isUseQuery
   })), isOpenUserDetails && /*#__PURE__*/_react.default.createElement(_UserDetailsLateralBar.UserDetailsLateralBar, {
     isDriversPage: isDriversPage,
     isDriversManagersPage: isDriversManagersPage,
@@ -324,12 +329,20 @@ var DeliveryUsersListingUI = function DeliveryUsersListingUI(props) {
   }));
 };
 var DeliveryUsersListing = function DeliveryUsersListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var usersListingProps = _objectSpread(_objectSpread({}, props), {}, {
     UIComponent: DeliveryUsersListingUI,
     isSearchByUserEmail: true,
     isSearchByUserPhone: true,
     isSearchByUserName: true,
-    isDriver: true
+    isDriver: 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/Delivery/DriversCompaniesList/index.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DriversCompaniesList = 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");
 var _MdCheckBoxOutlineBlank = _interopRequireDefault(require("@meronex/icons/md/MdCheckBoxOutlineBlank"));
 var _MdCheckBox = _interopRequireDefault(require("@meronex/icons/md/MdCheckBox"));
 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); }
@@ -34,17 +36,21 @@ var DriversCompaniesList = function DriversCompaniesList(props) {
     handleUpdateDriversCompany = props.handleUpdateDriversCompany,
     handleSelectCompany = props.handleSelectCompany,
     selectedCompanyList = props.selectedCompanyList,
-    handleAllSelectCompany = props.handleAllSelectCompany;
+    handleAllSelectCompany = props.handleAllSelectCompany,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
 
   // Change page
-  var _useState = (0, _react.useState)(1),
+  var _useState = (0, _react.useState)(Number(defaultPage) || 1),
     _useState2 = _slicedToArray(_useState, 2),
     currentPage = _useState2[0],
     setCurrentPage = _useState2[1];
-  var _useState3 = (0, _react.useState)(10),
+  var _useState3 = (0, _react.useState)(Number(defaultPageSize) || 10),
     _useState4 = _slicedToArray(_useState3, 2),
     companiesPerPage = _useState4[0],
     setCompaniesPerPage = _useState4[1];
@@ -106,6 +112,13 @@ var DriversCompaniesList = function DriversCompaniesList(props) {
     if (isInvalid) return;
     handleOpenDetails(company);
   };
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !currentPage || !companiesPerPage || !totalPages) return;
+    (0, _utils.addQueryToUrl)({
+      page: currentPage,
+      pageSize: companiesPerPage
+    });
+  }, [currentPage, companiesPerPage, totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DriversCompaniesContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.TableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CompaniesTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.CompanyNameContainer, {
     isHeader: true
   }, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {

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

@@ -15,6 +15,7 @@ var _Shared = require("../../Shared");
 var _DriversCompaniesList = require("../DriversCompaniesList");
 var _DriversCompanyDetailsForm = require("../DriversCompanyDetailsForm");
 var _DriversCompanyAddForm = require("../DriversCompanyAddForm");
+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; }
@@ -40,8 +41,8 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
     handleSelectCompany = props.handleSelectCompany,
     selectedCompanyList = props.selectedCompanyList,
     handleAllSelectCompany = props.handleAllSelectCompany,
-    handleDeleteSelectedCompanies = props.handleDeleteSelectedCompanies;
-  var history = (0, _reactRouterDom.useHistory)();
+    handleDeleteSelectedCompanies = props.handleDeleteSelectedCompanies,
+    isUseQuery = props.isUseQuery;
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -90,7 +91,9 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
     }
     setOpenDetails(true);
     if (!isInitialRender) {
-      history.replace("".concat(location.pathname, "?id=").concat(driverCompany === null || driverCompany === void 0 ? void 0 : driverCompany.id));
+      (0, _utils.addQueryToUrl)({
+        id: driverCompany === null || driverCompany === void 0 ? void 0 : driverCompany.id
+      });
     }
   };
   (0, _react.useEffect)(function () {
@@ -117,7 +120,7 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
     setCurDriversCompanyId(null);
     setOpenDetails(false);
     setIsAddMode(false);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['id', 'tab']);
   };
   (0, _react.useEffect)(function () {
     var id = query.get('id');
@@ -160,7 +163,8 @@ var DriversCompaniesListingUI = function DriversCompaniesListingUI(props) {
     handleDeleteDriversCompany: handleDeleteDriversCompany,
     handleSelectCompany: handleSelectCompany,
     selectedCompanyList: selectedCompanyList,
-    handleAllSelectCompany: handleAllSelectCompany
+    handleAllSelectCompany: handleAllSelectCompany,
+    isUseQuery: isUseQuery
   }) : /*#__PURE__*/_react.default.createElement(_DriversCompanyAddForm.DriversCompanyAddForm, {
     driversCompaniesState: driversCompaniesState,
     setDriversCompaniesState: setDriversCompaniesState,

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

@@ -15,6 +15,7 @@ var _Shared = require("../../Shared");
 var _DriversCompanyGeneralDetails = require("../DriversCompanyGeneralDetails");
 var _DriversCompanyScheduleDetails = require("../DriversCompanyScheduleDetails");
 var _DriversCompanyWebhooksDetails = require("../DriversCompanyWebhooksDetails");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 var _styles2 = require("../../../styles");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
@@ -39,7 +40,6 @@ var DriversCompanyDetailsFormUI = function DriversCompanyDetailsFormUI(props) {
     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),
@@ -118,8 +118,9 @@ var DriversCompanyDetailsFormUI = function DriversCompanyDetailsFormUI(props) {
   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, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -20,6 +20,7 @@ var _DriversGroupLogistics = require("../DriversGroupLogistics");
 var _DriversGroupLogs = require("../DriversGroupLogs");
 var _DriversGroupDeliveryDetails = require("../DriversGroupDeliveryDetails");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
+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; }
@@ -46,7 +47,6 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     setIsExtendExtraOpen = props.setIsExtendExtraOpen,
     actionDisabled = props.actionDisabled,
     driversGroupId = props.driversGroupId;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -174,8 +174,9 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
   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, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -15,6 +15,7 @@ var _Shared = require("../../Shared");
 var _DriversGroupOrders = require("../DriversGroupOrders");
 var _DriversGroupAutoassign = require("../DriversGroupAutoassign");
 var _DriversMarkAsBusy = require("../DriversMarkAsBusy");
+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; }
@@ -32,7 +33,6 @@ var DriversGroupLogistics = function DriversGroupLogistics(props) {
     handleParentSidebarMove = props.handleParentSidebarMove,
     handleUpdateDriversGroup = props.handleUpdateDriversGroup,
     actionDisabled = props.actionDisabled;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -54,9 +54,9 @@ var DriversGroupLogistics = function DriversGroupLogistics(props) {
       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));
+      (0, _utils.addQueryToUrl)({
+        config: option
+      });
     }
   };
   var handleCloseSidebar = function handleCloseSidebar() {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DriversGroupsList = 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 _MdCheckBoxOutlineBlank = _interopRequireDefault(require("@meronex/icons/md/MdCheckBoxOutlineBlank"));
@@ -13,6 +14,7 @@ var _MdCheckBox = _interopRequireDefault(require("@meronex/icons/md/MdCheckBox")
 var _FaUserAlt = _interopRequireDefault(require("@meronex/icons/fa/FaUserAlt"));
 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); }
@@ -37,17 +39,21 @@ var DriversGroupsList = function DriversGroupsList(props) {
     isFromStore = props.isFromStore,
     handleSelectGroup = props.handleSelectGroup,
     handleAllSelectGroup = props.handleAllSelectGroup,
-    actionDisabled = props.actionDisabled;
+    actionDisabled = props.actionDisabled,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
 
   // Change page
-  var _useState = (0, _react.useState)(1),
+  var _useState = (0, _react.useState)(Number(defaultPage) || 1),
     _useState2 = _slicedToArray(_useState, 2),
     currentPage = _useState2[0],
     setCurrentPage = _useState2[1];
-  var _useState3 = (0, _react.useState)(10),
+  var _useState3 = (0, _react.useState)(Number(defaultPageSize) || 10),
     _useState4 = _slicedToArray(_useState3, 2),
     groupsPerPage = _useState4[0],
     setGroupsPerPage = _useState4[1];
@@ -103,6 +109,13 @@ var DriversGroupsList = function DriversGroupsList(props) {
         return t('DRIVER_COMPANIES', 'Driver companies');
     }
   };
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !currentPage || !groupsPerPage || !totalPages) return;
+    (0, _utils.addQueryToUrl)({
+      page: currentPage,
+      pageSize: groupsPerPage
+    });
+  }, [currentPage, groupsPerPage, totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DriversGroupsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.TableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.GroupsTable, {
     "data-tour": "tour_delivery_completed",
     disabled: isFromStore

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

@@ -51,7 +51,8 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     handleUpdateDriversGroup = props.handleUpdateDriversGroup,
     handleDeleteDriversGroup = props.handleDeleteDriversGroup,
     driversCompanyList = props.driversCompanyList,
-    actionDisabled = props.actionDisabled;
+    actionDisabled = props.actionDisabled,
+    isUseQuery = props.isUseQuery;
   var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -122,9 +123,11 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
       setTimeout(function () {
         setCurrentTourStep(5);
       }, 50);
-      history.replace("".concat(location.pathname));
+      (0, _utils.removeQueryToUrl)(['id']);
     } else {
-      history.replace("".concat(location.pathname, "?id=").concat(driverGroup.id));
+      (0, _utils.addQueryToUrl)({
+        id: driverGroup.id
+      });
     }
   };
   (0, _react.useEffect)(function () {
@@ -195,7 +198,7 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     setCurDriversGroup(null);
     setOpenDetails(false);
     setIsTourOpen(false);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['id']);
   };
   (0, _react.useEffect)(function () {
     getDataFromStorage();
@@ -251,7 +254,8 @@ var DriversGroupsListingUI = function DriversGroupsListingUI(props) {
     selectedGroupList: selectedGroupList,
     handleSelectGroup: handleSelectGroup,
     handleAllSelectGroup: handleAllSelectGroup,
-    actionDisabled: actionDisabled
+    actionDisabled: actionDisabled,
+    isUseQuery: isUseQuery
   }) : /*#__PURE__*/_react.default.createElement(_DriversGroupAddForm.DriversGroupAddForm, {
     driversGroupsState: driversGroupsState,
     setDriversGroupsState: setDriversGroupsState,

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

@@ -23,6 +23,7 @@ var _DriverGroupSetting = require("../DriverGroupSetting");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _styles = require("../../../styles");
 var _styles2 = require("../UserFormDetails/styles");
+var _utils = require("../../../utils");
 var _styles3 = require("./styles");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -52,7 +53,6 @@ var UserDetailsUI = function UserDetailsUI(props) {
     handleScheduleState = props.handleScheduleState,
     handleScheduleUpdateUser = props.handleScheduleUpdateUser,
     actionDisabled = props.actionDisabled;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -90,13 +90,9 @@ var UserDetailsUI = function UserDetailsUI(props) {
   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, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -200,6 +200,13 @@ var UserFormDetailsUI = function UserFormDetailsUI(props) {
     formMethods.setValue('email', (_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
     emailInput.current.value = (_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, '');
   };
+  var handleExternalIdPaste = function handleExternalIdPaste(event) {
+    event.preventDefault();
+    var pastedData = event.clipboardData.getData('text/plain');
+    var sanitizedData = pastedData.replace(/\s/g, '').replace(/[^\d]/g, '');
+    document.execCommand('insertText', false, sanitizedData);
+    handleChangeSwtich('external_id', sanitizedData);
+  };
   (0, _react.useEffect)(function () {
     if (Object.keys(formMethods.errors).length > 0) {
       var content = Object.values(formMethods.errors).map(function (error) {
@@ -306,7 +313,8 @@ var UserFormDetailsUI = function UserFormDetailsUI(props) {
       if (!/^[0-9]$/.test(e.key)) {
         e.preventDefault();
       }
-    }
+    },
+    onPaste: handleExternalIdPaste
   }), /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, {
     isTimezone: true
   }, /*#__PURE__*/_react.default.createElement(_styles.DefaultSelect, {

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

@@ -14,6 +14,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); }
@@ -47,7 +48,8 @@ var UsersList = function UsersList(props) {
     isDriversManagersPage = props.isDriversManagersPage,
     actionDisabled = props.actionDisabled,
     setSelectedUsers = props.setSelectedUsers,
-    handleChangeAvailable = props.handleChangeAvailable;
+    handleChangeAvailable = props.handleChangeAvailable,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -132,6 +134,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, isDriversPage && /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.UserIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
     className: "all-checkbox",
     isChecked: !(usersList !== null && usersList !== void 0 && usersList.loading) && isAllChecked,

package/_modules/components/Marketing/AdBannersListing/index.js

@@ -14,6 +14,7 @@ var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _PostionItemUI = require("./PostionItemUI");
 var _Shared = require("../../Shared");
 var _PageBanner = require("../PageBanner");
+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; }
@@ -24,7 +25,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 AdBannersListing = function AdBannersListing(props) {
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -88,13 +88,16 @@ var AdBannersListing = function AdBannersListing(props) {
     });
     setOpenPositionDetail(selectedItem);
     if (!isInitialRender) {
-      history.replace("".concat(location.pathname, "?position=").concat(key));
+      (0, _utils.removeQueryToUrl)(['banner']);
+      (0, _utils.addQueryToUrl)({
+        position: key
+      });
     }
   };
   var handleCloseDetails = function handleCloseDetails() {
     setOpenPositionDetail(null);
     setMoveDistance(0);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['position', 'banner']);
   };
   (0, _react.useEffect)(function () {
     var position = query.get('position');