@bigbinary/neeto-filters-frontend 3.3.4 → 3.4.0-beta1

package/dist/index.js

@@ -1,10 +1,10 @@
-import React, { useState, useEffect, useMemo, useRef, useTransition } from 'react';
+import React, { useState, useEffect, useMemo, createElement, useRef, useTransition } from 'react';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import classnames from 'classnames';
 import i18next, { t as t$1 } from 'i18next';
 import { findBy, isNotEmpty, capitalize, removeBy, toLabelAndValue, hyphenate, isNotPresent, noop, replaceBy, existsBy, _existsBy, isPresent, humanize, findById, filterBy } from '@bigbinary/neeto-cist';
 import { useDebounce, useQueryParams, useMutationWithInvalidation, withT } from '@bigbinary/neeto-commons-frontend/react-utils';
 import { groupBy, anyPass, isNil, isEmpty, any, concat, omit, mergeLeft, toLower, identity, mergeRight, toPairs, pluck, either, not, has, equals, pick, last, modify, append, mergeDeepRight, prop, assoc, reject, sortBy, project } from 'ramda';
-import { useQuery, useQueryClient } from 'react-query';
 import { Help, Delete as Delete$1, Plus, Close, Down } from '@bigbinary/neeto-icons';
 import Accordion from '@bigbinary/neetoui/Accordion';
 import Button from '@bigbinary/neetoui/Button';
@@ -21,6 +21,7 @@ import dayjs from 'dayjs';
 import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
 import weekday from 'dayjs/plugin/weekday';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import DatePicker from '@bigbinary/neetoui/DatePicker';
 import TimePickerInput from '@bigbinary/neetoui/TimePickerInput';
 import Input from '@bigbinary/neetoui/Input';
@@ -111,21 +112,6 @@ function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
 
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
-
 function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
@@ -335,8 +321,8 @@ var DEFAULT_HELP_ICON_PROPS = {
   }
 };
 
-function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$e(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(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var groupByGroup = groupBy(function (_ref) {
   var group = _ref.group;
   return group || "individual";
@@ -664,7 +650,7 @@ var buildDatePayload = function buildDatePayload(value) {
 var buildSingleDatePayload = function buildSingleDatePayload(filter) {
   var value = filter.value;
   var filterValue = Array.isArray(value) ? value.join(",") : value;
-  return _objectSpread$5(_objectSpread$5({}, filter), {}, {
+  return _objectSpread$e(_objectSpread$e({}, filter), {}, {
     value: filterValue,
     type: "date"
   });
@@ -672,7 +658,7 @@ var buildSingleDatePayload = function buildSingleDatePayload(filter) {
 var buildSingleTimePayload = function buildSingleTimePayload(filter) {
   var value = filter.value;
   var filterValue = Array.isArray(value) ? value.join(",") : value;
-  return _objectSpread$5(_objectSpread$5({}, filter), {}, {
+  return _objectSpread$e(_objectSpread$e({}, filter), {}, {
     value: filterValue,
     type: "time"
   });
@@ -942,7 +928,7 @@ var buildFilterColumnsFromFields = function buildFilterColumnsFromFields(_ref22)
       var id = field.id,
         name = field.name,
         kind = field.kind;
-      var column = _objectSpread$5({
+      var column = _objectSpread$e({
         key: toLower(name),
         node: "".concat(name, ":").concat(id),
         label: capitalize(name),
@@ -966,7 +952,7 @@ var buildFilterColumnsFromFields = function buildFilterColumnsFromFields(_ref22)
 };
 var getColumnsWithStandardizedType = function getColumnsWithStandardizedType(columns) {
   return columns.map(function (column) {
-    return _objectSpread$5(_objectSpread$5({}, column), {}, {
+    return _objectSpread$e(_objectSpread$e({}, column), {}, {
       type: standardizeColumnType(column.type)
     });
   });
@@ -1098,6 +1084,8 @@ var isRuleEmpty = function isRuleEmpty(rule) {
   return equals(rule, "is_unknown");
 };
 
+function ownKeys$d(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$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Boolean = function Boolean(_ref) {
   var column = _ref.column,
     filter = _ref.filter,
@@ -1133,29 +1121,32 @@ var Boolean = function Boolean(_ref) {
     });
     handleApplyFilter(updatedFilter);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-pane-filter__item-wrapper"
-  }, /*#__PURE__*/React.createElement(Select, _extends({
-    autoFocus: autoFocus,
-    label: label,
-    options: options,
-    value: value,
-    isClearable: true
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, {
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    strategy: "fixed",
-    placeholder: t("neetoFilters.messages.selectOption", {
-      resource: label
-    }),
-    onChange: handleChange
-  }, otherProps)));
+  return /*#__PURE__*/jsx("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: /*#__PURE__*/jsx(Select, _objectSpread$d(_objectSpread$d({
+      autoFocus: autoFocus,
+      label: label,
+      options: options,
+      value: value,
+      isClearable: true
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), {}, {
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      strategy: "fixed",
+      placeholder: t("neetoFilters.messages.selectOption", {
+        resource: label
+      }),
+      onChange: handleChange
+    }, otherProps))
+  });
 };
 var Boolean$1 = /*#__PURE__*/React.memo(Boolean);
 
+function ownKeys$c(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$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Datetime = function Datetime(_ref) {
   var column = _ref.column,
     filter = _ref.filter,
@@ -1213,35 +1204,38 @@ var Datetime = function Datetime(_ref) {
   useEffect(function () {
     isNil(filter) && setSelectedRule({});
   }, [filter]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-pane-filter__item-wrapper"
-  }, /*#__PURE__*/React.createElement(Select, _extends({
-    autoFocus: autoFocus,
-    label: label,
-    isClearable: true,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    options: DATE_OPTIONS,
-    strategy: "fixed",
-    value: selectedRule,
-    placeholder: t("neetoFilters.messages.selectResource", {
-      resource: label
-    })
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, {
-    onChange: handleChange
-  })), isDatePickerShown && /*#__PURE__*/React.createElement(DatePicker, _extends({
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-date-range"),
-    getPopupContainer: prop("parentNode"),
-    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)));
+  return /*#__PURE__*/jsxs("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: [/*#__PURE__*/jsx(Select, _objectSpread$c(_objectSpread$c({
+      autoFocus: autoFocus,
+      label: label,
+      isClearable: true,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      options: DATE_OPTIONS,
+      strategy: "fixed",
+      value: selectedRule,
+      placeholder: t("neetoFilters.messages.selectResource", {
+        resource: label
+      })
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), {}, {
+      onChange: handleChange
+    })), isDatePickerShown && /*#__PURE__*/jsx(DatePicker, _objectSpread$c({
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-date-range"),
+      getPopupContainer: prop("parentNode"),
+      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))]
+  });
 };
 var Datetime$1 = /*#__PURE__*/React.memo(Datetime);
 
+function ownKeys$b(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$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Dropdown = function Dropdown(_ref) {
   var column = _ref.column,
     filter = _ref.filter,
@@ -1323,36 +1317,39 @@ var Dropdown = function Dropdown(_ref) {
     if (!isEmpty(filters)) return;
     isRuleEmpty(selectedRule.value) && setSelectedRule(dropdownRules[0]);
   }, [filters]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-pane-filter__item-wrapper"
-  }, showRuleSelector && /*#__PURE__*/React.createElement(Select, {
-    label: label,
-    defaultValue: dropdownRules[0],
-    options: dropdownRules,
-    value: selectedRule,
-    onChange: handleRuleChange
-  }), !isRuleEmpty(selectedRule.value) && /*#__PURE__*/React.createElement(Select, _extends({
-    autoFocus: autoFocus,
-    options: options,
-    value: value,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    isClearable: !defaultValue && isClearable,
-    isMulti: isMulti(defaultType),
-    label: !showRuleSelector && label,
-    strategy: "fixed",
-    placeholder: t("neetoFilters.messages.selectResource", {
-      resource: label
-    })
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, {
-    onChange: handleChange
-  }, otherProps)));
+  return /*#__PURE__*/jsxs("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: [showRuleSelector && /*#__PURE__*/jsx(Select, {
+      label: label,
+      defaultValue: dropdownRules[0],
+      options: dropdownRules,
+      value: selectedRule,
+      onChange: handleRuleChange
+    }), !isRuleEmpty(selectedRule.value) && /*#__PURE__*/jsx(Select, _objectSpread$b(_objectSpread$b({
+      autoFocus: autoFocus,
+      options: options,
+      value: value,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      isClearable: !defaultValue && isClearable,
+      isMulti: isMulti(defaultType),
+      label: !showRuleSelector && label,
+      strategy: "fixed",
+      placeholder: t("neetoFilters.messages.selectResource", {
+        resource: label
+      })
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), {}, {
+      onChange: handleChange
+    }, otherProps))]
+  });
 };
 var Dropdown$1 = /*#__PURE__*/React.memo(Dropdown);
 
+function ownKeys$a(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$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SingleDatetime = function SingleDatetime(_ref) {
   var column = _ref.column,
     filter = _ref.filter,
@@ -1418,31 +1415,34 @@ var SingleDatetime = function SingleDatetime(_ref) {
     });
     handleApplyFilter(updatedFilter);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-pane-filter__item-wrapper"
-  }, /*#__PURE__*/React.createElement(Select, _extends({
-    label: label,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter-rule"),
-    defaultValue: SINGLE_DATE_OPTIONS[0],
-    options: SINGLE_DATE_OPTIONS,
-    strategy: "fixed",
-    value: selectedRule
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, {
-    onChange: handleRuleChange
-  })), /*#__PURE__*/React.createElement(DatePicker, _extends({
-    autoFocus: autoFocus,
-    value: value,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    getPopupContainer: prop("parentNode"),
-    type: datePickerType,
-    onChange: handleChange
-  }, otherProps)));
+  return /*#__PURE__*/jsxs("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: [/*#__PURE__*/jsx(Select, _objectSpread$a(_objectSpread$a({
+      label: label,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter-rule"),
+      defaultValue: SINGLE_DATE_OPTIONS[0],
+      options: SINGLE_DATE_OPTIONS,
+      strategy: "fixed",
+      value: selectedRule
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), {}, {
+      onChange: handleRuleChange
+    })), /*#__PURE__*/jsx(DatePicker, _objectSpread$a({
+      autoFocus: autoFocus,
+      value: value,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      getPopupContainer: prop("parentNode"),
+      type: datePickerType,
+      onChange: handleChange
+    }, otherProps))]
+  });
 };
 
+function ownKeys$9(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$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$9(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$9(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SingleTime = function SingleTime(_ref) {
   var column = _ref.column,
     filter = _ref.filter,
@@ -1510,30 +1510,33 @@ 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({
-    label: label,
-    defaultValue: SINGLE_TIME_OPTIONS[0],
-    options: SINGLE_TIME_OPTIONS,
-    strategy: "fixed",
-    value: selectedRule
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, {
-    onChange: handleRuleChange
-  })), /*#__PURE__*/React.createElement(TimePickerInput, _extends({
-    autoFocus: autoFocus,
-    className: "w-full",
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    type: timePickerType,
-    value: formattedTime,
-    onChange: handleChange
-  }, otherProps)));
+  return /*#__PURE__*/jsxs("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: [/*#__PURE__*/jsx(Select, _objectSpread$9(_objectSpread$9({
+      label: label,
+      defaultValue: SINGLE_TIME_OPTIONS[0],
+      options: SINGLE_TIME_OPTIONS,
+      strategy: "fixed",
+      value: selectedRule
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), {}, {
+      onChange: handleRuleChange
+    })), /*#__PURE__*/jsx(TimePickerInput, _objectSpread$9({
+      autoFocus: autoFocus,
+      className: "w-full",
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      type: timePickerType,
+      value: formattedTime,
+      onChange: handleChange
+    }, otherProps))]
+  });
 };
 
