@react-fabric/searchbar 1.0.0-beta.47 → 1.0.0-beta.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,7 +19,9 @@ var FilterBar = function FilterBar(_ref) {
19
19
  filters = _ref$filters === void 0 ? [] : _ref$filters,
20
20
  allowAdd = _ref.allowAdd,
21
21
  fields = _ref.fields,
22
+ editable = _ref.editable,
22
23
  querySchema = _ref.querySchema,
24
+ queryLanguage = _ref.queryLanguage,
23
25
  defaultQuery = _ref.defaultQuery,
24
26
  includedColor = _ref.includedColor,
25
27
  excludedColor = _ref.excludedColor,
@@ -48,9 +50,9 @@ var FilterBar = function FilterBar(_ref) {
48
50
  if (type === "disableAll") filter.disabled = true;
49
51
  if (type === "enableAll") filter.disabled = false;
50
52
  if (type === "toggleDisable") filter.disabled = !filter.disabled;
51
- if (type === "excludeAll") filter.negate = true;
52
- if (type === "includeAll") filter.negate = false;
53
- if (type === "invertAll") filter.negate = !filter.negate;
53
+ if (type === "excludeAll" && filter.field) filter.negate = true;
54
+ if (type === "includeAll" && filter.field) filter.negate = false;
55
+ if (type === "invertAll" && filter.field) filter.negate = !filter.negate;
54
56
  return _objectSpread({}, filter);
55
57
  })));
56
58
  }
@@ -67,8 +69,8 @@ var FilterBar = function FilterBar(_ref) {
67
69
  filters.forEach(function (filter) {
68
70
  if (filter.disabled && filter.canDisable !== false && !key.someDisabled) key.someDisabled = true;
69
71
  if (!filter.disabled && filter.canDisable !== false && !key.someEnabled) key.someEnabled = true;
70
- if (filter.negate && filter.canInvert !== false && !key.someExcluded) key.someExcluded = true;
71
- if (!filter.negate && filter.canInvert !== false && !key.someIncluded) key.someIncluded = true;
72
+ if (filter.field && filter.negate && filter.canInvert !== false && !key.someExcluded) key.someExcluded = true;
73
+ if (filter.field && !filter.negate && filter.canInvert !== false && !key.someIncluded) key.someIncluded = true;
72
74
  if (!filter.required && !key.canRemoveAll) key.canRemoveAll = true;
73
75
  });
74
76
  return key;
@@ -77,6 +79,7 @@ var FilterBar = function FilterBar(_ref) {
77
79
  value: {
78
80
  defaultQuery: defaultQuery,
79
81
  querySchema: querySchema,
82
+ queryLanguage: queryLanguage,
80
83
  fields: fields
81
84
  },
82
85
  children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -122,6 +125,7 @@ var FilterBar = function FilterBar(_ref) {
122
125
  }), filters === null || filters === void 0 ? void 0 : filters.map(function (filter, idx) {
123
126
  return /*#__PURE__*/jsxRuntime.jsx(FilterTag.FilterTag, {
124
127
  filter: filter,
128
+ editable: editable,
125
129
  includedColor: includedColor,
126
130
  excludedColor: excludedColor,
127
131
  onRemove: function onRemove() {
@@ -39,6 +39,30 @@ var FilterSchema = new utilities.yup.ObjectSchema({
39
39
  }
40
40
  });
41
41
  }
42
+ }).when("operator", {
43
+ is: index.OPERATOR.BETWEEN,
44
+ then: function then(schema) {
45
+ return schema.test({
46
+ name: "array-check",
47
+ message: "${path} is a required field",
48
+ test: function test() {
49
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
50
+ return (val === null || val === void 0 ? void 0 : val.length) > 0 && val[0] && val[1];
51
+ }
52
+ });
53
+ }
54
+ }).when("operator", {
55
+ is: index.OPERATOR.BETWEEN,
56
+ then: function then(schema) {
57
+ return schema.test({
58
+ name: "array-check",
59
+ message: "${path} min max",
60
+ test: function test() {
61
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
62
+ return (val === null || val === void 0 ? void 0 : val.length) > 0 && val[0] < val[1];
63
+ }
64
+ });
65
+ }
42
66
  })
43
67
  });
