ordering-ui-admin-external 1.45.6 → 1.45.8

package/_modules/components/Orders/OrdersDashboardSLAControls/index.js

@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _FirstSelect = require("../../../styles/Select/FirstSelect");
 var _OrderDashboardSLASetting = require("../OrderDashboardSLASetting");
+var _FilterValuesContext = require("../../../contexts/FilterValuesContext");
 var _styles = require("./styles");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -16,6 +17,11 @@ function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArra
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -23,9 +29,14 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var OrdersDashboardSLAControls = exports.OrdersDashboardSLAControls = function OrdersDashboardSLAControls(props) {
+  var _filterValues$timeSta;
   var setTimeStatus = props.setTimeStatus,
     setSlaSettingTime = props.setSlaSettingTime;
-  var _useState = (0, _react.useState)('default'),
+  var _useFilterValues = (0, _FilterValuesContext.useFilterValues)(),
+    _useFilterValues2 = _slicedToArray(_useFilterValues, 2),
+    filterValues = _useFilterValues2[0],
+    handleFilterValues = _useFilterValues2[1].handleFilterValues;
+  var _useState = (0, _react.useState)((_filterValues$timeSta = filterValues === null || filterValues === void 0 ? void 0 : filterValues.timeStatus) !== null && _filterValues$timeSta !== void 0 ? _filterValues$timeSta : 'default'),
     _useState2 = _slicedToArray(_useState, 2),
     defaultOptionValue = _useState2[0],
     setDefaultOptionValue = _useState2[1];
@@ -86,9 +97,15 @@ var OrdersDashboardSLAControls = exports.OrdersDashboardSLAControls = function O
     }
     setDefaultOptionValue(val);
     if (val === 'default') {
+      handleFilterValues(_objectSpread(_objectSpread({}, filterValues), {}, {
+        timeStatus: null
+      }));
       setTimeStatus(null);
       return;
     }
+    handleFilterValues(_objectSpread(_objectSpread({}, filterValues), {}, {
+      timeStatus: val
+    }));
     setTimeStatus(val);
   };
   var handleChangeSearch = function handleChangeSearch(searchValue) {
@@ -97,6 +114,10 @@ var OrdersDashboardSLAControls = exports.OrdersDashboardSLAControls = function O
     }));
     setFilteredTimeStatus(_filteredTimeStatus);
   };
+  (0, _react.useEffect)(function () {
+    if (filterValues !== null && filterValues !== void 0 && filterValues.timeStatus) return;
+    setDefaultOptionValue('default');
+  }, [filterValues === null || filterValues === void 0 ? void 0 : filterValues.timeStatus]);
   (0, _react.useEffect)(function () {
     setFilteredTimeStatus(timeStatus);
   }, []);

package/_modules/components/Orders/OrdersListing/index.js

@@ -96,7 +96,7 @@ var OrdersListing = exports.OrdersListing = /*#__PURE__*/(0, _react.memo)(functi
   }, {
     value: 'dateTime',
     content: t('DATE_TIME', 'Date and time'),
-    enabled: true
+    enabled: !showExternalId
   }, {
     value: 'agent',
     content: t('AGENT', 'Agent'),

package/_modules/contexts/FilterValuesContext/index.js

@@ -54,7 +54,8 @@ var FilterValuesProvider = exports.FilterValuesProvider = function FilterValuesP
       customerLastname: null,
       coupon: null,
       offerId: null,
-      administratorIds: []
+      administratorIds: [],
+      timeStatus: null
     }),
     _useState2 = _slicedToArray(_useState, 2),
     filterValues = _useState2[0],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.45.06",
+  "version": "1.45.08",
   "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.43.63",
+    "ordering-components-admin-external": "1.43.65",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Orders/OrdersDashboardSLAControls/index.js

@@ -3,6 +3,7 @@ import { useLanguage } from 'ordering-components-admin-external'
 
 import { Select as FirstSelect } from '../../../styles/Select/FirstSelect'
 import { OrderDashboardSLASetting } from '../OrderDashboardSLASetting'
+import { useFilterValues } from '../../../contexts/FilterValuesContext'
 
 import {
   OrdersDashboardSLAControlsContainer,
@@ -13,7 +14,8 @@ import {
 
 export const OrdersDashboardSLAControls = (props) => {
   const { setTimeStatus, setSlaSettingTime } = props
-  const [defaultOptionValue, setDefaultOptionValue] = useState('default')
+  const [filterValues, { handleFilterValues }] = useFilterValues()
+  const [defaultOptionValue, setDefaultOptionValue] = useState(filterValues?.timeStatus ?? 'default')
   const [filteredTimeStatus, setFilteredTimeStatus] = useState([])
   const [settingOptionOpen, setSettingOptionOpen] = useState(false)
   const [, t] = useLanguage()
@@ -77,9 +79,11 @@ export const OrdersDashboardSLAControls = (props) => {
     }
     setDefaultOptionValue(val)
     if (val === 'default') {
+      handleFilterValues({ ...filterValues, timeStatus: null })
       setTimeStatus(null)
       return
     }
+    handleFilterValues({ ...filterValues, timeStatus: val })
     setTimeStatus(val)
   }
 
@@ -88,6 +92,11 @@ export const OrdersDashboardSLAControls = (props) => {
     setFilteredTimeStatus(_filteredTimeStatus)
   }
 
+  useEffect(() => {
+    if (filterValues?.timeStatus) return
+    setDefaultOptionValue('default')
+  }, [filterValues?.timeStatus])
+
   useEffect(() => {
     setFilteredTimeStatus(timeStatus)
   }, [])

package/src/components/Orders/OrdersListing/index.js

@@ -86,7 +86,7 @@ export const OrdersListing = memo((props) => {
     {
       value: 'dateTime',
       content: t('DATE_TIME', 'Date and time'),
-      enabled: true
+      enabled: !showExternalId
     },
     {
       value: 'agent',

package/src/contexts/FilterValuesContext/index.js

@@ -37,7 +37,8 @@ export const FilterValuesProvider = ({ children }) => {
     customerLastname: null,
     coupon: null,
     offerId: null,
-    administratorIds: []
+    administratorIds: [],
+    timeStatus: null
   })
 
   const handleFilterValues = (filterValues) => {