@bigbinary/neeto-filters-frontend 2.11.19 → 2.11.20

package/dist/index.js

@@ -2,13 +2,13 @@ import React, { useContext, useState, useRef, useEffect, useCallback, useMemo }
 import classnames from 'classnames';
 import { removeBy, findBy, isNotEmpty, humanize, noop as noop$2, toLabelAndValue, replaceBy, isPresent, existsBy, filterBy } from '@bigbinary/neeto-commons-frontend/pure';
 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 { groupBy, anyPass, isNil, isEmpty, any, mergeLeft, identity, omit, mergeRight, concat, pluck, either, has as has$1, toPairs, equals, pick, modify, prop, isNotNil, append, last } from 'ramda';
+import { groupBy, anyPass, isNil, isEmpty, any, mergeLeft, identity, omit, mergeRight, concat, pluck, either, has as has$1, toPairs, equals, pick, modify, prop, isNotNil, append, last, not } from 'ramda';
 import { useHistory, useLocation } from 'react-router-dom';
 import { useHotKeys, useDebounce } from '@bigbinary/neeto-commons-frontend/react-utils';
 import { Close, Search, Check, MenuHorizontal, Down, Settings } from '@bigbinary/neeto-icons';
+import dayjs from 'dayjs';
 import { getQueryParams, dateFormat } from '@bigbinary/neeto-commons-frontend/utils';
 import * as yup from 'yup';
-import dayjs from 'dayjs';
 import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
 import weekday from 'dayjs/plugin/weekday';
