@bigbinary/neeto-filters-frontend 2.11.19 → 2.11.20

package/dist/index.cjs.js

@@ -10,9 +10,9 @@ var ramda = require('ramda');
 var reactRouterDom = require('react-router-dom');
 var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
 var neetoIcons = require('@bigbinary/neeto-icons');
+var dayjs = require('dayjs');
 var utils = require('@bigbinary/neeto-commons-frontend/utils');
 var yup = require('yup');
-var dayjs = require('dayjs');
 var timezone = require('dayjs/plugin/timezone');
 var utc = require('dayjs/plugin/utc');
 var weekday = require('dayjs/plugin/weekday');
@@ -44,8 +44,8 @@ function _interopNamespace(e) {
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
-var yup__namespace = /*#__PURE__*/_interopNamespace(yup);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
+var yup__namespace = /*#__PURE__*/_interopNamespace(yup);
 var timezone__default = /*#__PURE__*/_interopDefaultLegacy(timezone);
 var utc__default = /*#__PURE__*/_interopDefaultLegacy(utc);
 var weekday__default = /*#__PURE__*/_interopDefaultLegacy(weekday);
@@ -3395,6 +3395,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"
@@ -3621,7 +3627,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,
@@ -4074,6 +4080,16 @@ var getKeywordValueFromUrl = function getKeywordValueFromUrl() {
   return utils.getQueryParams()["keyword"] || "";
 };
 
+var buildCustomDateValue = function buildCustomDateValue(value) {
+  var isBeforeOrAfter = Math.abs(dayjs__default["default"](value[1]).diff(dayjs__default["default"](value[0]), "year")) >= 90;
+  if (isBeforeOrAfter) {
+    var currentMoment = dayjs__default["default"]();
+    var diffWithStart = Math.abs(currentMoment.diff(dayjs__default["default"](value[0]), "year"));
+    var diffWithEnd = Math.abs(currentMoment.diff(dayjs__default["default"](value[1]), "year"));
+    return diffWithStart < diffWithEnd ? "after-".concat(utils.dateFormat.date(dayjs__default["default"](value[0]).subtract(1, "day"))) : "before-".concat(utils.dateFormat.date(dayjs__default["default"](value[1]).add(1, "day")));
+  }
+  return value.map(utils.dateFormat.date).join(" - ");
+};
 var buildFilterValue = function buildFilterValue(filter) {
   var _findBy2;
   var _filter$defaultType = filter.defaultType,
@@ -4086,7 +4102,7 @@ var buildFilterValue = function buildFilterValue(filter) {
     return value.toString();
   }));
   if (isDate(defaultType) && isCustomDateRange(value)) {
-    return value.map(utils.dateFormat.date).join(" - ");
+    return buildCustomDateValue(value);
   } else if (isTime(defaultType) && isCustomTimeRange(value)) {
     return value.map(utils.dateFormat.time).join(" - ");
   } else if (isDate(defaultType) || isTime(defaultType)) {
@@ -7136,13 +7152,6 @@ var buildDropdownValue = function buildDropdownValue(_ref) {
     value: filter.value
   }, options);
 };
-var buildDatetimeValue = function buildDatetimeValue(filter) {
-  var _findBy;
-  if (!filter) return null;
-  return (_findBy = pure.findBy({
-    value: filter.value
-  }, DATE_OPTIONS)) !== null && _findBy !== void 0 ? _findBy : ramda.last(DATE_OPTIONS);
-};
 var buildSingleTimeValue = function buildSingleTimeValue(filter) {
   var _findBy2;
   if (!filter) return null;
@@ -7179,6 +7188,44 @@ var buildDropdownOptions = function buildDropdownOptions(_ref3) {
   }
   return options;
 };
+var initializeDateRule = function initializeDateRule(filter) {
+  return filter ? pure.findBy({
+    value: filter === null || filter === void 0 ? void 0 : filter.value
+  }, DATE_OPTIONS) || findDateOption(filter, DATE_OPTIONS) : {};
+};
+var getDateValue = function getDateValue(value, rule) {
+  if (ramda.isEmpty(value) || ramda.isNil(value)) {
+    return null;
+  }
+  if (rule.value === "custom-date-range") {
+    return value;
+  }
+  return rule.value === "before" ? dayjs__default["default"](value[1]).add(1, "day") : dayjs__default["default"](value[0]).subtract(1, "day");
+};
+var findDateOption = function findDateOption(filter, options) {
+  var value = filter.value;
+  var isBeforeOrAfter = dayjs__default["default"](value[1]).diff(dayjs__default["default"](value[0]), "year") >= 90;
+  if (ramda.not(isBeforeOrAfter)) {
+    return ramda.last(options);
+  }
+  var currentMoment = dayjs__default["default"]();
+  var diffWithStart = Math.abs(currentMoment.diff(dayjs__default["default"](value[0]), "year"));
+  var diffWithEnd = Math.abs(currentMoment.diff(dayjs__default["default"](value[1]), "year"));
+  var returnOption = diffWithStart < diffWithEnd ? pure.findBy({
+    value: "after"
+  }, options) : pure.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,
@@ -7234,22 +7281,27 @@ var Datetime = function Datetime(_ref) {
     filter = _ref.filter,
     handleApplyFilter = _ref.handleApplyFilter,
     autoFocus = _ref.autoFocus;
+  var _useState = React.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 (ramda.isEmpty(option) || ramda.isNil(option)) {
       handleApplyFilter({
         _delete: true
       });
+      setSelectedRule({});
       return;
     }
+    setSelectedRule(option);
     var updatedFilter = buildUpdatedFilter({
       column: column,
       defaultType: defaultType,
@@ -7262,13 +7314,14 @@ var Datetime = function Datetime(_ref) {
       handleApplyFilter({
         _delete: true
       });
+      setSelectedRule({});
       return;
     }
     var updatedFilter = buildUpdatedFilter({
       column: column,
       defaultType: defaultType,
       option: {
-        value: ramda.pluck("$d", dates).map(function (date) {
+        value: ramda.pluck("$d", buildDateValues(dates, selectedRule)).map(function (date) {
           return date.toISOString();
         })
       }
@@ -7284,15 +7337,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__default["default"].createElement(neetoui.DatePicker, _extends$1({
+  }), isDatePickerShown && /*#__PURE__*/React__default["default"].createElement(neetoui.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)));
 };