+function ownKeys$8(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$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Text = function Text(_ref) {
   var column = _ref.column,
     filter = _ref.filter,
@@ -1606,41 +1609,44 @@ var Text = function Text(_ref) {
     }
     handleUpdateAndApplyFilter();
   }, [debouncedInputValue]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-pane-filter__item-wrapper"
-  }, showRuleSelector && /*#__PURE__*/React.createElement(Select, _extends({
-    label: label,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter-rule"),
-    defaultValue: ruleOptions[0],
-    options: ruleOptions,
-    strategy: "fixed",
-    value: selectedRule,
-    onChange: handleRuleChange
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  })), /*#__PURE__*/React.createElement(Input, _extends({
-    autoFocus: autoFocus,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    label: !showRuleSelector && label,
-    type: inputType,
-    value: inputValue
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, {
-    placeholder: t("neetoFilters.messages.enterResource", {
-      resource: label
-    }),
-    onChange: function onChange(event) {
-      return setInputValue(event.target.value);
-    },
-    onKeyDown: handleKeydown
-  }, otherProps)));
+  return /*#__PURE__*/jsxs("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: [showRuleSelector && /*#__PURE__*/jsx(Select, _objectSpread$8({
+      label: label,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter-rule"),
+      defaultValue: ruleOptions[0],
+      options: ruleOptions,
+      strategy: "fixed",
+      value: selectedRule,
+      onChange: handleRuleChange
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    })), /*#__PURE__*/jsx(Input, _objectSpread$8(_objectSpread$8({
+      autoFocus: autoFocus,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      label: !showRuleSelector && label,
+      type: inputType,
+      value: inputValue
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), {}, {
+      placeholder: t("neetoFilters.messages.enterResource", {
+        resource: label
+      }),
+      onChange: function onChange(event) {
+        return setInputValue(event.target.value);
+      },
+      onKeyDown: handleKeydown
+    }, otherProps))]
+  });
 };
 
+function ownKeys$7(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$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Time = function Time(_ref) {
   var column = _ref.column,
     filter = _ref.filter,
@@ -1692,35 +1698,38 @@ var Time = function Time(_ref) {
     });
     handleApplyFilter(updatedFilter);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-pane-filter__item-wrapper"
-  }, /*#__PURE__*/React.createElement(Select, _extends({
-    autoFocus: autoFocus,
-    label: label,
-    value: value,
-    isClearable: true,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    options: TIME_OPTIONS,
-    strategy: "fixed",
-    placeholder: t("neetoFilters.messages.selectResource", {
-      resource: label
-    })
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, {
-    onChange: handleChange
-  })), isCustomTimeRangeShown && /*#__PURE__*/React.createElement(TimePickerInput, _extends({
-    className: "w-full",
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-date-range"),
-    type: "range",
-    value: formatTime(filter.value, "range"),
-    onChange: handleTimeRangeChange
-  }, otherProps)));
+  return /*#__PURE__*/jsxs("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: [/*#__PURE__*/jsx(Select, _objectSpread$7(_objectSpread$7({
+      autoFocus: autoFocus,
+      label: label,
+      value: value,
+      isClearable: true,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      options: TIME_OPTIONS,
+      strategy: "fixed",
+      placeholder: t("neetoFilters.messages.selectResource", {
+        resource: label
+      })
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), {}, {
+      onChange: handleChange
+    })), isCustomTimeRangeShown && /*#__PURE__*/jsx(TimePickerInput, _objectSpread$7({
+      className: "w-full",
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-date-range"),
+      type: "range",
+      value: formatTime(filter.value, "range"),
+      onChange: handleTimeRangeChange
+    }, otherProps))]
+  });
 };
 var Time$1 = /*#__PURE__*/React.memo(Time);
 
+function ownKeys$6(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$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TreeSelect = function TreeSelect(_ref) {
   var _findBy;
   var autoFocus = _ref.autoFocus,
@@ -1782,36 +1791,37 @@ var TreeSelect = function TreeSelect(_ref) {
     });
     return handleApplyFilter(updatedFilter);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-pane-filter__item-wrapper"
-  }, showRuleSelector && /*#__PURE__*/React.createElement(Select, {
-    label: label,
-    defaultValue: TREE_SELECT_RULES[0],
-    options: TREE_SELECT_RULES,
-    value: selectedRule,
-    onChange: handleRuleChange
-  }), !isRuleEmpty(selectedRule.value) &&
-  /*#__PURE__*/
-  // eslint-disable-next-line @bigbinary/neeto/merge-spread-attributes
-  React.createElement(NeetoUITreeSelect, _extends({
-    autoFocus: autoFocus,
-    multiple: true,
-    showSearch: true,
-    treeDataSimpleMode: true,
-    allowClear: !defaultValue && isClearable,
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
-    label: !showRuleSelector && label,
-    treeData: options,
-    value: selectedOption,
-    placeholder: t("neetoFilters.messages.selectResource", {
-      resource: label
-    }),
-    onChange: handleChange
-  }, isNotEmpty(helpIconProps) && {
-    labelProps: {
-      helpIconProps: buildHelpIconProps(helpIconProps)
-    }
-  }, getOtherProps(column))));
+  return /*#__PURE__*/jsxs("div", {
+    className: "neeto-filters-pane-filter__item-wrapper",
+    children: [showRuleSelector && /*#__PURE__*/jsx(Select, {
+      label: label,
+      defaultValue: TREE_SELECT_RULES[0],
+      options: TREE_SELECT_RULES,
+      value: selectedRule,
+      onChange: handleRuleChange
+    }), !isRuleEmpty(selectedRule.value) &&
+    /*#__PURE__*/
+    // eslint-disable-next-line @bigbinary/neeto/merge-spread-attributes
+    jsx(NeetoUITreeSelect, _objectSpread$6(_objectSpread$6({
+      autoFocus: autoFocus,
+      multiple: true,
+      showSearch: true,
+      treeDataSimpleMode: true,
+      allowClear: !defaultValue && isClearable,
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-filter"),
+      label: !showRuleSelector && label,
+      treeData: options,
+      value: selectedOption,
+      placeholder: t("neetoFilters.messages.selectResource", {
+        resource: label
+      }),
+      onChange: handleChange
+    }, isNotEmpty(helpIconProps) && {
+      labelProps: {
+        helpIconProps: buildHelpIconProps(helpIconProps)
+      }
+    }), getOtherProps(column)))]
+  });
 };
 var TreeSelect$1 = /*#__PURE__*/React.memo(TreeSelect);
 