@@ -3360,6 +3360,12 @@ var DATE_OPTIONS = [{
 }, {
   label: "All time",
   value: "all-time"
+}, {
+  label: "After",
+  value: "after"
+}, {
+  label: "Before",
+  value: "before"
 }, {
   label: "Custom date range",
   value: "custom-date-range"
@@ -3586,7 +3592,7 @@ var splitFilter = function splitFilter(multiColumnFilter) {
 var buildDateValue = function buildDateValue(_ref6) {
   var value = _ref6.value;
   var rule = DATE_RULES[value] || "between";
-  var dateValue = value === "custom-date-range" ? "" : value;
+  var dateValue = ["before", "after", "custom-date-range"].includes(value) ? "" : value;
   return {
     value: dateValue,
     rule: rule,
@@ -4039,6 +4045,16 @@ var getKeywordValueFromUrl = function getKeywordValueFromUrl() {
   return getQueryParams()["keyword"] || "";
 };
 
+var buildCustomDateValue = function buildCustomDateValue(value) {
+  var isBeforeOrAfter = Math.abs(dayjs(value[1]).diff(dayjs(value[0]), "year")) >= 90;
+  if (isBeforeOrAfter) {
+    var currentMoment = dayjs();
+    var diffWithStart = Math.abs(currentMoment.diff(dayjs(value[0]), "year"));
+    var diffWithEnd = Math.abs(currentMoment.diff(dayjs(value[1]), "year"));
+    return diffWithStart < diffWithEnd ? "after-".concat(dateFormat.date(dayjs(value[0]).subtract(1, "day"))) : "before-".concat(dateFormat.date(dayjs(value[1]).add(1, "day")));
+  }
+  return value.map(dateFormat.date).join(" - ");
+};
 var buildFilterValue = function buildFilterValue(filter) {
   var _findBy2;
   var _filter$defaultType = filter.defaultType,
@@ -4051,7 +4067,7 @@ var buildFilterValue = function buildFilterValue(filter) {
     return value.toString();
   }));
   if (isDate(defaultType) && isCustomDateRange(value)) {
-    return value.map(dateFormat.date).join(" - ");
+    return buildCustomDateValue(value);
   } else if (isTime(defaultType) && isCustomTimeRange(value)) {
     return value.map(dateFormat.time).join(" - ");
   } else if (isDate(defaultType) || isTime(defaultType)) {
@@ -7101,13 +7117,6 @@ var buildDropdownValue = function buildDropdownValue(_ref) {
     value: filter.value
   }, options);
 };
-var buildDatetimeValue = function buildDatetimeValue(filter) {
-  var _findBy;
-  if (!filter) return null;
-  return (_findBy = findBy({
-    value: filter.value
-  }, DATE_OPTIONS)) !== null && _findBy !== void 0 ? _findBy : last(DATE_OPTIONS);
-};
 var buildSingleTimeValue = function buildSingleTimeValue(filter) {
   var _findBy2;
   if (!filter) return null;
@@ -7144,6 +7153,44 @@ var buildDropdownOptions = function buildDropdownOptions(_ref3) {
   }
   return options;
 };
+var initializeDateRule = function initializeDateRule(filter) {
+  return filter ? findBy({
+    value: filter === null || filter === void 0 ? void 0 : filter.value
+  }, DATE_OPTIONS) || findDateOption(filter, DATE_OPTIONS) : {};
+};
+var getDateValue = function getDateValue(value, rule) {
+  if (isEmpty(value) || isNil(value)) {
+    return null;
+  }
+  if (rule.value === "custom-date-range") {
+    return value;
+  }
+  return rule.value === "before" ? dayjs(value[1]).add(1, "day") : dayjs(value[0]).subtract(1, "day");
+};
+var findDateOption = function findDateOption(filter, options) {
+  var value = filter.value;
+  var isBeforeOrAfter = dayjs(value[1]).diff(dayjs(value[0]), "year") >= 90;
+  if (not(isBeforeOrAfter)) {
+    return last(options);
+  }
+  var currentMoment = dayjs();
+  var diffWithStart = Math.abs(currentMoment.diff(dayjs(value[0]), "year"));
+  var diffWithEnd = Math.abs(currentMoment.diff(dayjs(value[1]), "year"));
+  var returnOption = diffWithStart < diffWithEnd ? findBy({
+    value: "after"
+  }, options) : findBy({
+    value: "before"
+  }, options);
+  return returnOption;
+};
+var buildDateValues = function buildDateValues(dates, selectedRule) {
+  if (selectedRule.value === "after") {
+    return [dates.add(1, "day"), dates.add(100, "year")];
+  } else if (selectedRule.value === "before") {
+    return [dates.subtract(100, "year"), dates.subtract(1, "day")];
+  }
+  return dates;
+};
 
 var Boolean$1 = function Boolean(_ref) {
   var column = _ref.column,
@@ -7199,22 +7246,27 @@ var Datetime = function Datetime(_ref) {
     filter = _ref.filter,
     handleApplyFilter = _ref.handleApplyFilter,
     autoFocus = _ref.autoFocus;
+  var _useState = useState(initializeDateRule(filter)),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectedRule = _useState2[0],
+    setSelectedRule = _useState2[1];
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var key = column.key,
     _column$defaultType = column.defaultType,
     defaultType = _column$defaultType === void 0 ? column.type : _column$defaultType,
     label = column.label;
+  var isDatePickerShown = filter && isCustomDateRange(filter.value);
   var otherProps = getOtherProps(column);
-  var value = buildDatetimeValue(filter);
-  var isCustomDateRangeShown = filter && isCustomDateRange(filter.value);
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
   var handleChange = function handleChange(option) {
     if (isEmpty(option) || isNil(option)) {
       handleApplyFilter({
         _delete: true
       });
+      setSelectedRule({});
       return;
     }
+    setSelectedRule(option);
     var updatedFilter = buildUpdatedFilter({
       column: column,
       defaultType: defaultType,
@@ -7227,13 +7279,14 @@ var Datetime = function Datetime(_ref) {
       handleApplyFilter({
         _delete: true
       });
+      setSelectedRule({});
       return;
     }
     var updatedFilter = buildUpdatedFilter({
       column: column,
       defaultType: defaultType,
       option: {
-        value: pluck("$d", dates).map(function (date) {
+        value: pluck("$d", buildDateValues(dates, selectedRule)).map(function (date) {
           return date.toISOString();
         })
       }
@@ -7249,15 +7302,15 @@ var Datetime = function Datetime(_ref) {
     label: label,
     options: DATE_OPTIONS,
     strategy: "fixed",
-    value: value,
+    value: selectedRule,
     placeholder: t("messages.selectResource", {
       resource: label.toLocaleLowerCase()
     }),
     onChange: handleChange
-  }), isCustomDateRangeShown && /*#__PURE__*/React.createElement(DatePicker, _extends$1({
+  }), isDatePickerShown && /*#__PURE__*/React.createElement(DatePicker, _extends$1({
     "data-cy": "neeto-filters-".concat(key, "-date-range"),
-    type: "range",
-    value: filter.value,
+    type: (selectedRule === null || selectedRule === void 0 ? void 0 : selectedRule.value) === "custom-date-range" ? "range" : "date",
+    value: getDateValue(filter === null || filter === void 0 ? void 0 : filter.value, selectedRule),
     onChange: handleDateRangeChange
   }, otherProps)));
 };