@bigbinary/neeto-filters-frontend 2.12.9 → 2.12.11

package/README.md

@@ -190,7 +190,7 @@ const [selectors, setSelectors] = useState(() =>  buildSelectorsFromURL(FILTER_C
 
 ### 5. `buildFilterColumnsFromFields` function
 
-The `buildFilterColumnsFromFields` function is used to generate an array of filter columns based on the provided fields and selected field names.
+The `buildFilterColumnsFromFields` function is used to generate an array of filter columns based on the provided fields (often referred as custom fields) and selected field names.
 
 #### Parameters
 

package/dist/index.cjs.js

@@ -6855,11 +6855,14 @@ var useFilters = function useFilters(_ref) {
       keyword.setValue(keywordValue);
       var defaultFilters = buildDefaultFilters(columns, filters);
       pure.isNotEmpty(defaultFilters) && handlePrecenseOfDefaultFilters(defaultFilters);
+      prevFilters.current = ramda.append(ramda.mergeRight(keywordFilter, {
+        value: keywordValue
+      }), filters);
     } else {
       handleChangesInURL();
       sendUpdatedFilters();
+      prevFilters.current = ramda.append(keywordFilter, filters);
     }
-    prevFilters.current = ramda.append(keywordFilter, filters);
   }, [location.search, defaultValuesOfColumns]);
   return filters;
 };
@@ -7008,9 +7011,12 @@ 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 selectedRule = filter ? initializeDateRule(filter) : {};
   var key = column.key,
     _column$defaultType = column.defaultType,
     defaultType = _column$defaultType === void 0 ? column.type : _column$defaultType,
@@ -7022,8 +7028,10 @@ var Datetime = function Datetime(_ref) {
       handleApplyFilter({
         _delete: true
       });
+      setSelectedRule({});
       return;
     }
+    setSelectedRule(option);
     var updatedFilter = buildUpdatedFilter({
       column: column,
       defaultType: defaultType,
@@ -7036,6 +7044,7 @@ var Datetime = function Datetime(_ref) {
       handleApplyFilter({
         _delete: true
       });
+      setSelectedRule({});
       return;
     }
     var updatedFilter = buildUpdatedFilter({
@@ -7049,13 +7058,16 @@ var Datetime = function Datetime(_ref) {
     });
     handleApplyFilter(updatedFilter);
   };
+  React.useEffect(function () {
+    ramda.isNil(filter) && setSelectedRule({});
+  }, [filter]);
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "neeto-filters-pane-filter__item-wrapper"
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Select, {
     isClearable: true,
     autoFocus: autoFocus,
-    "data-cy": "neeto-filters-".concat(key, "-filter"),
     label: label,
+    "data-cy": "neeto-filters-".concat(key, "-filter"),
     options: DATE_OPTIONS,
     strategy: "fixed",
     value: selectedRule,