44
68
  var FilterForm = function FilterForm(_ref) {
@@ -102,7 +126,7 @@ var FilterForm = function FilterForm(_ref) {
102
126
  utilities.isArray(values.value) && ((_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setValue("value", undefined));
103
127
  }
104
128
  }
105
- if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.NUMBER || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DECIMAL) {
129
+ if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DATE || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DATETIME || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.NUMBER || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DECIMAL) {
106
130
  if ((values === null || values === void 0 ? void 0 : values.operator) === index.OPERATOR.BETWEEN) {
107
131
  var _formRef$current7;
108
132
  !utilities.isArray(values.value) && ((_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setValue("value", []));
@@ -111,7 +135,7 @@ var FilterForm = function FilterForm(_ref) {
111
135
  utilities.isArray(values.value) && ((_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setValue("value", undefined));
112
136
  }
113
137
  }
114
- if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.BOOLEAN && (values === null || values === void 0 ? void 0 : values.operator) === index.OPERATOR.IS && (values === null || values === void 0 ? void 0 : values.value) === undefined) {
138
+ if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.BOOLEAN && [index.OPERATOR.IS, index.OPERATOR.EQ].includes(values === null || values === void 0 ? void 0 : values.operator) && (values === null || values === void 0 ? void 0 : values.value) === undefined) {
115
139
  var _formRef$current9;
116
140
  (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 || _formRef$current9.setValue("value", false);
117
141
  }
@@ -169,24 +193,27 @@ var FilterForm = function FilterForm(_ref) {
169
193
  if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DECIMAL || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.NUMBER) {
170
194
  var step = field.type === index.FIELD_TYPE.DECIMAL ? 0.1 : 1;
171
195
  if ((values === null || values === void 0 ? void 0 : values.operator) === index.OPERATOR.BETWEEN) {
172
- return /*#__PURE__*/jsxRuntime.jsxs(form.Field, {
173
- label: t("label.value"),
174
- children: [/*#__PURE__*/jsxRuntime.jsx(form.Controller, {
175
- name: "value[0]",
176
- children: /*#__PURE__*/jsxRuntime.jsx(form.Number, {
177
- step: step,
178
- allowClear: true
179
- })
180
- }), /*#__PURE__*/jsxRuntime.jsx("span", {
181
- className: "p-2 text-muted",
182
- children: "\u2277"
183
- }), /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
184
- name: "value[1]",
185
- children: /*#__PURE__*/jsxRuntime.jsx(form.Number, {
186
- step: step,
187
- allowClear: true
188
- })
189
- })]
196
+ return /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
197
+ name: "value",
198
+ children: /*#__PURE__*/jsxRuntime.jsxs(form.Field, {
199
+ label: t("label.value"),
200
+ children: [/*#__PURE__*/jsxRuntime.jsx(form.Controller, {
201
+ name: "value[0]",
202
+ children: /*#__PURE__*/jsxRuntime.jsx(form.Number, {
203
+ step: step,
204
+ allowClear: true
205
+ })
206
+ }), /*#__PURE__*/jsxRuntime.jsx("span", {
207
+ className: "p-2 text-muted",
208
+ children: "\u2277"
209
+ }), /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
210
+ name: "value[1]",
211
+ children: /*#__PURE__*/jsxRuntime.jsx(form.Number, {
212
+ step: step,
213
+ allowClear: true
214
+ })
215
+ })]
216
+ })
190
217
  });
191
218
  } else {
192
219
  return /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
@@ -199,6 +226,41 @@ var FilterForm = function FilterForm(_ref) {
199
226
  });
200
227
  }
201
228
  }
229
+ if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DATE || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DATETIME) {
230
+ var type = field.type === index.FIELD_TYPE.DATETIME ? "datetime" : "date";
231
+ if ((values === null || values === void 0 ? void 0 : values.operator) === index.OPERATOR.BETWEEN) {
232
+ return /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
233
+ name: "value",
234
+ children: /*#__PURE__*/jsxRuntime.jsxs(form.Field, {
235
+ label: t("label.value"),
236
+ children: [/*#__PURE__*/jsxRuntime.jsx(form.Controller, {
237
+ name: "value[0]",
238
+ children: /*#__PURE__*/jsxRuntime.jsx(form.DateInput, {
239
+ type: type,
240
+ allowClear: true
241
+ })
242
+ }), /*#__PURE__*/jsxRuntime.jsx("span", {
243
+ className: "p-2 text-muted",
244
+ children: "\u2277"
245
+ }), /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
246
+ name: "value[1]",
247
+ children: /*#__PURE__*/jsxRuntime.jsx(form.DateInput, {
248
+ type: type,
249
+ allowClear: true
250
+ })
251
+ })]
252
+ })
253
+ });
254
+ } else {
255
+ return /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
256
+ name: "value",
257
+ children: /*#__PURE__*/jsxRuntime.jsx(form.DateInput, {
258
+ type: type,
259
+ allowClear: true
260
+ })
261
+ });
262
+ }
263
+ }
202
264
  }, [field, values === null || values === void 0 ? void 0 : values.operator]);
