ordering-ui-admin-external 1.33.1 → 1.35.0

package/_modules/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getLocale = exports.getIconCard = exports.getHours = exports.getCurrenySymbol = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCountryPhoneCode = exports.findExitingCode = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.DriverTipsOptions = void 0;
+exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.removeQueryToUrl = exports.queryStringToObject = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getLocale = exports.getIconCard = exports.getHours = exports.getCurrenySymbol = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCountryPhoneCode = exports.findExitingCode = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.addQueryToUrl = exports.DriverTipsOptions = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _FaCcMastercard = _interopRequireDefault(require("@meronex/icons/fa/FaCcMastercard"));
 var _FaCcVisa = _interopRequireDefault(require("@meronex/icons/fa/FaCcVisa"));
@@ -12,6 +12,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _currency = require("../config/currency.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -846,4 +847,40 @@ var getCurrenySymbol = function getCurrenySymbol(code) {
   var _CURRENCY$code$symbol, _CURRENCY$code;
   return (_CURRENCY$code$symbol = _currency.CURRENCY === null || _currency.CURRENCY === void 0 || (_CURRENCY$code = _currency.CURRENCY[code]) === null || _CURRENCY$code === void 0 ? void 0 : _CURRENCY$code.symbol) !== null && _CURRENCY$code$symbol !== void 0 ? _CURRENCY$code$symbol : code;
 };
-exports.getCurrenySymbol = getCurrenySymbol;
+exports.getCurrenySymbol = getCurrenySymbol;
+var queryStringToObject = function queryStringToObject(url) {
+  var params = new URLSearchParams(url.split('?')[1]);
+  return Object.fromEntries(params);
+};
+exports.queryStringToObject = queryStringToObject;
+var addQueryToUrl = function addQueryToUrl(newObj) {
+  var queryObj = queryStringToObject(location.href);
+  for (var key in newObj) {
+    queryObj[key] = newObj[key];
+  }
+  var query = new URLSearchParams(queryObj);
+  history.replaceState(null, '', "".concat(location.pathname, "?").concat(query));
+};
+exports.addQueryToUrl = addQueryToUrl;
+var removeQueryToUrl = function removeQueryToUrl(removeKeys) {
+  var queryObj = queryStringToObject(location.href);
+  var _iterator = _createForOfIteratorHelper(removeKeys),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      delete queryObj[key];
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  if (Object.keys(queryObj).length) {
+    var query = new URLSearchParams(queryObj);
+    history.replaceState(null, '', "".concat(location.pathname, "?").concat(query));
+  } else {
+    history.replaceState(null, '', "".concat(location.pathname));
+  }
+};
+exports.removeQueryToUrl = removeQueryToUrl;

package/index-template.js