@@ -1838,7 +1848,7 @@ var Item = function Item(_ref) {
     }, updatedFilter, filters));
   };
   if (isText(defaultType) || isDigit(defaultType)) {
-    return /*#__PURE__*/React.createElement(Text, {
+    return /*#__PURE__*/jsx(Text, {
       autoFocus: autoFocus,
       column: column,
       filter: filter,
@@ -1848,7 +1858,7 @@ var Item = function Item(_ref) {
     });
   }
   if (isDate(defaultType)) {
-    return /*#__PURE__*/React.createElement(Datetime$1, {
+    return /*#__PURE__*/jsx(Datetime$1, {
       autoFocus: autoFocus,
       column: column,
       filter: filter,
@@ -1856,7 +1866,7 @@ var Item = function Item(_ref) {
     });
   }
   if (isTime(defaultType)) {
-    return /*#__PURE__*/React.createElement(Time$1, {
+    return /*#__PURE__*/jsx(Time$1, {
       autoFocus: autoFocus,
       column: column,
       filter: filter,
@@ -1864,7 +1874,7 @@ var Item = function Item(_ref) {
     });
   }
   if (isSingleDate(defaultType)) {
-    return /*#__PURE__*/React.createElement(SingleDatetime, {
+    return /*#__PURE__*/jsx(SingleDatetime, {
       autoFocus: autoFocus,
       column: column,
       filter: filter,
@@ -1873,7 +1883,7 @@ var Item = function Item(_ref) {
     });
   }
   if (isSingleTime(defaultType)) {
-    return /*#__PURE__*/React.createElement(SingleTime, {
+    return /*#__PURE__*/jsx(SingleTime, {
       autoFocus: autoFocus,
       column: column,
       filter: filter,
@@ -1882,7 +1892,7 @@ var Item = function Item(_ref) {
     });
   }
   if (isBoolean(defaultType) || isCheckbox(defaultType)) {
-    return /*#__PURE__*/React.createElement(Boolean$1, {
+    return /*#__PURE__*/jsx(Boolean$1, {
       autoFocus: autoFocus,
       column: column,
       filter: filter,
@@ -1890,14 +1900,14 @@ var Item = function Item(_ref) {
     });
   }
   if (isTreeSelect(defaultType)) {
-    return /*#__PURE__*/React.createElement(TreeSelect$1, {
+    return /*#__PURE__*/jsx(TreeSelect$1, {
       autoFocus: autoFocus,
       column: column,
       filter: filter,
       handleApplyFilter: handleApplyFilter
     });
   }
-  return /*#__PURE__*/React.createElement(Dropdown$1, {
+  return /*#__PURE__*/jsx(Dropdown$1, {
     autoFocus: autoFocus,
     column: column,
     filter: filter,
@@ -1936,58 +1946,63 @@ var AddFilter = function AddFilter(_ref) {
   var disableAddButton = selectedColumn.step !== STEPS.ADD && isNotPresent((_findBy = findBy({
     key: selectedColumn.column.key
   }, filters)) === null || _findBy === void 0 ? void 0 : _findBy.value) || isEmpty(columns);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, selectedColumn.step !== STEPS.ADD ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "flex w-full gap-4"
-  }, selectedColumn.step === STEPS.COLUMN && /*#__PURE__*/React.createElement(Select, {
-    isSearchable: true,
-    label: t("neetoFilters.segments.newFilter"),
-    optionRemapping: {
-      label: "label",
-      value: "key"
-    },
-    options: columns,
-    placeholder: t("neetoFilters.segments.selectFilter"),
-    onChange: function onChange(column) {
-      return setSelectedColumn({
-        step: STEPS.VALUE,
-        column: column
-      });
-    }
-  }), selectedColumn.step === STEPS.VALUE && /*#__PURE__*/React.createElement(Item, {
-    filters: filters,
-    autoFocus: true,
-    column: selectedColumn.column,
-    onChange: handleChange
-  }), /*#__PURE__*/React.createElement(Button, {
-    className: "mt-6 self-center",
-    icon: Delete$1,
-    style: "text",
-    onClick: function onClick() {
-      handleClearFilter(selectedColumn.column);
-      setSelectedColumn(assoc("step", STEPS.ADD));
-    }
-  })), /*#__PURE__*/React.createElement(AddFilter, {
-    filters: filters,
-    handleChange: handleChange,
-    handleClearFilter: handleClearFilter,
-    columns: columns.filter(function (_ref2) {
-      var key = _ref2.key;
-      return !existsBy({
-        key: key
-      }, filters);
-    }),
-    disabled: disableAddButton
-  })) : /*#__PURE__*/React.createElement(Button, {
-    disabled: disabled,
-    className: "self-start",
-    icon: Plus,
-    iconPosition: "left",
-    label: t("neetoFilters.segments.addFilter"),
-    style: "link",
-    onClick: function onClick() {
-      return setSelectedColumn(assoc("step", STEPS.COLUMN));
-    }
-  }));
+  return /*#__PURE__*/jsx(Fragment, {
+    children: selectedColumn.step !== STEPS.ADD ? /*#__PURE__*/jsxs(Fragment, {
+      children: [/*#__PURE__*/jsxs("div", {
+        className: "flex w-full gap-4",
+        children: [selectedColumn.step === STEPS.COLUMN && /*#__PURE__*/jsx(Select, {
+          isSearchable: true,
+          label: t("neetoFilters.segments.newFilter"),
+          optionRemapping: {
+            label: "label",
+            value: "key"
+          },
+          options: columns,
+          placeholder: t("neetoFilters.segments.selectFilter"),
+          onChange: function onChange(column) {
+            return setSelectedColumn({
+              step: STEPS.VALUE,
+              column: column
+            });
+          }
+        }), selectedColumn.step === STEPS.VALUE && /*#__PURE__*/jsx(Item, {
+          filters: filters,
+          autoFocus: true,
+          column: selectedColumn.column,
+          onChange: handleChange
+        }), /*#__PURE__*/jsx(Button, {
+          className: "mt-6 self-center",
+          icon: Delete$1,
+          style: "text",
+          onClick: function onClick() {
+            handleClearFilter(selectedColumn.column);
+            setSelectedColumn(assoc("step", STEPS.ADD));
+          }
+        })]
+      }), /*#__PURE__*/jsx(AddFilter, {
+        filters: filters,
+        handleChange: handleChange,
+        handleClearFilter: handleClearFilter,
+        columns: columns.filter(function (_ref2) {
+          var key = _ref2.key;
+          return !existsBy({
+            key: key
+          }, filters);
+        }),
+        disabled: disableAddButton
+      })]
+    }) : /*#__PURE__*/jsx(Button, {
+      disabled: disabled,
+      className: "self-start",
+      icon: Plus,
+      iconPosition: "left",
+      label: t("neetoFilters.segments.addFilter"),
+      style: "link",
+      onClick: function onClick() {
+        return setSelectedColumn(assoc("step", STEPS.COLUMN));
+      }
+    })
+  });
 };
 
 var buildSegmentsValidationSchema = function buildSegmentsValidationSchema(defaultSegmentName) {
@@ -2002,8 +2017,8 @@ var buildSegmentsValidationSchema = function buildSegmentsValidationSchema(defau
   });
 };
 
-function ownKeys$4(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$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SegmentForm = function SegmentForm(_ref) {
   var _ref$isEdit = _ref.isEdit,
     isEdit = _ref$isEdit === void 0 ? false : _ref$isEdit,
@@ -2031,7 +2046,7 @@ var SegmentForm = function SegmentForm(_ref) {
     ungroupedColumns = _buildFilteredColumns3 === void 0 ? [] : _buildFilteredColumns3;
   var handleChange = function handleChange(newFilters) {
     var isClearAll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    var params = buildUrlFromFilters(_objectSpread$4({
+    var params = buildUrlFromFilters(_objectSpread$5({
       columns: columns,
       filters: newFilters
     }, isClearAll && {
@@ -2054,113 +2069,129 @@ var SegmentForm = function SegmentForm(_ref) {
     setFieldValue("filters", formState);
     handleChange(globalState);
   };
-  return /*#__PURE__*/React.createElement(Pane$1, {
+  return /*#__PURE__*/jsxs(Pane$1, {
     isOpen: isOpen,
     onClose: onClose,
-    initialFocusRef: segmentFormInitialRef
-  }, /*#__PURE__*/React.createElement(Pane$1.Header, null, /*#__PURE__*/React.createElement(Typography, {
-    style: "h2",
-    weight: "semibold"
-  }, isEdit ? t("neetoFilters.segments.editSegment") : t("neetoFilters.segments.addNewSegment"))), /*#__PURE__*/React.createElement(Form, {
-    className: "w-full",
-    formProps: {
-      noValidate: true
-    },
-    formikProps: {
-      initialValues: initialValues,
-      validateOnChange: true,
-      validateOnBlur: true,
-      validationSchema: buildSegmentsValidationSchema(defaultSegmentName),
-      onSubmit: handleSubmit
-    }
-  }, function (_ref2) {
-    var errors = _ref2.errors,
-      values = _ref2.values,
-      setFieldValue = _ref2.setFieldValue;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Pane$1.Body, null, /*#__PURE__*/React.createElement(Input$1, {
-      className: "w-full flex-grow-0",
-      error: errors.name,
-      label: t("neetoFilters.segments.name"),
-      name: "name",
-      placeholder: t("neetoFilters.segments.segmentName"),
-      ref: segmentFormInitialRef
-    }), /*#__PURE__*/React.createElement(Typography, {
-      className: "mb-2 mt-4",
-      style: "h4"
-    }, t("neetoFilters.common.filters")), /*#__PURE__*/React.createElement("div", {
-      className: "neeto-filters-pane-filter__body flex w-full flex-col gap-5"
-    }, ungroupedColumns.filter(function (_ref3) {
-      var key = _ref3.key;
-      return _existsBy({
-        key: key
-      }, values.filters[0].conditions);
-    }).map(function (column) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "flex w-full gap-4",
-        key: column.key
-      }, /*#__PURE__*/React.createElement(Item, {
-        column: column,
-        filters: filters,
-        autoFocus: column.key === isOpen,
-        onChange: function onChange(filters) {
-          setFieldValue("filters", [{
-            conditions: filters
-          }]);
-          handleChange(filters);
-        }
-      }), /*#__PURE__*/React.createElement(Button, {
-        className: "mt-6 self-center",
-        icon: Delete$1,
-        style: "text",
-        onClick: function onClick() {
-          return handleClearFilter(column, values, setFieldValue);
-        }
-      }));
-    }), isPresent(groupedColumns) && /*#__PURE__*/React.createElement(Accordion, null, groupedColumns.map(function (_ref4) {
-      var group = _ref4.group,
-        columns = _ref4.columns;
-      return /*#__PURE__*/React.createElement(Accordion.Item, {
-        className: "accordion_item",
-        key: group,
-        title: group
-      }, columns.map(function (column) {
-        return /*#__PURE__*/React.createElement(Item, {
-          column: column,
-          filters: filters,
-          autoFocus: column.key === isOpen,
-          key: column.key,
-          onChange: handleChange
-        });
-      }));
-    })), isEmpty([].concat(_toConsumableArray(groupedColumns), _toConsumableArray(ungroupedColumns))) && /*#__PURE__*/React.createElement(Typography, {
-      style: "body2"
-    }, t("neetoFilters.messages.noResourcesFound", {
-      resources: t("neetoFilters.common.columns")
-    })), customFilters, /*#__PURE__*/React.createElement(AddFilter, {
-      filters: filters,
-      handleChange: handleChange,
-      columns: ungroupedColumns.filter(function (_ref5) {
-        var key = _ref5.key;
-        return !existsBy({
-          key: key
-        }, filters);
-      }),
-      handleClearFilter: function handleClearFilter(_ref6) {
-        var key = _ref6.key;
-        return handleChange(removeBy({
-          key: key
-        }, filters));
-      }
-    }))), /*#__PURE__*/React.createElement(Pane$1.Footer, null, /*#__PURE__*/React.createElement(ActionBlock, {
-      isSubmitting: isSubmitting,
-      cancelButtonProps: {
-        onClick: onClose
+    initialFocusRef: segmentFormInitialRef,
+    children: [/*#__PURE__*/jsx(Pane$1.Header, {
+      children: /*#__PURE__*/jsx(Typography, {
+        style: "h2",
+        weight: "semibold",
+        children: isEdit ? t("neetoFilters.segments.editSegment") : t("neetoFilters.segments.addNewSegment")
+      })
+    }), /*#__PURE__*/jsx(Form, {
+      className: "w-full",
+      formProps: {
+        noValidate: true
+      },
+      formikProps: {
+        initialValues: initialValues,
+        validateOnChange: true,
+        validateOnBlur: true,
+        validationSchema: buildSegmentsValidationSchema(defaultSegmentName),
+        onSubmit: handleSubmit
       },
-      submitButtonProps: {
-        disabled: isSubmitting || isEmpty(filters)
+      children: function children(_ref2) {
+        var errors = _ref2.errors,
+          values = _ref2.values,
+          setFieldValue = _ref2.setFieldValue;
+        return /*#__PURE__*/jsxs(Fragment, {
+          children: [/*#__PURE__*/jsxs(Pane$1.Body, {
+            children: [/*#__PURE__*/jsx(Input$1, {
+              className: "w-full flex-grow-0",
+              error: errors.name,
+              label: t("neetoFilters.segments.name"),
+              name: "name",
+              placeholder: t("neetoFilters.segments.segmentName"),
+              ref: segmentFormInitialRef
+            }), /*#__PURE__*/jsx(Typography, {
+              className: "mb-2 mt-4",
+              style: "h4",
+              children: t("neetoFilters.common.filters")
+            }), /*#__PURE__*/jsxs("div", {
+              className: "neeto-filters-pane-filter__body flex w-full flex-col gap-5",
+              children: [ungroupedColumns.filter(function (_ref3) {
+                var key = _ref3.key;
+                return _existsBy({
+                  key: key
+                }, values.filters[0].conditions);
+              }).map(function (column) {
+                return /*#__PURE__*/jsxs("div", {
+                  className: "flex w-full gap-4",
+                  children: [/*#__PURE__*/jsx(Item, {
+                    column: column,
+                    filters: filters,
+                    autoFocus: column.key === isOpen,
+                    onChange: function onChange(filters) {
+                      setFieldValue("filters", [{
+                        conditions: filters
+                      }]);
+                      handleChange(filters);
+                    }
+                  }), /*#__PURE__*/jsx(Button, {
+                    className: "mt-6 self-center",
+                    icon: Delete$1,
+                    style: "text",
+                    onClick: function onClick() {
+                      return handleClearFilter(column, values, setFieldValue);
+                    }
+                  })]
+                }, column.key);
+              }), isPresent(groupedColumns) && /*#__PURE__*/jsx(Accordion, {
+                children: groupedColumns.map(function (_ref4) {
+                  var group = _ref4.group,
+                    columns = _ref4.columns;
+                  return /*#__PURE__*/jsx(Accordion.Item, {
+                    className: "accordion_item",
+                    title: group,
+                    children: columns.map(function (column) {
+                      return /*#__PURE__*/createElement(Item, {
+                        column: column,
+                        filters: filters,
+                        autoFocus: column.key === isOpen,
+                        key: column.key,
+                        onChange: handleChange
+                      });
+                    })
+                  }, group);
+                })
+              }), isEmpty([].concat(_toConsumableArray(groupedColumns), _toConsumableArray(ungroupedColumns))) && /*#__PURE__*/jsx(Typography, {
+                style: "body2",
+                children: t("neetoFilters.messages.noResourcesFound", {
+                  resources: t("neetoFilters.common.columns")
+                })
+              }), customFilters, /*#__PURE__*/jsx(AddFilter, {
+                filters: filters,
+                handleChange: handleChange,
+                columns: ungroupedColumns.filter(function (_ref5) {
+                  var key = _ref5.key;
+                  return !existsBy({
+                    key: key
+                  }, filters);
+                }),
+                handleClearFilter: function handleClearFilter(_ref6) {
+                  var key = _ref6.key;
+                  return handleChange(removeBy({
+                    key: key
+                  }, filters));
+                }
+              })]
+            })]
+          }), /*#__PURE__*/jsx(Pane$1.Footer, {
+            children: /*#__PURE__*/jsx(ActionBlock, {
+              isSubmitting: isSubmitting,
+              cancelButtonProps: {
+                onClick: onClose
+              },
+              submitButtonProps: {
+                disabled: isSubmitting || isEmpty(filters)
+              }
+            })
+          })]
+        });
       }
-    })));
-  }));
+    })]
+  });
 };
 
 var QUERY_KEYS = {
@@ -2308,40 +2339,46 @@ var Block = function Block(_ref) {
   }, {
     mode: "scoped"
   });
-  return /*#__PURE__*/React.createElement(Tooltip, {
+  return /*#__PURE__*/jsx(Tooltip, {
     content: filterValue,
     disabled: toolTipDisabled,
     position: "bottom",
-    theme: "light"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-bar__block",
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-block"),
-    tabIndex: 0,
-    ref: function ref(node) {
-      deleteBlockHotKeyRef.current = node;
-      openFilterPaneHotKeyRef.current = node;
-    },
-    onClick: function onClick() {
-      return setIsPaneOpen(key);
-    }
-  }, /*#__PURE__*/React.createElement(Typography, {
-    style: "body2"
-  }, label, ":"), /*#__PURE__*/React.createElement(Typography, {
-    className: "neeto-ui-text-gray-600",
-    style: "body2"
-  }, ruleContent), !isRuleEmpty(rule) && /*#__PURE__*/React.createElement(Typography, {
-    style: "body2"
-  }, blockContent), !defaultValue && /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-bar__block-close"
-  }, /*#__PURE__*/React.createElement(Close, {
-    "data-cy": "neeto-filters-".concat(hyphenate(key), "-block-close-btn"),
-    size: 16,
-    strokeWidth: 2,
-    onClick: function onClick(event) {
-      event.stopPropagation();
-      handleDelete(key);
-    }
-  }))));
+    theme: "light",
+    children: /*#__PURE__*/jsxs("div", {
+      className: "neeto-filters-bar__block",
+      "data-cy": "neeto-filters-".concat(hyphenate(key), "-block"),
+      tabIndex: 0,
+      ref: function ref(node) {
+        deleteBlockHotKeyRef.current = node;
+        openFilterPaneHotKeyRef.current = node;
+      },
+      onClick: function onClick() {
+        return setIsPaneOpen(key);
+      },
+      children: [/*#__PURE__*/jsxs(Typography, {
+        style: "body2",
+        children: [label, ":"]
+      }), /*#__PURE__*/jsx(Typography, {
+        className: "neeto-ui-text-gray-600",
+        style: "body2",
+        children: ruleContent
+      }), !isRuleEmpty(rule) && /*#__PURE__*/jsx(Typography, {
+        style: "body2",
+        children: blockContent
+      }), !defaultValue && /*#__PURE__*/jsx("div", {
+        className: "neeto-filters-bar__block-close",
+        children: /*#__PURE__*/jsx(Close, {
+          "data-cy": "neeto-filters-".concat(hyphenate(key), "-block-close-btn"),
+          size: 16,
+          strokeWidth: 2,
+          onClick: function onClick(event) {
+            event.stopPropagation();
+            handleDelete(key);
+          }
+        })
+      })]
+    })
+  });
 };
 
 var ChildBlock = function ChildBlock(_ref) {
@@ -2358,7 +2395,7 @@ var ChildBlock = function ChildBlock(_ref) {
   }, {
     mode: "scoped"
   });
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/jsxs("div", {
     className: "neeto-filters-bar__block",
     "data-cy": "neeto-filters-".concat(hyphenate(childKey), "-block"),
     tabIndex: 0,
@@ -2368,21 +2405,24 @@ var ChildBlock = function ChildBlock(_ref) {
     },
     onClick: function onClick() {
       return setIsPaneOpen(childKey);
-    }
-  }, /*#__PURE__*/React.createElement(Typography, {
-    style: "body2",
-    weight: "medium"
-  }, childKey), /*#__PURE__*/React.createElement("div", {
-    className: "neeto-filters-bar__block-close"
-  }, /*#__PURE__*/React.createElement(Close, {
-    "data-cy": "neeto-filters-".concat(hyphenate(childKey), "-block-close-btn"),
-    size: 16,
-    strokeWidth: 2,
-    onClick: function onClick(event) {
-      event.stopPropagation();
-      handleDelete(childKey);
-    }
-  })));
+    },
+    children: [/*#__PURE__*/jsx(Typography, {
+      style: "body2",
+      weight: "medium",
+      children: childKey
+    }), /*#__PURE__*/jsx("div", {
+      className: "neeto-filters-bar__block-close",
+      children: /*#__PURE__*/jsx(Close, {
+        "data-cy": "neeto-filters-".concat(hyphenate(childKey), "-block-close-btn"),
+        size: 16,
+        strokeWidth: 2,
+        onClick: function onClick(event) {
+          event.stopPropagation();
+          handleDelete(childKey);
+        }
+      })
+    })]
+  });
 };
 
 var FilterBar = function FilterBar(_ref) {
@@ -2429,47 +2469,50 @@ var FilterBar = function FilterBar(_ref) {
       isClearable = _ref2.isClearable;
     return defaultValue && !isClearable;
   }) && !childrenFiltersApplied;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, nonHiddenFilters.map(function (filter) {
-    var _filter$suffixCompone;
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: filter.key
-    }, /*#__PURE__*/React.createElement(Block, {
-      filter: filter,
-      handleDelete: handleDelete,
-      setIsPaneOpen: setIsPaneOpen
-    }), (_filter$suffixCompone = filter.suffixComponent) === null || _filter$suffixCompone === void 0 ? void 0 : _filter$suffixCompone.call(filter), /*#__PURE__*/React.createElement("div", {
-      className: "neeto-filters-bar--separator"
-    }));
-  }), childrenKeys.filter(function (childKey) {
-    return has(childKey, searchParams);
-  }).map(function (childKey) {
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: childKey
-    }, /*#__PURE__*/React.createElement(ChildBlock, {
-      childKey: childKey,
-      handleDelete: handleDelete,
-      setIsPaneOpen: setIsPaneOpen
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "neeto-filters-bar--separator"
-    }));
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "flex items-center gap-x-2"
-  }, isPresent(entity) && !hasOnlyKeywordFilter(filters) && /*#__PURE__*/React.createElement(Button, {
-    "data-cy": "save-segment-button",
-    label: t("neetoFilters.segments.saveAsNewSegment"),
-    style: "secondary",
-    onClick: function onClick() {
-      setIsPaneOpen(false);
-      setIsSavePaneOpen({
-        action: SEGMENT_ACTIONS$1.CREATE
-      });
-    }
-  }), !hideClearButton && /*#__PURE__*/React.createElement(Button, {
-    "data-cy": "neeto-filters-bar-clear-btn",
-    label: t("neetoFilters.common.clearFilters"),
-    style: "text",
-    onClick: handleClearAll
-  })));
+  return /*#__PURE__*/jsxs(Fragment, {
+    children: [nonHiddenFilters.map(function (filter) {
+      var _filter$suffixCompone;
+      return /*#__PURE__*/jsxs(React.Fragment, {
+        children: [/*#__PURE__*/jsx(Block, {
+          filter: filter,
+          handleDelete: handleDelete,
+          setIsPaneOpen: setIsPaneOpen
+        }), (_filter$suffixCompone = filter.suffixComponent) === null || _filter$suffixCompone === void 0 ? void 0 : _filter$suffixCompone.call(filter), /*#__PURE__*/jsx("div", {
+          className: "neeto-filters-bar--separator"
+        })]
+      }, filter.key);
+    }), childrenKeys.filter(function (childKey) {
+      return has(childKey, searchParams);
+    }).map(function (childKey) {
+      return /*#__PURE__*/jsxs(React.Fragment, {
+        children: [/*#__PURE__*/jsx(ChildBlock, {
+          childKey: childKey,
+          handleDelete: handleDelete,
+          setIsPaneOpen: setIsPaneOpen
+        }), /*#__PURE__*/jsx("div", {
+          className: "neeto-filters-bar--separator"
+        })]
+      }, childKey);
+    }), /*#__PURE__*/jsxs("div", {
+      className: "flex items-center gap-x-2",
+      children: [isPresent(entity) && !hasOnlyKeywordFilter(filters) && /*#__PURE__*/jsx(Button, {
+        "data-cy": "save-segment-button",
+        label: t("neetoFilters.segments.saveAsNewSegment"),
+        style: "secondary",
+        onClick: function onClick() {
+          setIsPaneOpen(false);
+          setIsSavePaneOpen({
+            action: SEGMENT_ACTIONS$1.CREATE
+          });
+        }
+      }), !hideClearButton && /*#__PURE__*/jsx(Button, {
+        "data-cy": "neeto-filters-bar-clear-btn",
+        label: t("neetoFilters.common.clearFilters"),
+        style: "text",
+        onClick: handleClearAll
+      })]
+    })]
+  });
 };
 
 var fetch = function fetch(params) {
@@ -2509,42 +2552,44 @@ var segmentsApi = {
   destroy: destroy
 };
 
-function ownKeys$3(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$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$4(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$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SEGMENTS_LIST = QUERY_KEYS.SEGMENTS_LIST;
 var useFetchSegments = function useFetchSegments(_ref) {
   var entity = _ref.entity,
     _ref$searchTerm = _ref.searchTerm,
     searchTerm = _ref$searchTerm === void 0 ? "" : _ref$searchTerm;
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return useQuery([SEGMENTS_LIST, entity, searchTerm], function () {
-    return segmentsApi.fetch({
-      entity: entity,
-      searchTerm: searchTerm
-    });
-  }, mergeRight({
-    staleTime: SEGMENTS_STALE_TIME,
-    select: prop("segments")
+  return useQuery(_objectSpread$4({
+    queryKey: [SEGMENTS_LIST, entity, searchTerm],
+    queryFn: function queryFn() {
+      return segmentsApi.fetch({
+        entity: entity,
+        searchTerm: searchTerm
+      });
+    },
+    select: prop("segments"),
+    staleTime: SEGMENTS_STALE_TIME
   }, options));
 };
 var useCreateSegment = function useCreateSegment(options) {
-  return useMutationWithInvalidation(segmentsApi.create, _objectSpread$3({
+  return useMutationWithInvalidation(segmentsApi.create, _objectSpread$4({
     keysToInvalidate: [SEGMENTS_LIST]
   }, options));
 };
 var useUpdateSegment = function useUpdateSegment(options) {
-  return useMutationWithInvalidation(segmentsApi.update, _objectSpread$3({
+  return useMutationWithInvalidation(segmentsApi.update, _objectSpread$4({
     keysToInvalidate: [SEGMENTS_LIST]
   }, options));
 };
 var useDestroySegment = function useDestroySegment(options) {
-  return useMutationWithInvalidation(segmentsApi.destroy, _objectSpread$3({
+  return useMutationWithInvalidation(segmentsApi.destroy, _objectSpread$4({
     keysToInvalidate: [SEGMENTS_LIST]
   }, options));
 };
 
-function ownKeys$2(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$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$3(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$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useSegment = function useSegment(_ref) {
   var entity = _ref.entity,
     keyword = _ref.keyword,
@@ -2564,17 +2609,17 @@ var useSegment = function useSegment(_ref) {
     setIsSavePaneOpen = _useState2[1];
   var _useCreateSegment = useCreateSegment(),
     createSegment = _useCreateSegment.mutate,
-    isCreating = _useCreateSegment.isLoading;
+    isCreating = _useCreateSegment.isPending;
   var _useUpdateSegment = useUpdateSegment(),
     updateSegment = _useUpdateSegment.mutate,
-    isUpdating = _useUpdateSegment.isLoading;
+    isUpdating = _useUpdateSegment.isPending;
   var isSubmitting = isCreating || isUpdating;
   var searchParams = useQueryParams({
     toCamelCase: false
   });
   var keywordValue = searchParams[SEARCH_TERM_KEY] || "";
   var isEdit = isSavePaneOpen.action === SEGMENT_ACTIONS$1.EDIT;
-  var keywordFilter = _objectSpread$2(_objectSpread$2({
+  var keywordFilter = _objectSpread$3(_objectSpread$3({
     type: "text",
     rule: "contains",
     label: t("neetoFilters.common.searchTerm")
@@ -2587,7 +2632,7 @@ var useSegment = function useSegment(_ref) {
     hidden: true
   }, filters);
   var handleApplyFilters = function handleApplyFilters(newFilters, isClearAll) {
-    var params = buildUrlFromFilters(_objectSpread$2({
+    var params = buildUrlFromFilters(_objectSpread$3({
       columns: columns,
       filters: isKeywordFilterPresent(keywordFilter) && isNotEmpty(getSearchTermFromUrl()) ? [].concat(_toConsumableArray(newFilters), [keywordFilter]) : newFilters
     }, isClearAll && {
@@ -2717,41 +2762,51 @@ var SegmentBar = function SegmentBar(_ref) {
     handleApplyFilters(newFilters);
   };
   var changedFilters = deepCompare(segment.filters[0].conditions, filters);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Typography, {
-    className: "neeto-ui-text-gray-600 mr-4 px-2",
-    "data-cy": "neeto-filters-segment-name",
-    style: "h4"
-  }, segment.name), isNotEmpty(changedFilters) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Dropdown$2, {
-    buttonProps: {
-      className: "mr-2"
-    },
-    buttonStyle: "secondary",
-    label: t("neetoFilters.segments.updateSegment")
-  }, /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(MenuItem.Button, {
-    onClick: function onClick() {
-      return setIsSavePaneOpen({
-        action: SEGMENT_ACTIONS$1.EDIT
-      });
-    }
-  }, t("neetoFilters.segments.updateSegment")), /*#__PURE__*/React.createElement(MenuItem.Button, {
-    onClick: function onClick() {
-      setIsPaneOpen(false);
-      setIsSavePaneOpen({
-        action: SEGMENT_ACTIONS$1.CREATE
-      });
-    }
-  }, t("neetoFilters.segments.saveAsNewSegment")))), changedFilters.map(function (filter) {
-    var _filter$suffixCompone;
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: filter.key
-    }, /*#__PURE__*/React.createElement(Block, {
-      filter: filter,
-      handleDelete: handleDelete,
-      setIsPaneOpen: setIsPaneOpen
-    }), (_filter$suffixCompone = filter.suffixComponent) === null || _filter$suffixCompone === void 0 ? void 0 : _filter$suffixCompone.call(filter), /*#__PURE__*/React.createElement("div", {
-      className: "neeto-filters-bar--separator"
-    }));
-  })));
+  return /*#__PURE__*/jsxs(Fragment, {
+    children: [/*#__PURE__*/jsx(Typography, {
+      className: "neeto-ui-text-gray-600 mr-4 px-2",
+      "data-cy": "neeto-filters-segment-name",
+      style: "h4",
+      children: segment.name
+    }), isNotEmpty(changedFilters) && /*#__PURE__*/jsxs(Fragment, {
+      children: [/*#__PURE__*/jsx(Dropdown$2, {
+        buttonProps: {
+          className: "mr-2"
+        },
+        buttonStyle: "secondary",
+        label: t("neetoFilters.segments.updateSegment"),
+        children: /*#__PURE__*/jsxs(Menu, {
+          children: [/*#__PURE__*/jsx(MenuItem.Button, {
+            onClick: function onClick() {
+              return setIsSavePaneOpen({
+                action: SEGMENT_ACTIONS$1.EDIT
+              });
+            },
+            children: t("neetoFilters.segments.updateSegment")
+          }), /*#__PURE__*/jsx(MenuItem.Button, {
+            onClick: function onClick() {
+              setIsPaneOpen(false);
+              setIsSavePaneOpen({
+                action: SEGMENT_ACTIONS$1.CREATE
+              });
+            },
+            children: t("neetoFilters.segments.saveAsNewSegment")
+          })]
+        })
+      }), changedFilters.map(function (filter) {
+        var _filter$suffixCompone;
+        return /*#__PURE__*/jsxs(React.Fragment, {
+          children: [/*#__PURE__*/jsx(Block, {
+            filter: filter,
+            handleDelete: handleDelete,
+            setIsPaneOpen: setIsPaneOpen
+          }), (_filter$suffixCompone = filter.suffixComponent) === null || _filter$suffixCompone === void 0 ? void 0 : _filter$suffixCompone.call(filter), /*#__PURE__*/jsx("div", {
+            className: "neeto-filters-bar--separator"
+          })]
+        }, filter.key);
+      })]
+    })]
+  });
 };
 
 var Bar = function Bar(_ref) {
@@ -2796,44 +2851,47 @@ var Bar = function Bar(_ref) {
   var cachedSegments = queryClient.getQueryData([QUERY_KEYS.SEGMENTS_LIST, entity, ""]) || DEFAULT_SEGMENTS_CACHE;
   var segment = findById(segmentId, cachedSegments.segments);
   if (isEmpty(nonHiddenFilters) && !childrenFiltersApplied) return null;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: classnames("neeto-filters-bar", _defineProperty({}, className, className))
-  }, /*#__PURE__*/React.createElement(BarComponent, {
-    childrenFiltersApplied: childrenFiltersApplied,
-    childrenKeys: childrenKeys,
-    entity: entity,
-    filters: filters,
-    handleApplyFilters: handleApplyFilters,
-    keywordFilter: keywordFilter,
-    nonHiddenFilters: nonHiddenFilters,
-    setIsPaneOpen: setIsPaneOpen,
-    setIsSavePaneOpen: setIsSavePaneOpen
-  })), /*#__PURE__*/React.createElement(SegmentForm, {
-    childrenKeys: childrenKeys,
-    columns: columns,
-    customFilters: customFilters,
-    defaultSegmentName: defaultSegmentName,
-    filters: filters,
-    handleSubmit: handleSubmit,
-    isEdit: isEdit,
-    isSubmitting: isSubmitting,
-    keywordFilter: keywordFilter,
-    segmentFormInitialRef: segmentFormInitialRef,
-    isOpen: isPresent(isSavePaneOpen.action),
-    initialValues: isEdit ? assoc("filters", [{
-      conditions: filters
-    }], segment) : {
-      name: "",
-      filters: [{
+  return /*#__PURE__*/jsxs(Fragment, {
+    children: [/*#__PURE__*/jsx("div", {
+      className: classnames("neeto-filters-bar", _defineProperty({}, className, className)),
+      children: /*#__PURE__*/jsx(BarComponent, {
+        childrenFiltersApplied: childrenFiltersApplied,
+        childrenKeys: childrenKeys,
+        entity: entity,
+        filters: filters,
+        handleApplyFilters: handleApplyFilters,
+        keywordFilter: keywordFilter,
+        nonHiddenFilters: nonHiddenFilters,
+        setIsPaneOpen: setIsPaneOpen,
+        setIsSavePaneOpen: setIsSavePaneOpen
+      })
+    }), /*#__PURE__*/jsx(SegmentForm, {
+      childrenKeys: childrenKeys,
+      columns: columns,
+      customFilters: customFilters,
+      defaultSegmentName: defaultSegmentName,
+      filters: filters,
+      handleSubmit: handleSubmit,
+      isEdit: isEdit,
+      isSubmitting: isSubmitting,
+      keywordFilter: keywordFilter,
+      segmentFormInitialRef: segmentFormInitialRef,
+      isOpen: isPresent(isSavePaneOpen.action),
+      initialValues: isEdit ? assoc("filters", [{
         conditions: filters
-      }]
-    },
-    onClose: function onClose() {
-      return setIsSavePaneOpen({
-        action: undefined
-      });
-    }
-  }));
+      }], segment) : {
+        name: "",
+        filters: [{
+          conditions: filters
+        }]
+      },
+      onClose: function onClose() {
+        return setIsSavePaneOpen({
+          action: undefined
+        });
+      }
+    })]
+  });
 };
 
 function _objectWithoutPropertiesLoose(source, excluded) {
@@ -2942,8 +3000,8 @@ var useFilters = function useFilters(_ref) {
 };
 
 var _excluded = ["isOpen", "onClose", "columns", "onChange", "isSearchable", "keyword", "onSelectorsChange", "childrenKeys", "children", "className"];
-function ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$2(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$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Pane = function Pane(_ref) {
   var isOpen = _ref.isOpen,
     onClose = _ref.onClose,
@@ -2978,7 +3036,7 @@ var Pane = function Pane(_ref) {
     groupedColumns = _buildFilteredColumns2 === void 0 ? [] : _buildFilteredColumns2,
     _buildFilteredColumns3 = _buildFilteredColumns.ungroupedColumns,
     ungroupedColumns = _buildFilteredColumns3 === void 0 ? [] : _buildFilteredColumns3;
-  var keywordFilter = _objectSpread$1(_objectSpread$1({
+  var keywordFilter = _objectSpread$2(_objectSpread$2({
     type: "text",
     rule: "contains",
     label: t("neetoFilters.common.searchTerm")
@@ -2994,7 +3052,7 @@ var Pane = function Pane(_ref) {
   });
   var handleChange = function handleChange(newFilters) {
     var isClearAll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    var params = buildUrlFromFilters(_objectSpread$1({
+    var params = buildUrlFromFilters(_objectSpread$2({
       columns: columns,
       filters: isKeywordFilterPresent(keywordFilter) && isNotEmpty(getSearchTermFromUrl()) ? [].concat(_toConsumableArray(newFilters), [keywordFilter]) : newFilters
     }, isClearAll && {
@@ -3032,76 +3090,84 @@ var Pane = function Pane(_ref) {
   }) && !childrenKeys.some(function (key) {
     return searchParams[key];
   });
-  return /*#__PURE__*/React.createElement(Pane$1, _extends({
+  return /*#__PURE__*/jsxs(Pane$1, _objectSpread$2(_objectSpread$2({
     isOpen: isOpen,
     backdropClassName: "neeto-filters-pane-backdrop",
     className: classnames("neeto-filters-pane-filter", _defineProperty({}, className, className)),
     onClose: handleClose
-  }, otherProps), /*#__PURE__*/React.createElement(Pane$1.Header, {
-    "data-cy": "neeto-filters-pane-header"
-  }, /*#__PURE__*/React.createElement(Typography, {
-    style: "h2",
-    weight: "semibold"
-  }, t("neetoFilters.common.filters"))), /*#__PURE__*/React.createElement(Pane$1.Body, {
-    className: "neeto-filters-pane-filter__body neeto-ui-pt-2"
-  }, isSearchable && /*#__PURE__*/React.createElement(Search, {
-    "data-cy": "neeto-filters-column-search",
-    placeholder: t("neetoFilters.messages.searchResources", {
-      resources: t("neetoFilters.common.filters")
-    }),
-    onSearch: function onSearch(value) {
-      return setSearchTerm(value);
-    }
-  }), ungroupedColumns.map(function (column) {
-    return /*#__PURE__*/React.createElement(Item, {
-      column: column,
-      filters: filters,
-      autoFocus: column.key === isOpen,
-      key: column.key,
-      onChange: handleChange,
-      onClose: handleClearTermAndClose
-    });
-  }), isPresent(groupedColumns) && /*#__PURE__*/React.createElement(Accordion, {
-    defaultActiveKey: groupedColumns.findIndex(function (_ref4) {
-      var columns = _ref4.columns;
-      return existsBy({
-        key: isOpen
-      }, columns);
-    })
-  }, groupedColumns.map(function (_ref5) {
-    var group = _ref5.group,
-      columns = _ref5.columns;
-    return /*#__PURE__*/React.createElement(Accordion.Item, {
-      className: "accordion_item",
-      key: group,
-      title: group
-    }, columns.map(function (column) {
-      return /*#__PURE__*/React.createElement(Item, {
-        column: column,
-        filters: filters,
-        autoFocus: column.key === isOpen,
-        key: column.key,
-        onChange: handleChange,
-        onClose: handleClearTermAndClose
-      });
-    }));
-  })), isEmpty(ungroupedColumns) && isEmpty(groupedColumns) && /*#__PURE__*/React.createElement(Typography, {
-    style: "body2"
-  }, t("neetoFilters.messages.noResourcesFound", {
-    resources: t("neetoFilters.common.columns")
-  })), children), /*#__PURE__*/React.createElement(Pane$1.Footer, {
-    className: "gap-x-2"
-  }, /*#__PURE__*/React.createElement(Button, {
-    "data-cy": "neeto-filters-done-btn",
-    label: t("neetoFilters.common.done"),
-    onClick: handleClearTermAndClose
-  }), /*#__PURE__*/React.createElement(Button, {
-    "data-cy": "neeto-filters-clear-btn",
-    disabled: isClearFiltersDisabled,
-    label: t("neetoFilters.common.clearFilters"),
-    style: "text",
-    onClick: handleClearAll
-  })));
+  }, otherProps), {}, {
+    children: [/*#__PURE__*/jsx(Pane$1.Header, {
+      "data-cy": "neeto-filters-pane-header",
+      children: /*#__PURE__*/jsx(Typography, {
+        style: "h2",
+        weight: "semibold",
+        children: t("neetoFilters.common.filters")
+      })
+    }), /*#__PURE__*/jsxs(Pane$1.Body, {
+      className: "neeto-filters-pane-filter__body neeto-ui-pt-2",
+      children: [isSearchable && /*#__PURE__*/jsx(Search, {
+        "data-cy": "neeto-filters-column-search",
+        placeholder: t("neetoFilters.messages.searchResources", {
+          resources: t("neetoFilters.common.filters")
+        }),
+        onSearch: function onSearch(value) {
+          return setSearchTerm(value);
+        }
+      }), ungroupedColumns.map(function (column) {
+        return /*#__PURE__*/createElement(Item, {
+          column: column,
+          filters: filters,
+          autoFocus: column.key === isOpen,
+          key: column.key,
+          onChange: handleChange,
+          onClose: handleClearTermAndClose
+        });
+      }), isPresent(groupedColumns) && /*#__PURE__*/jsx(Accordion, {
+        defaultActiveKey: groupedColumns.findIndex(function (_ref4) {
+          var columns = _ref4.columns;
+          return existsBy({
+            key: isOpen
+          }, columns);
+        }),
+        children: groupedColumns.map(function (_ref5) {
+          var group = _ref5.group,
+            columns = _ref5.columns;
+          return /*#__PURE__*/jsx(Accordion.Item, {
+            className: "accordion_item",
+            title: group,
+            children: columns.map(function (column) {
+              return /*#__PURE__*/createElement(Item, {
+                column: column,
+                filters: filters,
+                autoFocus: column.key === isOpen,
+                key: column.key,
+                onChange: handleChange,
+                onClose: handleClearTermAndClose
+              });
+            })
+          }, group);
+        })
+      }), isEmpty(ungroupedColumns) && isEmpty(groupedColumns) && /*#__PURE__*/jsx(Typography, {
+        style: "body2",
+        children: t("neetoFilters.messages.noResourcesFound", {
+          resources: t("neetoFilters.common.columns")
+        })
+      }), children]
+    }), /*#__PURE__*/jsxs(Pane$1.Footer, {
+      className: "gap-x-2",
+      children: [/*#__PURE__*/jsx(Button, {
+        "data-cy": "neeto-filters-done-btn",
+        label: t("neetoFilters.common.done"),
+        onClick: handleClearTermAndClose
+      }), /*#__PURE__*/jsx(Button, {
+        "data-cy": "neeto-filters-clear-btn",
+        disabled: isClearFiltersDisabled,
+        label: t("neetoFilters.common.clearFilters"),
+        style: "text",
+        onClick: handleClearAll
+      })]
+    })]
+  }));
 };
 
 var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r.prepend?"prepend":"append",d=!0===r.singleTag,i="string"==typeof r.container?document.querySelector(r.container):document.getElementsByTagName("head")[0];if(d){var u=e.indexOf(i);-1===u&&(u=e.push(i)-1,t[u]={}),a=t[u]&&t[u][s]?t[u][s]:t[u][s]=c();}else a=c();65279===n.charCodeAt(0)&&(n=n.substring(1)),a.styleSheet?a.styleSheet.cssText+=n:a.appendChild(document.createTextNode(n));}function c(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),r.attributes)for(var t=Object.keys(r.attributes),n=0;n<t.length;n++)e.setAttribute(t[n],r.attributes[t[n]]);var a="prepend"===s?"afterbegin":"beforeend";return i.insertAdjacentElement(a,e),e}}
@@ -3109,8 +3175,8 @@ var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r
 var css = ".neeto-filters-bar{align-items:center;display:flex;flex-wrap:wrap}.neeto-filters-bar__block{border-radius:var(--neeto-ui-rounded);display:flex;gap:4px;margin:4px 0;max-width:384px;overflow:hidden;padding:4px 8px;position:relative;transition:var(--neeto-ui-transition);white-space:nowrap}.neeto-filters-bar__block p:first-child{color:rgb(var(--neeto-ui-gray-700))}.neeto-filters-bar__block-close{background-image:linear-gradient(90deg,rgba(var(--neeto-ui-gray-200),.5) 0,rgba(var(--neeto-ui-gray-200),1) 25%);color:rgb(var(--neeto-ui-gray-800));opacity:0;padding:8px;position:absolute;right:0;top:0;transition:var(--neeto-ui-transition)}.neeto-filters-bar__block:active,.neeto-filters-bar__block:hover{background-color:rgb(var(--neeto-ui-gray-200));cursor:pointer}.neeto-filters-bar__block:active .neeto-filters-bar__block-close,.neeto-filters-bar__block:hover .neeto-filters-bar__block-close{border-radius:var(--neeto-ui-rounded);color:rgb(var(--neeto-ui-black));opacity:1}.neeto-filters-bar__block:focus{box-shadow:0 0 0 3px rgba(var(--neeto-ui-gray-800),15%);outline:none}.neeto-filters-bar--separator{align-self:stretch;border-left:1px solid rgb(var(--neeto-ui-gray-400));margin:12px 8px}.neeto-filters-pane-filter{overflow:visible;width:360px}.neeto-filters-pane-filter__body{align-items:stretch!important;gap:20px}.neeto-filters-pane-filter__body>*{flex-grow:0!important}.neeto-filters-pane-filter__body p{text-align:center}.neeto-filters-pane-filter__body .neeto-filters-pane-filter__item-wrapper{display:flex;flex:1;flex-direction:column;gap:8px}.neeto-filters-pane-filter__body .accordion_item .neeto-filters-pane-filter__item-wrapper{flex:1;margin-top:16px}.neeto-filters-pane-filter__body .accordion_item .neeto-filters-pane-filter__item-wrapper:first-of-type{margin-top:0}.neeto-filters-pane-filter__body .accordion_item:first-of-type .neeto-ui-accordion__item{padding-top:0}.neeto-filters-pane-filter__body .neeto-ui-accordion__wrapper--last-item{border-bottom:thin solid rgb(var(--neeto-ui-gray-300))}@media screen and (max-width:767px){.neeto-filters-pane-filter{width:100vw}}.neeto-filters-pane-backdrop{-webkit-backdrop-filter:blur(0)!important;backdrop-filter:blur(0)!important;background-color:rgba(var(--neeto-ui-gray-700),.2)}.neeto-filters-segment--active{border-color:rgb(var(--neeto-ui-primary-500))!important;box-shadow:0 0 0 1px rgb(var(--neeto-ui-primary-500))!important}\n/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["app/javascript/src/stylesheets/components/_bar.scss","app/javascript/src/stylesheets/index.scss","app/javascript/src/stylesheets/components/_filters.scss","app/javascript/src/stylesheets/abstracts/_mixins.scss","app/javascript/src/stylesheets/components/_segments.scss"],"names":[],"mappings":"AAAA,mBAGE,kBAAA,CAFA,YAAA,CACA,cCEF,CDCE,0BAKE,qCAAA,CAHA,YAAA,CAEA,OAAA,CAGA,YAAA,CACA,eAAA,CAEA,eAAA,CATA,eAAA,CAEA,iBAAA,CAGA,qCAAA,CAGA,kBCEJ,CDCI,wCACE,mCCCN,CDEI,gCAQE,gHAAA,CAFA,mCAAA,CADA,SAAA,CADA,WAAA,CAHA,iBAAA,CAEA,OAAA,CADA,KAAA,CAKA,qCCCN,CDOI,iEAEE,8CAAA,CACA,cCNN,CDQM,iIAGE,qCAAA,CADA,gCAAA,CADA,SCJR,CDUI,gCAEE,uDAAA,CADA,YCPN,CDYE,8BAGE,kBAAA,CAFA,mDAAA,CACA,eCTJ,CC/CA,2BAEE,gBAAA,CADA,WDmDF,CChDE,iCACE,6BAAA,CACA,QDkDJ,CChDI,mCACE,qBDkDN,CC/CI,mCACE,iBDiDN,CC9CI,0EACE,YAAA,CAGA,MAAA,CAFA,qBAAA,CACA,ODiDN,CC5CM,0FAEE,MAAA,CADA,eD+CR,CC5CQ,wGACE,YD8CV,CC1CQ,yFACE,aD4CV,CCxCI,yEACE,sDD0CN,CEnEI,oCDdJ,2BA4CI,WDyCF,CACF,CCtCA,6BACE,yCAAA,CAAA,iCAAA,CACA,kDDyCF,CG3FA,+BACE,uDAAA,CACA,+DH8FF","sourcesContent":[".neeto-filters-bar {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n\n  &__block {\n    padding: 4px 8px;\n    display: flex;\n    position: relative;\n    gap: 4px;\n    border-radius: var(--neeto-ui-rounded);\n    transition: var(--neeto-ui-transition);\n    margin: 4px 0;\n    max-width: 384px;\n    white-space: nowrap;\n    overflow: hidden;\n\n    p:first-child {\n      color: rgb(var(--neeto-ui-gray-700));\n    }\n\n    &-close {\n      position: absolute;\n      top: 0;\n      right: 0;\n      padding: 8px;\n      opacity: 0;\n      color: rgb(var(--neeto-ui-gray-800));\n      transition: var(--neeto-ui-transition);\n      background-image: linear-gradient(\n        90deg,\n        rgba(var(--neeto-ui-gray-200), 0.5) 0%,\n        rgba(var(--neeto-ui-gray-200), 1) 25%\n      );\n    }\n\n    &:hover,\n    &:active {\n      background-color: rgb(var(--neeto-ui-gray-200));\n      cursor: pointer;\n\n      .neeto-filters-bar__block-close {\n        opacity: 1;\n        color: rgb(var(--neeto-ui-black));\n        border-radius: var(--neeto-ui-rounded);\n      }\n    }\n\n    &:focus {\n      outline: none;\n      box-shadow: 0 0 0 3px rgba(var(--neeto-ui-gray-800), 15%);\n    }\n  }\n\n  &--separator {\n    border-left: 1px solid rgb(var(--neeto-ui-gray-400));\n    margin: 12px 8px;\n    align-self: stretch;\n  }\n}\n",".neeto-filters-bar {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n}\n.neeto-filters-bar__block {\n  padding: 4px 8px;\n  display: flex;\n  position: relative;\n  gap: 4px;\n  border-radius: var(--neeto-ui-rounded);\n  transition: var(--neeto-ui-transition);\n  margin: 4px 0;\n  max-width: 384px;\n  white-space: nowrap;\n  overflow: hidden;\n}\n.neeto-filters-bar__block p:first-child {\n  color: rgb(var(--neeto-ui-gray-700));\n}\n.neeto-filters-bar__block-close {\n  position: absolute;\n  top: 0;\n  right: 0;\n  padding: 8px;\n  opacity: 0;\n  color: rgb(var(--neeto-ui-gray-800));\n  transition: var(--neeto-ui-transition);\n  background-image: linear-gradient(90deg, rgba(var(--neeto-ui-gray-200), 0.5) 0%, rgba(var(--neeto-ui-gray-200), 1) 25%);\n}\n.neeto-filters-bar__block:hover, .neeto-filters-bar__block:active {\n  background-color: rgb(var(--neeto-ui-gray-200));\n  cursor: pointer;\n}\n.neeto-filters-bar__block:hover .neeto-filters-bar__block-close, .neeto-filters-bar__block:active .neeto-filters-bar__block-close {\n  opacity: 1;\n  color: rgb(var(--neeto-ui-black));\n  border-radius: var(--neeto-ui-rounded);\n}\n.neeto-filters-bar__block:focus {\n  outline: none;\n  box-shadow: 0 0 0 3px rgba(var(--neeto-ui-gray-800), 15%);\n}\n.neeto-filters-bar--separator {\n  border-left: 1px solid rgb(var(--neeto-ui-gray-400));\n  margin: 12px 8px;\n  align-self: stretch;\n}\n\n.neeto-filters-pane-filter {\n  width: 360px;\n  overflow: visible;\n}\n.neeto-filters-pane-filter__body {\n  align-items: stretch !important;\n  gap: 20px;\n}\n.neeto-filters-pane-filter__body > * {\n  flex-grow: 0 !important;\n}\n.neeto-filters-pane-filter__body p {\n  text-align: center;\n}\n.neeto-filters-pane-filter__body .neeto-filters-pane-filter__item-wrapper {\n  display: flex;\n  flex-direction: column;\n  gap: 8px;\n  flex: 1;\n}\n.neeto-filters-pane-filter__body .accordion_item .neeto-filters-pane-filter__item-wrapper {\n  margin-top: 16px;\n  flex: 1;\n}\n.neeto-filters-pane-filter__body .accordion_item .neeto-filters-pane-filter__item-wrapper:first-of-type {\n  margin-top: 0;\n}\n.neeto-filters-pane-filter__body .accordion_item:first-of-type .neeto-ui-accordion__item {\n  padding-top: 0;\n}\n.neeto-filters-pane-filter__body .neeto-ui-accordion__wrapper--last-item {\n  border-bottom: thin solid rgb(var(--neeto-ui-gray-300));\n}\n@media screen and (max-width: 767px) {\n  .neeto-filters-pane-filter {\n    width: 100vw;\n  }\n}\n\n.neeto-filters-pane-backdrop {\n  backdrop-filter: blur(0px) !important;\n  background-color: rgba(var(--neeto-ui-gray-700), 0.2);\n}\n\n.neeto-filters-segment--active {\n  border-color: rgb(var(--neeto-ui-primary-500)) !important;\n  box-shadow: 0 0 0 1px rgb(var(--neeto-ui-primary-500)) !important;\n}",".neeto-filters-pane-filter {\n  width: 360px;\n  overflow: visible;\n\n  &__body {\n    align-items: stretch !important;\n    gap: 20px;\n\n    > * {\n      flex-grow: 0 !important;\n    }\n\n    p {\n      text-align: center;\n    }\n\n    .neeto-filters-pane-filter__item-wrapper {\n      display: flex;\n      flex-direction: column;\n      gap: 8px;\n      flex: 1;\n    }\n\n    .accordion_item {\n      .neeto-filters-pane-filter__item-wrapper {\n        margin-top: 16px;\n        flex: 1;\n\n        &:first-of-type {\n          margin-top: 0;\n        }\n      }\n      &:first-of-type {\n        .neeto-ui-accordion__item {\n          padding-top: 0;\n        }\n      }\n    }\n    .neeto-ui-accordion__wrapper--last-item {\n      border-bottom: thin solid rgb(var(--neeto-ui-gray-300));\n    }\n  }\n\n  @include viewport(mob) {\n    width: 100vw;\n  }\n}\n\n.neeto-filters-pane-backdrop {\n  backdrop-filter: blur(0px) !important;\n  background-color: rgba(var(--neeto-ui-gray-700), 0.2);\n}\n","@mixin viewport($media) {\n  @if $media==desk {\n    @media screen and (min-width: 1200px) {\n      @content;\n    }\n  } @else if $media==tab-min {\n    @media screen and (max-width: 1024px) {\n      @content;\n    }\n  } @else if $media==tab-only {\n    @media screen and (min-width: 768px) and (max-width: 1023px) {\n      @content;\n    }\n  } @else if $media==mob {\n    @media screen and (max-width: 767px) {\n      @content;\n    }\n  } @else if $media==xs-mob {\n    @media screen and (max-width: 479px) {\n      @content;\n    }\n  }\n}\n",".neeto-filters-segment--active {\n  border-color: rgb(var(--neeto-ui-primary-500)) !important;\n  box-shadow: 0 0 0 1px rgb(var(--neeto-ui-primary-500)) !important;\n}\n"]} */";
 n(css,{});
 
-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 ownKeys$1(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$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Filters = withT(function (_ref) {
   var t = _ref.t,
     _ref$isOpen = _ref.isOpen,
@@ -3138,28 +3204,31 @@ var Filters = withT(function (_ref) {
     } : _ref$keyword,
     childrenKeys = _ref.childrenKeys,
     children = _ref.children;
-  return /*#__PURE__*/React.createElement("span", {
-    className: classnames(_defineProperty({}, className, className))
-  }, /*#__PURE__*/React.createElement(Button, _extends({
-    "data-cy": "neeto-filters-toggle-btn",
-    label: t("neetoFilters.common.filter"),
-    style: "secondary",
-    onClick: function onClick() {
-      return setIsOpen(true);
-    }
-  }, buttonProps)), /*#__PURE__*/React.createElement(Pane, _extends({
-    onClose: function onClose() {
-      return setIsOpen(false);
-    }
-  }, _objectSpread({
-    childrenKeys: childrenKeys,
-    columns: columns,
-    isOpen: isOpen,
-    isSearchable: isSearchable,
-    keyword: keyword,
-    onChange: onChange,
-    onSelectorsChange: onSelectorsChange
-  }, paneProps)), children));
+  return /*#__PURE__*/jsxs("span", {
+    className: classnames(_defineProperty({}, className, className)),
+    children: [/*#__PURE__*/jsx(Button, _objectSpread$1({
+      "data-cy": "neeto-filters-toggle-btn",
+      label: t("neetoFilters.common.filter"),
+      style: "secondary",
+      onClick: function onClick() {
+        return setIsOpen(true);
+      }
+    }, buttonProps)), /*#__PURE__*/jsx(Pane, _objectSpread$1(_objectSpread$1({
+      onClose: function onClose() {
+        return setIsOpen(false);
+      }
+    }, _objectSpread$1({
+      childrenKeys: childrenKeys,
+      columns: columns,
+      isOpen: isOpen,
+      isSearchable: isSearchable,
+      keyword: keyword,
+      onChange: onChange,
+      onSelectorsChange: onSelectorsChange
+    }, paneProps)), {}, {
+      children: children
+    }))]
+  });
 });
 
 var ITEMS_MAX_COUNT = 20;
@@ -3183,7 +3252,7 @@ var Delete = function Delete(_ref) {
     segmentId = _getQueryParams.segmentId;
   var _useDestroySegment = useDestroySegment(),
     deleteSegment = _useDestroySegment.mutate,
-    isDeleting = _useDestroySegment.isLoading;
+    isDeleting = _useDestroySegment.isPending;
   var handleClearAll = function handleClearAll() {
     var params = buildUrlFromFilters({
       columns: columns,
@@ -3200,13 +3269,13 @@ var Delete = function Delete(_ref) {
       onSuccess: onClose
     });
   };
-  return /*#__PURE__*/React.createElement(Alert, {
+  return /*#__PURE__*/jsx(Alert, {
     isOpen: isOpen,
     onClose: onClose,
     isSubmitting: isDeleting,
     submitButtonLabel: t("neetoFilters.common.delete"),
     title: t("neetoFilters.segments.deleteAlertTitle"),
-    message: /*#__PURE__*/React.createElement(Trans, {
+    message: /*#__PURE__*/jsx(Trans, {
       i18nKey: "neetoFilters.segments.deleteAlertMessage",
       values: {
         entity: segment.name
@@ -3244,7 +3313,7 @@ var useSegments = function useSegments(_ref) {
     setSegments = _useState2[1];
   var _useUpdateSegment = useUpdateSegment(),
     updateSegment = _useUpdateSegment.mutate,
-    isUpdating = _useUpdateSegment.isLoading;
+    isUpdating = _useUpdateSegment.isPending;
   var _useState3 = useState({
       action: "",
       segment: undefined
@@ -3296,12 +3365,13 @@ var useSegments = function useSegments(_ref) {
     setSegments(fetchedSegments);
   }, [fetchedSegments]);
   if (isLoading) {
-    return /*#__PURE__*/React.createElement(Spinner, null);
+    return /*#__PURE__*/jsx(Spinner, {});
   }
   if (isEmpty(segments)) {
-    return /*#__PURE__*/React.createElement(Typography, {
-      style: "body2"
-    }, t("neetoFilters.segments.noSegmentsFound"));
+    return /*#__PURE__*/jsx(Typography, {
+      style: "body2",
+      children: t("neetoFilters.segments.noSegmentsFound")
+    });
   }
   var handleUpdate = function handleUpdate(_ref4, _ref5) {
     var name = _ref4.name;
@@ -3380,28 +3450,33 @@ var Segment = function Segment(_ref) {
       });
     }
   }];
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/jsxs("div", {
     onClick: onClick,
     "data-cy": "neeto-filters-segment-block-".concat(hyphenate(label)),
     className: classnames("neeto-ui-border-gray-400 neeto-ui-bg-white hover:neeto-ui-bg-gray-200 neeto-ui-rounded-lg mb-2 flex h-10 cursor-pointer items-center gap-2 border p-3 transition-all duration-300 ease-in-out", {
       "neeto-filters-segment--active": isActive
-    })
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "flex flex-grow items-center gap-2 overflow-hidden",
-    "data-cy": "new-element-field"
-  }, /*#__PURE__*/React.createElement(Typography, {
-    className: "truncate leading-snug",
-    "data-cy": hyphenate(label),
-    style: "body2"
-  }, label)), shouldShowDropdown && /*#__PURE__*/React.createElement(MoreDropdown, {
-    menuItems: menuItems,
-    dropdownButtonProps: {
-      className: "min-h-0 flex-shrink-0",
-      "data-cy": "".concat(hyphenate(label), "-more-dropdown")
-    }
-  }));
+    }),
+    children: [/*#__PURE__*/jsx("div", {
+      className: "flex flex-grow items-center gap-2 overflow-hidden",
+      "data-cy": "new-element-field",
+      children: /*#__PURE__*/jsx(Typography, {
+        className: "truncate leading-snug",
+        "data-cy": hyphenate(label),
+        style: "body2",
+        children: label
+      })
+    }), shouldShowDropdown && /*#__PURE__*/jsx(MoreDropdown, {
+      menuItems: menuItems,
+      dropdownButtonProps: {
+        className: "min-h-0 flex-shrink-0",
+        "data-cy": "".concat(hyphenate(label), "-more-dropdown")
+      }
+    })]
+  });
 };
 
+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; }
 var MenuBlocks = function MenuBlocks(_ref) {
   var entity = _ref.entity,
     segments = _ref.segments,
@@ -3419,63 +3494,74 @@ var MenuBlocks = function MenuBlocks(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     showAll = _useState2[0],
     setShowAll = _useState2[1];
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MenuBar.SubTitle, null, /*#__PURE__*/React.createElement(Typography, {
-    component: "h4",
-    style: "h5",
-    textTransform: "uppercase",
-    weight: "bold"
-  }, t("neetoFilters.common.segments"))), segments.length > ITEMS_MAX_COUNT && /*#__PURE__*/React.createElement(Button, {
-    icon: Down,
-    style: "link",
-    label: showAll ? t("neetoFilters.segments.showLess") : t("neetoFilters.segments.showMoreNumbers", {
-      entity: segments.length - ITEMS_MAX_COUNT
-    }),
-    onClick: function onClick() {
-      return setShowAll(function (open) {
-        return !open;
-      });
-    }
-  }), /*#__PURE__*/React.createElement(Segment, {
-    isActive: isEmpty(appliedFilters),
-    label: defaultSegmentName,
-    onClick: clearAppliedFilters
-  }), /*#__PURE__*/React.createElement(DragDropContext, {
-    onDragEnd: handleSegmentsReorder
-  }, /*#__PURE__*/React.createElement(Droppable, {
-    droppableId: "neeto-filters-segments-".concat(entity)
-  }, function (_ref2) {
-    var innerRef = _ref2.innerRef,
-      droppableProps = _ref2.droppableProps,
-      placeholder = _ref2.placeholder;
-    return /*#__PURE__*/React.createElement("div", _extends({
-      ref: innerRef
-    }, droppableProps), segments.slice(0, showAll ? segments.length : ITEMS_MAX_COUNT).map(function (segment, index) {
-      return /*#__PURE__*/React.createElement(Draggable, {
-        index: index,
-        draggableId: segment.id.toString(),
-        isDragDisabled: isUpdating,
-        key: segment.id.toString()
-      }, function (_ref3) {
-        var innerRef = _ref3.innerRef,
-          draggableProps = _ref3.draggableProps,
-          dragHandleProps = _ref3.dragHandleProps;
-        return /*#__PURE__*/React.createElement("div", _extends({
-          ref: innerRef
-        }, draggableProps, dragHandleProps), /*#__PURE__*/React.createElement(Segment, {
-          segments: segments,
-          setConfirmAction: setConfirmAction,
-          shouldShowDropdown: true,
-          id: segment.id,
-          isActive: segment.id === segmentId,
-          key: segment.id,
-          label: segment.name,
-          onClick: function onClick() {
-            return handleSelectSegment(segment);
-          }
-        }));
-      });
-    }), placeholder);
-  })));
+  return /*#__PURE__*/jsxs(Fragment, {
+    children: [/*#__PURE__*/jsx(MenuBar.SubTitle, {
+      children: /*#__PURE__*/jsx(Typography, {
+        component: "h4",
+        style: "h5",
+        textTransform: "uppercase",
+        weight: "bold",
+        children: t("neetoFilters.common.segments")
+      })
+    }), segments.length > ITEMS_MAX_COUNT && /*#__PURE__*/jsx(Button, {
+      icon: Down,
+      style: "link",
+      label: showAll ? t("neetoFilters.segments.showLess") : t("neetoFilters.segments.showMoreNumbers", {
+        entity: segments.length - ITEMS_MAX_COUNT
+      }),
+      onClick: function onClick() {
+        return setShowAll(function (open) {
+          return !open;
+        });
+      }
+    }), /*#__PURE__*/jsx(Segment, {
+      isActive: isEmpty(appliedFilters),
+      label: defaultSegmentName,
+      onClick: clearAppliedFilters
+    }), /*#__PURE__*/jsx(DragDropContext, {
+      onDragEnd: handleSegmentsReorder,
+      children: /*#__PURE__*/jsx(Droppable, {
+        droppableId: "neeto-filters-segments-".concat(entity),
+        children: function children(_ref2) {
+          var innerRef = _ref2.innerRef,
+            droppableProps = _ref2.droppableProps,
+            placeholder = _ref2.placeholder;
+          return /*#__PURE__*/jsxs("div", _objectSpread(_objectSpread({
+            ref: innerRef
+          }, droppableProps), {}, {
+            children: [segments.slice(0, showAll ? segments.length : ITEMS_MAX_COUNT).map(function (segment, index) {
+              return /*#__PURE__*/createElement(Draggable, {
+                index: index,
+                draggableId: segment.id.toString(),
+                isDragDisabled: isUpdating,
+                key: segment.id.toString()
+              }, function (_ref3) {
+                var innerRef = _ref3.innerRef,
+                  draggableProps = _ref3.draggableProps,
+                  dragHandleProps = _ref3.dragHandleProps;
+                return /*#__PURE__*/jsx("div", _objectSpread(_objectSpread(_objectSpread({
+                  ref: innerRef
+                }, draggableProps), dragHandleProps), {}, {
+                  children: /*#__PURE__*/createElement(Segment, {
+                    segments: segments,
+                    setConfirmAction: setConfirmAction,
+                    shouldShowDropdown: true,
+                    id: segment.id,
+                    isActive: segment.id === segmentId,
+                    key: segment.id,
+                    label: segment.name,
+                    onClick: function onClick() {
+                      return handleSelectSegment(segment);
+                    }
+                  })
+                }));
+              });
+            }), placeholder]
+          }));
+        }
+      })
+    })]
+  });
 };
 var MenuBlocks$1 = /*#__PURE__*/React.memo(MenuBlocks);
 
@@ -3508,31 +3594,33 @@ var SidebarBlock = function SidebarBlock(_ref) {
     }
   }];
   var dataCyPrefix = hyphenate(label);
-  return /*#__PURE__*/React.createElement("button", {
+  return /*#__PURE__*/jsxs("button", {
     onClick: onClick,
     "data-cy": "".concat(dataCyPrefix, "-segment-link"),
     className: classnames("neeto-molecules-sidebar-segment neeto-molecules-sidebar__sublink neeto-ui-flex neeto-ui-items-center neeto-ui-select-none mb-0 w-full py-1", {
       active: isActive
-    })
-  }, /*#__PURE__*/React.createElement(Typography, {
-    className: "neeto-molecules-sidebar__link-sub-label neeto-molecules-sidebar-segment__label neeto-ui-flex-grow min-w-0",
-    component: "span",
-    "data-cy": "".concat(dataCyPrefix, "-sub-link-label"),
-    style: "body2"
-  }, label), /*#__PURE__*/React.createElement(MoreDropdown, {
-    menuItems: menuItems,
-    dropdownButtonProps: {
-      "data-testid": "segment-more-menu-".concat(dataCyPrefix),
-      className: "flex-shrink-0",
-      size: "small",
-      style: "secondary"
-    },
-    dropdownProps: {
-      position: "bottom-end",
-      strategy: "fixed",
-      autoWidth: true
-    }
-  }));
+    }),
+    children: [/*#__PURE__*/jsx(Typography, {
+      className: "neeto-molecules-sidebar__link-sub-label neeto-molecules-sidebar-segment__label neeto-ui-flex-grow min-w-0",
+      component: "span",
+      "data-cy": "".concat(dataCyPrefix, "-sub-link-label"),
+      style: "body2",
+      children: label
+    }), /*#__PURE__*/jsx(MoreDropdown, {
+      menuItems: menuItems,
+      dropdownButtonProps: {
+        "data-testid": "segment-more-menu-".concat(dataCyPrefix),
+        className: "flex-shrink-0",
+        size: "small",
+        style: "secondary"
+      },
+      dropdownProps: {
+        position: "bottom-end",
+        strategy: "fixed",
+        autoWidth: true
+      }
+    })]
+  });
 };
 
 var Segments = function Segments(_ref) {
@@ -3569,54 +3657,58 @@ var Segments = function Segments(_ref) {
     handleUpdate = _useSegments.handleUpdate,
     filters = _useSegments.filters,
     appliedFilters = _useSegments.appliedFilters;
-  return /*#__PURE__*/React.createElement("div", {
-    "data-testid": "neeto-filters-segments"
-  }, isIndependent ? /*#__PURE__*/React.createElement(MenuBlocks$1, {
-    appliedFilters: appliedFilters,
-    clearAppliedFilters: clearAppliedFilters,
-    defaultSegmentName: defaultSegmentName,
-    entity: entity,
-    handleSegmentsReorder: handleSegmentsReorder,
-    handleSelectSegment: handleSelectSegment,
-    isUpdating: isUpdating,
-    segmentId: segmentId,
-    segments: segments,
-    setConfirmAction: setConfirmAction
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, isNotEmpty(segments) && /*#__PURE__*/React.createElement(Typography, {
-    style: "body3",
-    weight: "semibold",
-    className: "neeto-molecules-sidebar-segments-header neeto-ui-text-transform-capitalize neeto-ui-text-gray-600 py-2 uppercase"
-  }, t("neetoFilters.segments.segment", PLURAL)), segments.map(function (segment) {
-    return /*#__PURE__*/React.createElement(SidebarBlock, {
+  return /*#__PURE__*/jsxs("div", {
+    "data-testid": "neeto-filters-segments",
+    children: [isIndependent ? /*#__PURE__*/jsx(MenuBlocks$1, {
+      appliedFilters: appliedFilters,
+      clearAppliedFilters: clearAppliedFilters,
+      defaultSegmentName: defaultSegmentName,
+      entity: entity,
+      handleSegmentsReorder: handleSegmentsReorder,
+      handleSelectSegment: handleSelectSegment,
+      isUpdating: isUpdating,
+      segmentId: segmentId,
       segments: segments,
-      setConfirmAction: setConfirmAction,
-      id: segment.id,
-      isActive: segment.id === segmentId,
-      key: segment.id,
-      label: segment.name,
-      onClick: function onClick() {
-        return handleSelectSegment(segment);
-      }
-    });
-  })), /*#__PURE__*/React.createElement(SegmentForm, {
-    childrenKeys: childrenKeys,
-    columns: columns,
-    customFilters: customFilters,
-    defaultSegmentName: defaultSegmentName,
-    filters: filters,
-    onClose: onClose,
-    segmentFormInitialRef: segmentFormInitialRef,
-    isEdit: true,
-    handleSubmit: handleUpdate,
-    initialValues: selectedSegment,
-    isOpen: isEditPaneOpen,
-    isSubmitting: isUpdating
-  }), /*#__PURE__*/React.createElement(Delete, {
-    columns: columns,
-    onClose: onClose,
-    isOpen: isDeleteAlertOpen,
-    segment: selectedSegment
-  }));
+      setConfirmAction: setConfirmAction
+    }) : /*#__PURE__*/jsxs(Fragment, {
+      children: [isNotEmpty(segments) && /*#__PURE__*/jsx(Typography, {
+        style: "body3",
+        weight: "semibold",
+        className: "neeto-molecules-sidebar-segments-header neeto-ui-text-transform-capitalize neeto-ui-text-gray-600 py-2 uppercase",
+        children: t("neetoFilters.segments.segment", PLURAL)
+      }), segments.map(function (segment) {
+        return /*#__PURE__*/createElement(SidebarBlock, {
+          segments: segments,
+          setConfirmAction: setConfirmAction,
+          id: segment.id,
+          isActive: segment.id === segmentId,
+          key: segment.id,
+          label: segment.name,
+          onClick: function onClick() {
+            return handleSelectSegment(segment);
+          }
+        });
+      })]
+    }), /*#__PURE__*/jsx(SegmentForm, {
+      childrenKeys: childrenKeys,
+      columns: columns,
+      customFilters: customFilters,
+      defaultSegmentName: defaultSegmentName,
+      filters: filters,
+      onClose: onClose,
+      segmentFormInitialRef: segmentFormInitialRef,
+      isEdit: true,
+      handleSubmit: handleUpdate,
+      initialValues: selectedSegment,
+      isOpen: isEditPaneOpen,
+      isSubmitting: isUpdating
+    }), /*#__PURE__*/jsx(Delete, {
+      columns: columns,
+      onClose: onClose,
+      isOpen: isDeleteAlertOpen,
+      segment: selectedSegment
+    })]
+  });
 };
 var index = /*#__PURE__*/React.memo(Segments);