203
265
  var handleSubmit = react$1.useCallback(function (model) {
204
266
  var filter = {
@@ -14,7 +14,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
14
14
  var FilterMenu = function FilterMenu(_ref) {
15
15
  var filter = _ref.filter;
16
16
  _ref.fields;
17
- var onChange = _ref.onChange,
17
+ var editable = _ref.editable,
18
+ onChange = _ref.onChange,
18
19
  onRemove = _ref.onRemove;
19
20
  var _useTranslation = reactI18next.useTranslation("searchbar"),
20
21
  t = _useTranslation.t;
@@ -31,7 +32,7 @@ var FilterMenu = function FilterMenu(_ref) {
31
32
  onRemove: onRemove
32
33
  }) : /*#__PURE__*/jsxRuntime.jsxs(core.Menu, {
33
34
  className: "text-sm",
34
- children: [filter.canEdit !== false ? /*#__PURE__*/jsxRuntime.jsx(core.MenuItem, {
35
+ children: [editable && filter.canEdit !== false ? /*#__PURE__*/jsxRuntime.jsx(core.MenuItem, {
35
36
  icon: core.CoreIcons.edit,
36
37
  label: t("label.edit"),
37
38
  "data-dropdown-dismiss": "false",
@@ -52,7 +53,7 @@ var FilterMenu = function FilterMenu(_ref) {
52
53
  pinned: !filter.pinned
53
54
  }));
54
55
  }
55
- }), filter.canInvert !== false && /*#__PURE__*/jsxRuntime.jsx(core.MenuItem, {
56
+ }), filter.canInvert !== false && filter.field && /*#__PURE__*/jsxRuntime.jsx(core.MenuItem, {
56
57
  label: t(filter.negate ? "label.include" : "label.exclude"),
57
58
  onClick: function onClick() {
58
59
  return onChange(_objectSpread(_objectSpread({}, filter), {}, {
@@ -15,6 +15,7 @@ var FilterTag = function FilterTag(_ref) {
15
15
  var _filter$icon;
16
16
  var filter = _ref.filter,
17
17
  fields = _ref.fields,
18
+ editable = _ref.editable,
18
19
  _ref$includedColor = _ref.includedColor,
19
20
  includedColor = _ref$includedColor === void 0 ? "primary-500" : _ref$includedColor,
20
21
  _ref$excludedColor = _ref.excludedColor,
@@ -26,7 +27,7 @@ var FilterTag = function FilterTag(_ref) {
26
27
  var label = react.useMemo(function () {
27
28
  var _filter$value;
28
29
  if (filter.label) return /*#__PURE__*/jsxRuntime.jsxs(react.Fragment, {
29
- children: [filter.negate && /*#__PURE__*/jsxRuntime.jsx("span", {
30
+ children: [filter.field && filter.negate && /*#__PURE__*/jsxRuntime.jsx("span", {
30
31
  className: "font-semibold",
31
32
  children: "NOT"
32
33
  }), /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -34,7 +35,7 @@ var FilterTag = function FilterTag(_ref) {
34
35
  })]
35
36
  });
36
37
  return /*#__PURE__*/jsxRuntime.jsxs(react.Fragment, {
37
- children: [filter.negate && /*#__PURE__*/jsxRuntime.jsx("span", {
38
+ children: [filter.field && filter.negate && /*#__PURE__*/jsxRuntime.jsx("span", {
38
39
  className: "font-semibold",
39
40
  children: "NOT"
40
41
  }), /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -52,7 +53,7 @@ var FilterTag = function FilterTag(_ref) {
52
53
  }, [filter]);
53
54
  var color = react.useMemo(function () {
54
55
  var _filter$color;
55
- return (_filter$color = filter.color) !== null && _filter$color !== void 0 ? _filter$color : filter.negate ? excludedColor : includedColor;
56
+ return (_filter$color = filter.color) !== null && _filter$color !== void 0 ? _filter$color : filter.field && filter.negate ? excludedColor : includedColor;
56
57
  }, [filter, includedColor, excludedColor]);
57
58
  var icon = react.useMemo(function () {
58
59
  if (filter.canDisable === false) return undefined;
@@ -88,6 +89,7 @@ var FilterTag = function FilterTag(_ref) {
88
89
  }), /*#__PURE__*/jsxRuntime.jsx(FilterMenu.FilterMenu, {
89
90
  filter: filter,
90
91
  fields: fields,
92
+ editable: editable,
91
93
  onChange: onChange,
92
94
  onRemove: onRemove
93
95
  })]
@@ -37,7 +37,8 @@ var QueryForm = function QueryForm(_ref) {
37
37
  var _useFilterContext = Context.useFilterContext(),
38
38
  _useFilterContext$def = _useFilterContext.defaultQuery,
39
39
  defaultQuery = _useFilterContext$def === void 0 ? "" : _useFilterContext$def,
40
- querySchema = _useFilterContext.querySchema;
40
+ querySchema = _useFilterContext.querySchema,
41
+ queryLanguage = _useFilterContext.queryLanguage;
41
42
  var inputRef = react$1.useRef(null);
42
43
  var filterValue = react$1.useMemo(function () {
43
44
  var _filter$query;
@@ -101,7 +102,7 @@ var QueryForm = function QueryForm(_ref) {
101
102
  gridTemplate: '"content" 1fr/1fr'
102
103
  },
103
104
  children: /*#__PURE__*/jsxRuntime.jsx(monaco.CodeEditor, _objectSpread(_objectSpread({
104
- language: "json",
105
+ language: queryLanguage !== null && queryLanguage !== void 0 ? queryLanguage : "text",
105
106
  minimal: true,
106
107
  required: true
107
108
  }, field), {}, {
@@ -41,6 +41,7 @@ var operator = {
41
41
  EXISTS: "Exists",
42
42
  IS: "Is",
43
43
  IN: "In",
44
+ EQ: "=",
44
45
  LT: "<",
45
46
  GT: ">",
46
47
  LTE: "≤",
@@ -12,7 +12,7 @@ var reactI18next = require('react-i18next');
12
12
  var FilterBar = require('../filterbar/FilterBar.js');
13
13
  var jsxRuntime = require('react/jsx-runtime');
14
14
 
15
- var _excluded = ["historyKey", "historyCount", "defaultQueryList", "prepend", "append", "decorateEnd", "decorateStart", "children", "hideFilters", "defaultCollapsed", "disabled", "onCollapsed", "onQuery", "onSearch", "query", "multiple", "filters"];
15
+ var _excluded = ["historyKey", "historyCount", "defaultQueryList", "prepend", "append", "decorateEnd", "decorateStart", "children", "hideFilters", "defaultCollapsed", "disabled", "onCollapsed", "onQuery", "onSearch", "query", "ref", "multiple", "filters"];
16
16
  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; }
17
17
  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; }
18
18
  var SearchBar = function SearchBar(_ref) {
@@ -34,6 +34,7 @@ var SearchBar = function SearchBar(_ref) {
34
34
  _ref.onQuery;
35
35
  var onSearch = _ref.onSearch,
36
36
  query = _ref.query,
37
+ ref = _ref.ref,
37
38
  multiple = _ref.multiple,
38
39
  _ref$filters = _ref.filters,
39
40
  filters = _ref$filters === void 0 ? utilities.EMPTY_ARRAY : _ref$filters,
@@ -137,6 +138,7 @@ var SearchBar = function SearchBar(_ref) {
137
138
  }), prepend, /*#__PURE__*/jsxRuntime.jsx(form.AutoComplete, {
138
139
  allowClear: true,
139
140
  expandOnEdit: true,
141
+ ref: ref,
140
142
  multiple: multiple,
141
143
  history: history,
142
144
  value: state.query,
@@ -32,6 +32,8 @@ var FIELD_TYPE = /*#__PURE__*/function (FIELD_TYPE) {
32
32
  FIELD_TYPE["NUMBER"] = "NUMBER";
33
33
  FIELD_TYPE["DECIMAL"] = "DECIMAL";
34
34
  FIELD_TYPE["BOOLEAN"] = "BOOLEAN";
35
+ FIELD_TYPE["DATE"] = "DATE";
36
+ FIELD_TYPE["DATETIME"] = "DATETIME";
35
37
  FIELD_TYPE["NONE"] = "NONE";
36
38
  return FIELD_TYPE;
37
39
  }({});
@@ -39,6 +41,7 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
39
41
  OPERATOR["EXISTS"] = "EXISTS";
40
42
  OPERATOR["IS"] = "IS";
41
43
  OPERATOR["IN"] = "IN";
44
+ OPERATOR["EQ"] = "EQ";
42
45
  OPERATOR["LT"] = "LT";
43
46
  OPERATOR["GT"] = "GT";
44
47
  OPERATOR["LTE"] = "LTE";
@@ -54,12 +57,15 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
54
57
  /**
55
58
  * @internal
56
59
  */
57
- var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FIELD_TYPE.ID, [OPERATOR.IS, OPERATOR.IN]), FIELD_TYPE.STRING, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.IN, OPERATOR.INCLUDES, OPERATOR.STARTS, OPERATOR.ENDS]), FIELD_TYPE.NUMBER, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.DECIMAL, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.BOOLEAN, [OPERATOR.EXISTS, OPERATOR.IS]), FIELD_TYPE.NONE, [OPERATOR.EXISTS]);
60
+ var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FIELD_TYPE.ID, [OPERATOR.IS, OPERATOR.IN]), FIELD_TYPE.STRING, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.IN, OPERATOR.INCLUDES, OPERATOR.STARTS, OPERATOR.ENDS]), FIELD_TYPE.NUMBER, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.DECIMAL, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.BOOLEAN, [OPERATOR.EXISTS, OPERATOR.EQ]), FIELD_TYPE.DATE, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.DATETIME, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.NONE, [OPERATOR.EXISTS]);
58
61
 
59
62
  /**
60
63
  * @internal
64
+ * 0 single value
65
+ * 1 many values
66
+ * 2 two values
61
67
  */
62
- (_OperatorValueType = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.EXISTS, 0), OPERATOR.IS, 0), OPERATOR.IN, 1), OPERATOR.BETWEEN, 2), OPERATOR.WITHIN, 0), OPERATOR.STARTS, 0), OPERATOR.ENDS, 0), OPERATOR.INCLUDES, 0), OPERATOR.LT, 0), OPERATOR.GT, 0), _defineProperty(_defineProperty(_OperatorValueType, OPERATOR.LTE, 0), OPERATOR.GTE, 0));
68
+ (_OperatorValueType = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.EXISTS, 0), OPERATOR.IS, 0), OPERATOR.IN, 1), OPERATOR.BETWEEN, 2), OPERATOR.WITHIN, 0), OPERATOR.STARTS, 0), OPERATOR.ENDS, 0), OPERATOR.INCLUDES, 0), OPERATOR.EQ, 0), OPERATOR.LT, 0), _defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.GT, 0), OPERATOR.LTE, 0), OPERATOR.GTE, 0));
63
69
 
