@bigbinary/neeto-filters-frontend 3.2.3 → 3.2.4

package/dist/index.js

@@ -4,7 +4,7 @@ import i18next, { t as t$1 } from 'i18next';
 import { findBy, isNotEmpty, capitalize, removeBy, humanize, hyphenate, noop, toLabelAndValue, replaceBy, isPresent, existsBy, isNotPresent, filterBy } from '@bigbinary/neeto-cist';
 import { useMutationWithInvalidation, useQueryParams, useDebounce, withT } from '@bigbinary/neeto-commons-frontend/react-utils';
 import { buildUrl, getQueryParams, dateFormat } from '@bigbinary/neeto-commons-frontend/utils';
-import { Tooltip, Typography, Dropdown as Dropdown$2, Button, Pane as Pane$1, Alert, Select, DatePicker, TimePicker, Input as Input$1, Accordion, Spinner } from '@bigbinary/neetoui';
+import { Tooltip, Typography, Dropdown as Dropdown$2, Button, Pane as Pane$1, Alert, Select, DatePicker, TimePickerInput, Input as Input$1, Accordion, Spinner } from '@bigbinary/neetoui';
 import { groupBy, anyPass, isNil, isEmpty, any, concat, omit, mergeLeft, toLower, identity, mergeRight, toPairs, not, pluck, either, has, equals, pick, modify, prop, isNotNil, append, last, mergeDeepRight } from 'ramda';
 import { useTranslation, Trans } from 'react-i18next';
 import { useHistory, useLocation } from 'react-router-dom';
@@ -533,7 +533,7 @@ var buildFiltersFromSearchParams = function buildFiltersFromSearchParams(columns
       }, column);
     } else if (isTime(defaultType) && isCustomTimeRange(value)) {
       return mergeLeft({
-        value: value.split(",")
+        value: value
       }, column);
     } else if (isSingleDate(defaultType)) {
       var _value$split3 = value.split("+rule-"),
@@ -939,6 +939,9 @@ var getColumnsWithStandardizedType = function getColumnsWithStandardizedType(col
     });
   });
 };
+var isNilOrEmpty = function isNilOrEmpty(param) {
+  return isNil(param) || isEmpty(param);
+};
 var isKeywordFilterPresent = function isKeywordFilterPresent(keyworFilter) {
   return not(isEmpty(keyworFilter.node));
 };
@@ -1290,6 +1293,7 @@ var Segment = function Segment(_ref) {
     });
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, isNil(segmentId) ? /*#__PURE__*/React.createElement(Button, {
+    "data-cy": "save-segment-button",
     disabled: hasOnlyKeywordFilter(filters),
     label: t("neetoFilters.segments.saveAsSegment"),
     style: "secondary",
@@ -1718,6 +1722,31 @@ var buildDateValues = function buildDateValues(dates, selectedRule) {
 var buildHelpIconProps = function buildHelpIconProps(helpIconProps) {
   return mergeDeepRight(DEFAULT_HELP_ICON_PROPS, helpIconProps);
 };
+var hasInvalidTimes = function hasInvalidTimes(times) {
+  if (Array.isArray(times)) {
+    return times.some(function (time) {
+      return time.isValid();
+    }) === false;
+  }
+  return !times.isValid();
+};
+var areCustomTimeRangeValuesNotValid = function areCustomTimeRangeValuesNotValid(times) {
+  return !times.every(function (time) {
+    return time.isValid();
+  });
+};
+
+// eslint-disable-next-line @bigbinary/neeto/use-standard-date-time-formats
+var formatSingleTime = function formatSingleTime(time) {
+  return dayjs(time).format("HH:mm:ss");
+};
+var formatTime = function formatTime(value, timePickerType) {
+  if (isNilOrEmpty(value)) return null;
+  if (timePickerType === "range") {
+    return value.map(formatSingleTime);
+  }
+  return formatSingleTime(value);
+};
 
 var Boolean = function Boolean(_ref) {
   var column = _ref.column,
@@ -2064,6 +2093,15 @@ var SingleTime = function SingleTime(_ref) {
     handleApplyFilter(updatedFilter);
   };
   var handleChange = function handleChange(times) {
+    if (hasInvalidTimes(times)) {
+      handleApplyFilter({
+        _delete: true
+      });
+      return;
+    }
+    if (timePickerType === "range" && areCustomTimeRangeValuesNotValid(times)) {
+      return;
+    }
     var value = timePickerType === "range" ? pluck("$d", times).map(function (time) {
       return time.toISOString();
     }) : times["$d"].toISOString();
@@ -2076,6 +2114,7 @@ var SingleTime = function SingleTime(_ref) {
     });
     handleApplyFilter(updatedFilter);
   };
+  var formattedTime = formatTime(value, timePickerType);
   return /*#__PURE__*/React.createElement("div", {
     className: "neeto-filters-pane-filter__item-wrapper"
   }, /*#__PURE__*/React.createElement(Select, _extends({
@@ -2090,15 +2129,12 @@ var SingleTime = function SingleTime(_ref) {
     }
   }, {
     onChange: handleRuleChange
-  })), /*#__PURE__*/React.createElement(TimePicker, _extends({
+  })), /*#__PURE__*/React.createElement(TimePickerInput, _extends({
     autoFocus: autoFocus,
-    value: value,
-    use12Hours: true,
     className: "w-full",
     "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    format: "h:mm A",
-    getPopupContainer: prop("parentNode"),
     type: timePickerType,
+    value: formattedTime,
     onChange: handleChange
   }, otherProps)));
 };
@@ -2241,6 +2277,15 @@ var Time = function Time(_ref) {
     handleApplyFilter(updatedFilter);
   };
   var handleTimeRangeChange = function handleTimeRangeChange(times) {
+    if (hasInvalidTimes(times)) {
+      handleApplyFilter({
+        _delete: true
+      });
+      return;
+    }
+    if (isCustomTimeRangeShown && areCustomTimeRangeValuesNotValid(times)) {
+      return;
+    }
     var updatedFilter = buildUpdatedFilter({
       column: column,
       defaultType: defaultType,
@@ -2271,13 +2316,11 @@ var Time = function Time(_ref) {
     }
   }, {
     onChange: handleChange
-  })), isCustomTimeRangeShown && /*#__PURE__*/React.createElement(TimePicker, _extends({
-    use12Hours: true,
+  })), isCustomTimeRangeShown && /*#__PURE__*/React.createElement(TimePickerInput, _extends({
+    className: "w-full",
     "data-cy": "neeto-filters-".concat(hyphenate(key), "-date-range"),
-    format: "h:mm A",
-    getPopupContainer: prop("parentNode"),
     type: "range",
-    value: filter.value,
+    value: formatTime(filter.value, "range"),
     onChange: handleTimeRangeChange
   }, otherProps)));
 };
@@ -2847,6 +2890,7 @@ var MenuBlocks = function MenuBlocks(_ref) {
     return /*#__PURE__*/React.createElement(MenuBar.Block, {
       active: segment.id === segmentId,
       count: segment.count,
+      "data-cy": "neeto-filters-segment-block-".concat(hyphenate(segment.name)),
       key: segment.id,
       label: segment.name,
       onClick: function onClick() {