@@ -298,7 +298,7 @@ if (!(window?.location?.hostname === 'localhost')) {
     integrations: [
       new Integrations.BrowserTracing()
     ],
-    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.6',
+    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.8',
     // Release health
     autoSessionTracking: true,
     ignoreErrors: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.33.1",
+  "version": "1.35.0",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.33.0",
+    "ordering-components-admin-external": "1.35.0",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/BusinessIntelligence/AnalyticsCalendar/index.js

@@ -65,6 +65,10 @@ export const AnalyticsCalendar = (props) => {
     return formattedDate
   }
 
+  const singleDateFormat = (selectedDate) => {
+
+  }
+
   useEffect(() => {
     window.addEventListener('click', handleClickOutside)
     return () => window.removeEventListener('click', handleClickOutside)

package/src/components/BusinessIntelligence/AnalyticsOrdersOrSales/index.js

@@ -1,6 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react'
 import 'chartjs-adapter-moment'
-import moment from 'moment'
 import {
   Container,
   ChartContentWrapper,
@@ -28,127 +27,10 @@ export const AnalyticsOrdersOrSales = (props) => {
   const [{ parsePrice }] = useUtils()
   const chartRef = useRef(null)
   const [isShowPreview, setIsShowPreview] = useState(false)
-  const [timeAxes, setTimeAxes] = useState([])
-
-  const getTimeAxes = (lapse) => {
-    const xAxes = {
-      type: 'time',
-      grid: {
-        display: false
-      },
-      time: {
-        stepSize: 1,
-        displayFormats: {
-          hour: 'LT'
-        }
-      },
-      ticks: {
-        fontSize: 12,
-        fontColor: '#CED4DA'
-      }
-    }
-    switch (lapse) {
-      case 'today':
-      case 'yesterday':
-        xAxes.time.unit = 'hour'
-        xAxes.time.min = moment().subtract(lapse === 'today' ? 0 : 1, 'days').format('YYYY-MM-DD 00:00:00')
-        xAxes.time.max = moment().subtract(lapse === 'today' ? 0 : 1, 'days').format('YYYY-MM-DD 24:00:00')
-        break
-      case 'last_7_days':
-      case 'last_30_days':
-        xAxes.time.unit = 'day'
-        xAxes.time.min = moment().subtract(lapse === 'last_7_days' ? 7 : 30, 'days').format('YYYY-MM-DD')
-        xAxes.time.max = moment().format('YYYY-MM-DD')
-        break
-      default: {
-        const _lapse = lapse.split(',')
-        const from = moment(_lapse[0] + ' 00:00:00')
-        const to = moment(_lapse[1] + ' 24:00:00')
-        const duration = moment.duration(from.diff(to))
-        const hours = Math.abs(duration.asHours())
-        const days = Math.abs(duration.asDays())
-        const months = Math.abs(duration.asMonths())
-        if (hours <= 24) {
-          xAxes.time.unit = 'hour'
-          xAxes.time.min = from.format('YYYY-MM-DD HH:mm:ss')
-          xAxes.time.max = to.format('YYYY-MM-DD HH:mm:ss')
-        } else if (days <= 30) {
-          xAxes.time.unit = 'day'
-          xAxes.time.min = from.format('YYYY-MM-DD HH:mm:ss')
-          xAxes.time.max = to.format('YYYY-MM-DD HH:mm:ss')
-        } else if (months <= 12) {
-          xAxes.time.unit = 'month'
-          xAxes.time.min = from.format('YYYY-MM-DD HH:mm:ss')
-          xAxes.time.max = to.format('YYYY-MM-DD HH:mm:ss')
-        } else {
-          xAxes.time.unit = 'year'
-          xAxes.time.min = from.format('YYYY-MM-DD HH:mm:ss')
-          xAxes.time.max = to.format('YYYY-MM-DD HH:mm:ss')
-        }
-        break
-      }
-    }
-    return xAxes
-  }
-
-  const updateTimeAxes = () => {
-    var unitdate = getTimeAxes(filterList?.lapse).time.unit
-    var maxdate = moment(getTimeAxes(filterList?.lapse).time.max).endOf(unitdate)
-    var mindate = moment(getTimeAxes(filterList?.lapse).time.min).startOf(unitdate)
-    var curDate = mindate
-    var newTimeAxes = []
-    var adder = 'd'
-    switch (unitdate) {
-      case 'day': adder = 'd'
-        break
-      case 'month': adder = 'M'
-        break
-      case 'year': adder = 'y'
-        break
-      case 'hour': adder = 'h'
-        break
-      default: break
-    }
-    do {
-      newTimeAxes.push(moment(curDate._d.getTime()).format('YYYY-MM-DD HH:mm:ss'))
-      curDate = curDate.clone().add(1, adder)
-    }
-    while (curDate <= maxdate)
-    setTimeAxes(newTimeAxes)
-  }
-
-  const generateData = () => {
-    const values = []
-    timeAxes.forEach(function (axe) {
-      const index = chartDataList?.data?.findIndex(history => {
-        return axe === history?.time
-      })
-      if (index !== -1) {
-        values.push({ x: chartDataList?.data[index]?.time, y: (isOrders ? chartDataList?.data[index]?.orders : chartDataList?.data[index]?.sales) })
-      } else {
-        values.push({ x: axe, y: 0 })
-      }
-    })
-    return values
-  }
-
-  const defaultData = {
-    datasets: [
-      {
-        label: isOrders ? t('ORDERS', 'Orders') : t('SALES', 'Sales'),
-        data: generateData(),
-        fill: false,
-        backgroundColor: 'rgba(75,192,192,0.2)',
-        borderColor: isOrders ? '#2C7BE5' : '#27BCFD',
-        tension: 0.4,
-        borderWidth: 3
-      }
-    ]
-  }
+  const [dataOptions, setDataOptions] = useState(null)
 
   const options = {
     scales: {
-      x: getTimeAxes(filterList?.lapse),
       y: {
         beginAtZero: true,
         grid: {
@@ -216,9 +98,37 @@ export const AnalyticsOrdersOrSales = (props) => {
     setIsShowPreview(true)
   }
 
+  const generateLabel = () => {
+    const values = []
+    chartDataList?.data && chartDataList.data.forEach(data => {
+      values.push(data.time)
+    })
+    return values
+  }
+
+  const generateData = () => {
+    const values = chartDataList.data.map(item => isOrders ? item.orders : item.sales)
+
+    return [{
+      label: isOrders ? t('ORDERS', 'Orders') : t('SALES', 'Sales'),
+      data: [...values],
+      fill: false,
+      backgroundColor: 'rgba(75,192,192,0.2)',
+      borderColor: '#2C7BE5',
+      tension: 0.4,
+      borderWidth: 3
+    }]
+  }
+
   useEffect(() => {
-    updateTimeAxes()
-  }, [filterList])
+    if (chartDataList?.data && chartDataList?.data?.length > 0) {
+      const defaultData = {
+        labels: generateLabel(),
+        datasets: generateData()
+      }
+      setDataOptions(defaultData)
+    }
+  }, [chartDataList])
 
   return (
     <>
@@ -235,7 +145,7 @@ export const AnalyticsOrdersOrSales = (props) => {
             chartDataList?.loading ? (
               <Skeleton height={150} />
             ) : (
-              chartDataList?.data.length > 0 ? <Line data={defaultData} options={options} ref={chartRef} /> : <EmptyContent>{t('NO_DATA', 'No Data')}</EmptyContent>
+              (chartDataList?.data.length > 0 && dataOptions) ? <Line data={dataOptions} options={options} ref={chartRef} /> : <EmptyContent>{t('NO_DATA', 'No Data')}</EmptyContent>
             )
           }
         </ChartContentWrapper>
@@ -257,7 +167,7 @@ export const AnalyticsOrdersOrSales = (props) => {
         onClose={() => setIsShowPreview(false)}
       >
         <ChartContentWrapper>
-          <Line data={defaultData} options={options} />
+          <Line data={dataOptions} options={options} />
         </ChartContentWrapper>
       </Modal>
     </>

package/src/components/BusinessIntelligence/BusinessReviewList/index.js

@@ -1,11 +1,12 @@
 import React, { useState, useEffect } from 'react'
-import { useHistory, useLocation } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 import { useLanguage, useUtils, DashboardBusinessList as BusinessListController } from 'ordering-components-admin-external'
 import Skeleton from 'react-loading-skeleton'
 import { useTheme } from 'styled-components'
 import { StarFill } from 'react-bootstrap-icons'
 import { Confirm, Pagination, SideBar } from '../../Shared'
 import { BusinessReviewDetails } from '../BusinessReviewDetails'
+import { addQueryToUrl, removeQueryToUrl } from '../../../utils'
 
 import {
   ReviewsTable,
@@ -26,10 +27,10 @@ const BusinessReviewsListingUI = (props) => {
     getPageBusinesses,
     handleUpdateReview,
     onSearch,
-    handleOpenProducts
+    handleOpenProducts,
+    isUseQuery
   } = props
 
-  const history = useHistory()
   const query = new URLSearchParams(useLocation().search)
   const [, t] = useLanguage()
   const theme = useTheme()
@@ -53,8 +54,7 @@ const BusinessReviewsListingUI = (props) => {
     setCurBusinessId(business.id)
     setOpenReview(true)
     if (!isInitialRender) {
-      const tab = query.get('tab')
-      history.replace(`${location.pathname}?tab=${tab}&id=${business.id}`)
+      addQueryToUrl({ id: business.id })
     }
   }
 
@@ -66,8 +66,7 @@ const BusinessReviewsListingUI = (props) => {
   const handleCloseReviewDetails = () => {
     setCurBusiness(null)
     setOpenReview(false)
-    const tab = query.get('tab')
-    history.replace(`${location.pathname}?tab=${tab}`)
+    removeQueryToUrl(['id'])
   }
 
   useEffect(() => {
@@ -78,6 +77,13 @@ const BusinessReviewsListingUI = (props) => {
       setOpenReview(true)
     }
   }, [])
+  useEffect(() => {
+    if (!isUseQuery || !pagination?.currentPage || !pagination?.pageSize || !pagination?.total) return
+    addQueryToUrl({
+      page: pagination.currentPage,
+      pageSize: pagination.pageSize
+    })
+  }, [pagination?.currentPage, pagination?.pageSize, pagination?.total])
 
   return (
     <>

package/src/components/BusinessIntelligence/InvoiceBusinessManager/index.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react'
-import { useHistory, useLocation } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 import { useLanguage, useApi, InvoiceBusinessManager as InvoiceBusinessManagerController } from 'ordering-components-admin-external'
 import { DragScroll, SpinnerLoader } from '../../Shared'
 import {
@@ -18,13 +18,13 @@ import { InvoiceOrderType } from '../InvoiceOrdertype'
 import { InvoiceBusinessPdf } from '../InvoiceBusinessPdf'
 import { IconButton } from '../../../styles'
 import { Download } from 'react-bootstrap-icons'
+import { addQueryToUrl } from '../../../utils'
 
 const InvoiceBusinessManagerUI = (props) => {
   const {
     exportInvoiceList
   } = props
 
-  const history = useHistory()
   const query = new URLSearchParams(useLocation().search)
   const [, t] = useLanguage()
   const [ordering] = useApi()
@@ -38,8 +38,7 @@ const InvoiceBusinessManagerUI = (props) => {
     window.scrollTo(0, 0)
     setSelectedDetailType(detailType)
     if (!isInitialRender) {
-      const invoice = query.get('invoice')
-      history.replace(`${location.pathname}?invoice=${invoice}&tab=${detailType}`)
+      addQueryToUrl({ tab: detailType })
     }
   }
 

package/src/components/BusinessIntelligence/InvoiceDriverManager/index.js

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from 'react'
-import { useHistory, useLocation } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 import { useLanguage, useApi, InvoiceDriverManager as InvoiceDriverManagerController } from 'ordering-components-admin-external'
 import { DragScroll, SpinnerLoader } from '../../Shared'
 import {
@@ -16,13 +16,13 @@ import { InvoicePayMethods } from '../InvoicePayMethods'
 import { InvoiceDriverPdf } from '../InvoiceDriverPdf'
 import { Download } from 'react-bootstrap-icons'
 import { IconButton } from '../../../styles'
+import { addQueryToUrl } from '../../../utils'
 
 const InvoiceDriverManagerUI = (props) => {
   const {
     exportInvoiceList
   } = props
 
-  const history = useHistory()
   const query = new URLSearchParams(useLocation().search)
   const [, t] = useLanguage()
   const [ordering] = useApi()
@@ -35,8 +35,7 @@ const InvoiceDriverManagerUI = (props) => {
     window.scrollTo(0, 0)
     setSelectedDetailType(detailType)
     if (!isInitialRender) {
-      const invoice = query.get('invoice')
-      history.replace(`${location.pathname}?invoice=${invoice}&tab=${detailType}`)
+      addQueryToUrl({ tab: detailType })
     }
   }
 

package/src/components/BusinessIntelligence/InvoiceManager/index.js

@@ -1,10 +1,11 @@
 import React, { useEffect, useState } from 'react'
-import { useHistory, useLocation } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 import { useLanguage } from 'ordering-components-admin-external'
 import { useInfoShare } from '../../../contexts/InfoShareContext'
 import { IconButton } from '../../../styles'
 import { InvoiceDetails } from '../InvoiceDetails'
 import { SideBar } from '../../Shared'
+import { addQueryToUrl, removeQueryToUrl } from '../../../utils'
 
 import {
   List as MenuIcon,
@@ -21,7 +22,6 @@ import {
 } from './styles'
 
 export const InvoiceManager = (props) => {
-  const history = useHistory()
   const query = new URLSearchParams(useLocation().search)
   const [, t] = useLanguage()
   const [{ isCollapse }, { handleMenuCollapse }] = useInfoShare()
@@ -37,14 +37,14 @@ export const InvoiceManager = (props) => {
     setOpenInvoiceDetail(true)
     setSelectedInvoice(index)
     if (!isInitialRender) {
-      history.replace(`${location.pathname}?invoice=${index}`)
+      addQueryToUrl({ invoice: index })
     }
   }
 
   const handleCloseInvoiceDetail = () => {
     setOpenInvoiceDetail(false)
     setSelectedInvoice(null)
-    history.replace(`${location.pathname}`)
+    removeQueryToUrl(['invoice', 'tab'])
   }
 
   useEffect(() => {