64
70
  /**
65
71
  * @internal
@@ -19,7 +19,9 @@ var FilterBar = function FilterBar(_ref) {
19
19
  filters = _ref$filters === void 0 ? [] : _ref$filters,
20
20
  allowAdd = _ref.allowAdd,
21
21
  fields = _ref.fields,
22
+ editable = _ref.editable,
22
23
  querySchema = _ref.querySchema,
24
+ queryLanguage = _ref.queryLanguage,
23
25
  defaultQuery = _ref.defaultQuery,
24
26
  includedColor = _ref.includedColor,
25
27
  excludedColor = _ref.excludedColor,
@@ -48,9 +50,9 @@ var FilterBar = function FilterBar(_ref) {
48
50
  if (type === "disableAll") filter.disabled = true;
49
51
  if (type === "enableAll") filter.disabled = false;
50
52
  if (type === "toggleDisable") filter.disabled = !filter.disabled;
51
- if (type === "excludeAll") filter.negate = true;
52
- if (type === "includeAll") filter.negate = false;
53
- if (type === "invertAll") filter.negate = !filter.negate;
53
+ if (type === "excludeAll" && filter.field) filter.negate = true;
54
+ if (type === "includeAll" && filter.field) filter.negate = false;
55
+ if (type === "invertAll" && filter.field) filter.negate = !filter.negate;
54
56
  return _objectSpread({}, filter);
55
57
  })));
56
58
  }
@@ -67,8 +69,8 @@ var FilterBar = function FilterBar(_ref) {
67
69
  filters.forEach(function (filter) {
68
70
  if (filter.disabled && filter.canDisable !== false && !key.someDisabled) key.someDisabled = true;
69
71
  if (!filter.disabled && filter.canDisable !== false && !key.someEnabled) key.someEnabled = true;
70
- if (filter.negate && filter.canInvert !== false && !key.someExcluded) key.someExcluded = true;
71
- if (!filter.negate && filter.canInvert !== false && !key.someIncluded) key.someIncluded = true;
72
+ if (filter.field && filter.negate && filter.canInvert !== false && !key.someExcluded) key.someExcluded = true;
73
+ if (filter.field && !filter.negate && filter.canInvert !== false && !key.someIncluded) key.someIncluded = true;
72
74
  if (!filter.required && !key.canRemoveAll) key.canRemoveAll = true;
73
75
  });
74
76
  return key;
@@ -77,6 +79,7 @@ var FilterBar = function FilterBar(_ref) {
77
79
  value: {
78
80
  defaultQuery: defaultQuery,
79
81
  querySchema: querySchema,
82
+ queryLanguage: queryLanguage,
80
83
  fields: fields
81
84
  },
82
85
  children: /*#__PURE__*/jsxs("div", {
@@ -122,6 +125,7 @@ var FilterBar = function FilterBar(_ref) {
122
125
  }), filters === null || filters === void 0 ? void 0 : filters.map(function (filter, idx) {
123
126
  return /*#__PURE__*/jsx(FilterTag, {
124
127
  filter: filter,
128
+ editable: editable,
125
129
  includedColor: includedColor,
126
130
  excludedColor: excludedColor,
127
131
  onRemove: function onRemove() {
@@ -4,7 +4,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
4
4
  import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
5
5
  import { useFloatingTree } from '@floating-ui/react';
6
6
  import { Row, Col, Button } from '@react-fabric/core';
7
- import { Field, Controller, Switch, Select, Input, Number, Form } from '@react-fabric/form';
7
+ import { Field, Controller, Switch, Select, Input, Number, DateInput, Form } from '@react-fabric/form';
8
8
  import { yup, shortHash, isArray } from '@react-fabric/utilities';
9
9
  import { useRef, useState, useEffect, useMemo, useCallback } from 'react';
10
10
  import { useTranslation } from 'react-i18next';
@@ -39,6 +39,30 @@ var FilterSchema = new yup.ObjectSchema({
39
39
  }
40
40
  });
41
41
  }
42
+ }).when("operator", {
43
+ is: OPERATOR.BETWEEN,
44
+ then: function then(schema) {
45
+ return schema.test({
46
+ name: "array-check",
47
+ message: "${path} is a required field",
48
+ test: function test() {
49
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
50
+ return (val === null || val === void 0 ? void 0 : val.length) > 0 && val[0] && val[1];
51
+ }
52
+ });
53
+ }
54
+ }).when("operator", {
55
+ is: OPERATOR.BETWEEN,
56
+ then: function then(schema) {
57
+ return schema.test({
58
+ name: "array-check",
59
+ message: "${path} min max",
60
+ test: function test() {
61
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
62
+ return (val === null || val === void 0 ? void 0 : val.length) > 0 && val[0] < val[1];
63
+ }
64
+ });
65
+ }
42
66
  })
43
67
  });
44
68
  var FilterForm = function FilterForm(_ref) {
@@ -102,7 +126,7 @@ var FilterForm = function FilterForm(_ref) {
102
126
  isArray(values.value) && ((_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setValue("value", undefined));
103
127
  }
104
128
  }
105
- if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.NUMBER || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DECIMAL) {
129
+ if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATE || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATETIME || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.NUMBER || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DECIMAL) {
106
130
  if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
107
131
  var _formRef$current7;
108
132
  !isArray(values.value) && ((_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setValue("value", []));
@@ -111,7 +135,7 @@ var FilterForm = function FilterForm(_ref) {
111
135
  isArray(values.value) && ((_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setValue("value", undefined));
112
136
  }
113
137
  }
114
- if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.BOOLEAN && (values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.IS && (values === null || values === void 0 ? void 0 : values.value) === undefined) {
138
+ if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.BOOLEAN && [OPERATOR.IS, OPERATOR.EQ].includes(values === null || values === void 0 ? void 0 : values.operator) && (values === null || values === void 0 ? void 0 : values.value) === undefined) {
115
139
  var _formRef$current9;
116
140
  (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 || _formRef$current9.setValue("value", false);
117
141
  }
@@ -169,24 +193,27 @@ var FilterForm = function FilterForm(_ref) {
169
193
  if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DECIMAL || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.NUMBER) {
170
194
  var step = field.type === FIELD_TYPE.DECIMAL ? 0.1 : 1;
171
195
  if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
172
- return /*#__PURE__*/jsxs(Field, {
173
- label: t("label.value"),
174
- children: [/*#__PURE__*/jsx(Controller, {
175
- name: "value[0]",
176
- children: /*#__PURE__*/jsx(Number, {
177
- step: step,
178
- allowClear: true
179
- })
180
- }), /*#__PURE__*/jsx("span", {
181
- className: "p-2 text-muted",
182
- children: "\u2277"
183
- }), /*#__PURE__*/jsx(Controller, {
184
- name: "value[1]",
185
- children: /*#__PURE__*/jsx(Number, {
186
- step: step,
187
- allowClear: true
188
- })
189
- })]
196
+ return /*#__PURE__*/jsx(Controller, {
197
+ name: "value",
198
+ children: /*#__PURE__*/jsxs(Field, {
199
+ label: t("label.value"),
200
+ children: [/*#__PURE__*/jsx(Controller, {
201
+ name: "value[0]",
202
+ children: /*#__PURE__*/jsx(Number, {
203
+ step: step,
204
+ allowClear: true
205
+ })
206
+ }), /*#__PURE__*/jsx("span", {
207
+ className: "p-2 text-muted",
208
+ children: "\u2277"
209
+ }), /*#__PURE__*/jsx(Controller, {
210
+ name: "value[1]",
211
+ children: /*#__PURE__*/jsx(Number, {
212
+ step: step,
213
+ allowClear: true
214
+ })
215
+ })]
216
+ })
190
217
  });
191
218
  } else {
192
219
  return /*#__PURE__*/jsx(Controller, {
@@ -199,6 +226,41 @@ var FilterForm = function FilterForm(_ref) {
199
226
  });
200
227
  }
201
228
  }
229
+ if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATE || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATETIME) {
230
+ var type = field.type === FIELD_TYPE.DATETIME ? "datetime" : "date";
231
+ if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
232
+ return /*#__PURE__*/jsx(Controller, {
233
+ name: "value",
234
+ children: /*#__PURE__*/jsxs(Field, {
235
+ label: t("label.value"),
236
+ children: [/*#__PURE__*/jsx(Controller, {
237
+ name: "value[0]",
238
+ children: /*#__PURE__*/jsx(DateInput, {
239
+ type: type,
240
+ allowClear: true
241
+ })
242
+ }), /*#__PURE__*/jsx("span", {
243
+ className: "p-2 text-muted",
244
+ children: "\u2277"
245
+ }), /*#__PURE__*/jsx(Controller, {
246
+ name: "value[1]",
247
+ children: /*#__PURE__*/jsx(DateInput, {
248
+ type: type,
249
+ allowClear: true
250
+ })
251
+ })]
252
+ })
253
+ });
254
+ } else {
255
+ return /*#__PURE__*/jsx(Controller, {
256
+ name: "value",
257
+ children: /*#__PURE__*/jsx(DateInput, {
258
+ type: type,
259
+ allowClear: true
260
+ })
261
+ });
262
+ }
263
+ }
202
264
  }, [field, values === null || values === void 0 ? void 0 : values.operator]);
203
265
  var handleSubmit = useCallback(function (model) {
204
266
  var filter = {
@@ -14,7 +14,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
14
14
  var FilterMenu = function FilterMenu(_ref) {
15
15
  var filter = _ref.filter;
16
16
  _ref.fields;
17
- var onChange = _ref.onChange,
17
+ var editable = _ref.editable,
18
+ onChange = _ref.onChange,
18
19
  onRemove = _ref.onRemove;
19
20
  var _useTranslation = useTranslation("searchbar"),
20
21
  t = _useTranslation.t;
@@ -31,7 +32,7 @@ var FilterMenu = function FilterMenu(_ref) {
31
32
  onRemove: onRemove
32
33
  }) : /*#__PURE__*/jsxs(Menu, {
33
34
  className: "text-sm",
34
- children: [filter.canEdit !== false ? /*#__PURE__*/jsx(MenuItem, {
35
+ children: [editable && filter.canEdit !== false ? /*#__PURE__*/jsx(MenuItem, {
35
36
  icon: CoreIcons.edit,
36
37
  label: t("label.edit"),
37
38
  "data-dropdown-dismiss": "false",
@@ -52,7 +53,7 @@ var FilterMenu = function FilterMenu(_ref) {
52
53
  pinned: !filter.pinned
53
54
  }));
54
55
  }
55
- }), filter.canInvert !== false && /*#__PURE__*/jsx(MenuItem, {
56
+ }), filter.canInvert !== false && filter.field && /*#__PURE__*/jsx(MenuItem, {
56
57
  label: t(filter.negate ? "label.include" : "label.exclude"),
57
58
  onClick: function onClick() {
58
59
  return onChange(_objectSpread(_objectSpread({}, filter), {}, {
@@ -15,6 +15,7 @@ var FilterTag = function FilterTag(_ref) {
15
15
  var _filter$icon;
16
16
  var filter = _ref.filter,
17
17
  fields = _ref.fields,
18
+ editable = _ref.editable,
18
19
  _ref$includedColor = _ref.includedColor,
19
20
  includedColor = _ref$includedColor === void 0 ? "primary-500" : _ref$includedColor,
20
21
  _ref$excludedColor = _ref.excludedColor,
@@ -26,7 +27,7 @@ var FilterTag = function FilterTag(_ref) {
26
27
  var label = useMemo(function () {
27
28
  var _filter$value;
28
29
  if (filter.label) return /*#__PURE__*/jsxs(Fragment, {
29
- children: [filter.negate && /*#__PURE__*/jsx("span", {
30
+ children: [filter.field && filter.negate && /*#__PURE__*/jsx("span", {
30
31
  className: "font-semibold",
31
32
  children: "NOT"
32
33
  }), /*#__PURE__*/jsx("span", {
@@ -34,7 +35,7 @@ var FilterTag = function FilterTag(_ref) {
34
35
  })]
35
36
  });
36
37
  return /*#__PURE__*/jsxs(Fragment, {
37
- children: [filter.negate && /*#__PURE__*/jsx("span", {
38
+ children: [filter.field && filter.negate && /*#__PURE__*/jsx("span", {
38
39
  className: "font-semibold",
39
40
  children: "NOT"
40
41
  }), /*#__PURE__*/jsx("span", {
@@ -52,7 +53,7 @@ var FilterTag = function FilterTag(_ref) {
52
53
  }, [filter]);
53
54
  var color = useMemo(function () {
54
55
  var _filter$color;
55
- return (_filter$color = filter.color) !== null && _filter$color !== void 0 ? _filter$color : filter.negate ? excludedColor : includedColor;
56
+ return (_filter$color = filter.color) !== null && _filter$color !== void 0 ? _filter$color : filter.field && filter.negate ? excludedColor : includedColor;
56
57
  }, [filter, includedColor, excludedColor]);
57
58
  var icon = useMemo(function () {
58
59
  if (filter.canDisable === false) return undefined;
@@ -88,6 +89,7 @@ var FilterTag = function FilterTag(_ref) {
88
89
  }), /*#__PURE__*/jsx(FilterMenu, {
89
90
  filter: filter,
90
91
  fields: fields,
92
+ editable: editable,
91
93
  onChange: onChange,
92
94
  onRemove: onRemove
93
95
  })]
@@ -37,7 +37,8 @@ var QueryForm = function QueryForm(_ref) {
37
37
  var _useFilterContext = useFilterContext(),
38
38
  _useFilterContext$def = _useFilterContext.defaultQuery,
39
39
  defaultQuery = _useFilterContext$def === void 0 ? "" : _useFilterContext$def,
40
- querySchema = _useFilterContext.querySchema;
40
+ querySchema = _useFilterContext.querySchema,
41
+ queryLanguage = _useFilterContext.queryLanguage;
41
42
  var inputRef = useRef(null);
42
43
  var filterValue = useMemo(function () {
43
44
  var _filter$query;
@@ -101,7 +102,7 @@ var QueryForm = function QueryForm(_ref) {
101
102
  gridTemplate: '"content" 1fr/1fr'
102
103
  },
103
104
  children: /*#__PURE__*/jsx(CodeEditor, _objectSpread(_objectSpread({
104
- language: "json",
105
+ language: queryLanguage !== null && queryLanguage !== void 0 ? queryLanguage : "text",
105
106
  minimal: true,
106
107
  required: true
107
108
  }, field), {}, {
@@ -39,6 +39,7 @@ var operator = {
39
39
  EXISTS: "Exists",
40
40
  IS: "Is",
41
41
  IN: "In",
42
+ EQ: "=",
42
43
  LT: "<",
43
44
  GT: ">",
44
45
  LTE: "≤",