@react-fabric/searchbar 1.0.0-beta.51 → 1.0.0-beta.52

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.
@@ -28,7 +28,19 @@ var FilterSchema = new utilities.yup.ObjectSchema({
28
28
  return schema.required();
29
29
  }
30
30
  }).when("operator", {
31
- is: index.OPERATOR.IN,
31
+ is: index.OPERATOR.ANY,
32
+ then: function then(schema) {
33
+ return schema.test({
34
+ name: "array-check",
35
+ message: "${path} is a required field",
36
+ test: function test() {
37
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
38
+ return (val === null || val === void 0 ? void 0 : val.length) > 0;
39
+ }
40
+ });
41
+ }
42
+ }).when("operator", {
43
+ is: index.OPERATOR.ALL,
32
44
  then: function then(schema) {
33
45
  return schema.test({
34
46
  name: "array-check",
@@ -118,7 +130,7 @@ var FilterForm = function FilterForm(_ref) {
118
130
  (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.setValue("value", undefined);
119
131
  }
120
132
  if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.STRING) {
121
- if ((values === null || values === void 0 ? void 0 : values.operator) === index.OPERATOR.IN) {
133
+ if ([index.OPERATOR.ALL, index.OPERATOR.ANY].includes(values === null || values === void 0 ? void 0 : values.operator)) {
122
134
  var _formRef$current5;
123
135
  !utilities.isArray(values.value) && ((_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setValue("value", []));
124
136
  } else {
@@ -153,7 +165,7 @@ var FilterForm = function FilterForm(_ref) {
153
165
  }
154
166
  if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.STRING || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.ID) {
155
167
  var _field$values2;
156
- if ((values === null || values === void 0 ? void 0 : values.operator) === index.OPERATOR.IN) {
168
+ if ([index.OPERATOR.ALL, index.OPERATOR.ANY].includes(values === null || values === void 0 ? void 0 : values.operator)) {
157
169
  var _field$values;
158
170
  return /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
159
171
  name: "value",
@@ -5,12 +5,15 @@ var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
5
5
  var core = require('@react-fabric/core');
6
6
  var react = require('react');
7
7
  var reactI18next = require('react-i18next');
8
+ var index = require('../types/index.js');
8
9
  var FilterEdit = require('./FilterEdit.js');
9
10
  var FilterView = require('./FilterView.js');
10
11
  var jsxRuntime = require('react/jsx-runtime');
11
12
 
12
13
  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; }
13
14
  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; }
15
+ var MATCH_ALL = "M9,5C10.04,5 11.06,5.24 12,5.68C12.94,5.24 13.96,5 15,5A7,7 0 0,1 22,12A7,7 0 0,1 15,19C13.96,19 12.94,18.76 12,18.32C11.06,18.76 10.04,19 9,19A7,7 0 0,1 2,12A7,7 0 0,1 9,5M8.5,12C8.5,13.87 9.29,15.56 10.56,16.75L11.56,16.29C10.31,15.29 9.5,13.74 9.5,12C9.5,10.26 10.31,8.71 11.56,7.71L10.56,7.25C9.29,8.44 8.5,10.13 8.5,12M15.5,12C15.5,10.13 14.71,8.44 13.44,7.25L12.44,7.71C13.69,8.71 14.5,10.26 14.5,12C14.5,13.74 13.69,15.29 12.44,16.29L13.44,16.75C14.71,15.56 15.5,13.87 15.5,12Z";
16
+ var MATCH_ANY = "M9,5A7,7 0 0,0 2,12A7,7 0 0,0 9,19C10.04,19 11.06,18.76 12,18.32C12.94,18.76 13.96,19 15,19A7,7 0 0,0 22,12A7,7 0 0,0 15,5C13.96,5 12.94,5.24 12,5.68C11.06,5.24 10.04,5 9,5M9,7C9.34,7 9.67,7.03 10,7.1C8.72,8.41 8,10.17 8,12C8,13.83 8.72,15.59 10,16.89C9.67,16.96 9.34,17 9,17A5,5 0 0,1 4,12A5,5 0 0,1 9,7M15,7A5,5 0 0,1 20,12A5,5 0 0,1 15,17C14.66,17 14.33,16.97 14,16.9C15.28,15.59 16,13.83 16,12C16,10.17 15.28,8.41 14,7.11C14.33,7.04 14.66,7 15,7Z";
14
17
  var FilterMenu = function FilterMenu(_ref) {
15
18
  var filter = _ref.filter;
16
19
  _ref.fields;
@@ -46,7 +49,15 @@ var FilterMenu = function FilterMenu(_ref) {
46
49
  onClick: function onClick() {
47
50
  setView("view");
48
51
  }
49
- }), /*#__PURE__*/jsxRuntime.jsx(core.Divider, {}), filter.canPin !== false && /*#__PURE__*/jsxRuntime.jsx(core.MenuItem, {
52
+ }), /*#__PURE__*/jsxRuntime.jsx(core.Divider, {}), filter.operator && [index.OPERATOR.ALL, index.OPERATOR.ANY].includes(filter.operator) && /*#__PURE__*/jsxRuntime.jsx(core.MenuItem, {
53
+ label: t(filter.operator === index.OPERATOR.ALL ? "label.matchAny" : "label.matchAll"),
54
+ icon: t(filter.operator === index.OPERATOR.ALL ? MATCH_ANY : MATCH_ALL),
55
+ onClick: function onClick() {
56
+ return onChange(_objectSpread(_objectSpread({}, filter), {}, {
57
+ operator: filter.operator === index.OPERATOR.ALL ? index.OPERATOR.ANY : index.OPERATOR.ALL
58
+ }));
59
+ }
60
+ }), filter.canPin !== false && /*#__PURE__*/jsxRuntime.jsx(core.MenuItem, {
50
61
  label: t(filter.pinned ? "label.unpin" : "label.pin"),
51
62
  onClick: function onClick() {
52
63
  return onChange(_objectSpread(_objectSpread({}, filter), {}, {
@@ -45,10 +45,14 @@ var FilterView = function FilterView(_ref) {
45
45
  var _filter$value2;
46
46
  value = "[".concat((_filter$value2 = filter.value) === null || _filter$value2 === void 0 ? void 0 : _filter$value2.join(" - "), "]");
47
47
  }
48
- if (filter.operator === index.OPERATOR.IN && utilities.isArray(filter.value)) {
48
+ if (filter.operator === index.OPERATOR.ANY && utilities.isArray(filter.value)) {
49
49
  var _filter$value3;
50
50
  value = "[".concat((_filter$value3 = filter.value) === null || _filter$value3 === void 0 ? void 0 : _filter$value3.join(", "), "]");
51
51
  }
52
+ if (filter.operator === index.OPERATOR.ALL && utilities.isArray(filter.value)) {
53
+ var _filter$value4;
54
+ value = "(".concat((_filter$value4 = filter.value) === null || _filter$value4 === void 0 ? void 0 : _filter$value4.join(", "), ")");
55
+ }
52
56
  return /*#__PURE__*/jsxRuntime.jsxs(react.Fragment, {
53
57
  children: [filter.negate && /*#__PURE__*/jsxRuntime.jsx("b", {
54
58
  children: "NOT\xA0"
@@ -3,70 +3,73 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var label = {
6
- filters: "المرشحات",
6
+ add: "إضافة عامل تصفية",
7
7
  all_filters: "جميع المرشحات",
8
+ apply: "يتقدم",
9
+ basicFilter: "الفلتر الأساسي",
10
+ cancel: "يلغي",
11
+ customQuery: "استعلام مخصص",
12
+ "delete": "يمسح",
13
+ disable: "إبطال",
14
+ disableAll: "تعطيل الكل",
15
+ edit: "يحرر",
16
+ enable: "يُمكَِن",
17
+ enableAll: "تمكين الكل",
18
+ exclude: "استبعاد",
19
+ excludeAll: "استبعاد الكل",
8
20
  field: "مجال",
9
- operator: "المشغل",
10
- value: "قيمة",
21
+ filters: "المرشحات",
22
+ forAdvanced: "للمستخدمين المتقدمين فقط!",
23
+ include: "يشمل",
24
+ includeAll: "تضمين الكل",
25
+ invertAll: "عكس التضمين/الاستبعاد",
11
26
  label: "ملصق",
27
+ operator: "المشغل",
12
28
  optional: "خياري",
13
- add: "إضافة عامل تصفية",
14
- edit: "يحرر",
15
- view: "منظر",
16
29
  pin: "مثبت",
17
- unpin: "غير مثبت",
18
- includeAll: "تضمين الكل",
19
- excludeAll: "استبعاد الكل",
20
- invertAll: "عكس التضمين/الاستبعاد",
30
+ query: "استفسار",
31
+ refresh: "ينعش",
32
+ remove: "يزيل",
21
33
  removeAll: "إزالة الكل",
22
- enableAll: "تمكين الكل",
23
- disableAll: "تعطيل الكل",
24
34
  toggleDisable: "عكس تعطيل/تمكين",
25
- remove: "يزيل",
26
- enable: "يُمكَِن",
27
- disable: "إبطال",
28
- exclude: "استبعاد",
29
- include: "يشمل",
30
- refresh: "ينعش",
35
+ unpin: "غير مثبت",
31
36
  update: "تحديث",
32
- query: "استفسار",
33
- apply: "يتقدم",
34
- cancel: "يلغي",
35
- "delete": "يمسح",
36
- basicFilter: "الفلتر الأساسي",
37
- customQuery: "استعلام مخصص",
38
- forAdvanced: "للمستخدمين المتقدمين فقط!"
37
+ value: "قيمة",
38
+ view: "منظر",
39
+ matchAll: "تطابق كل شيء",
40
+ matchAny: "تطابق أي"
39
41
  };
40
42
  var operator = {
43
+ ALL: "كل",
44
+ ANY: "أي من",
45
+ BETWEEN: "بين هذا وذاك",
46
+ ENDS: "ينتهي مع",
41
47
  EXISTS: "موجود",
48
+ GT: ">",
49
+ GTE: "≥",
42
50
  IS: "يكون",
43
- IN: "في",
51
+ LIKE: "يحب",
44
52
  LT: "<",
45
- GT: ">",
46
53
  LTE: "≤",
47
- GTE: "≥",
48
- INCLUDES: "يشمل",
49
54
  STARTS: "ابدا ب",
50
- ENDS: "ينتهي مع",
51
- WITHIN: "في غضون",
52
- BETWEEN: "بين هذا وذاك"
55
+ WITHIN: "في غضون"
53
56
  };
54
57
  var placeholder = "مصطلح البحث...";
55
58
  var type = {
56
- STRING: "سلسلة",
57
- NUMBER: "كثافة العمليات",
58
- DECIMAL: "يطفو",
59
59
  BOOLEAN: "رقم",
60
60
  DATE: "منطقي",
61
61
  DATETIME: "تاريخ",
62
- GEO: "GeoJSON"
62
+ DECIMAL: "يطفو",
63
+ GEO: "GeoJSON",
64
+ NUMBER: "كثافة العمليات",
65
+ STRING: "سلسلة"
63
66
  };
64
67
  var validate = {
68
+ compare: "مقارنة الحقل المطلوب",
65
69
  field: "حقل مطلوب",
70
+ label: "التصنيف مطلوب",
66
71
  operator: "عامل مطلوب",
67
- value: "القيمة المطلوبة",
68
- compare: "مقارنة الحقل المطلوب",
69
- label: "التصنيف مطلوب"
72
+ value: "القيمة المطلوبة"
70
73
  };
71
74
  var ar = {
72
75
  label: label,
@@ -3,71 +3,74 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var label = {
6
- filters: "Filters",
6
+ add: "Add Filter",
7
7
  all_filters: "All Filters",
8
+ apply: "Apply",
9
+ basicFilter: "Basic Filter",
10
+ cancel: "Cancel",
11
+ customQuery: "Custom Query",
12
+ "delete": "Delete",
13
+ disable: "Disable",
14
+ disableAll: "Disable All",
15
+ edit: "Edit",
16
+ enable: "Enable",
17
+ enableAll: "Enable All",
18
+ exclude: "Exclude",
19
+ excludeAll: "Exclude All",
8
20
  field: "Field",
9
- operator: "Operator",
10
- value: "Value",
21
+ filters: "Filters",
22
+ forAdvanced: "For advanced users only!",
23
+ include: "Include",
24
+ includeAll: "Include All",
25
+ invertAll: "Invert Include/Exclude",
11
26
  label: "Label",
27
+ matchAll: "Match All",
28
+ matchAny: "Match Any",
29
+ operator: "Operator",
12
30
  optional: "Optional",
13
- add: "Add Filter",
14
- edit: "Edit",
15
- view: "View",
16
31
  pin: "Pinned",
17
- unpin: "Unpinned",
18
- includeAll: "Include All",
19
- excludeAll: "Exclude All",
20
- invertAll: "Invert Include/Exclude",
32
+ query: "Query",
33
+ refresh: "Refresh",
34
+ remove: "Remove",
21
35
  removeAll: "Remove All",
22
- enableAll: "Enable All",
23
- disableAll: "Disable All",
24
36
  toggleDisable: "Invert Disable/Enable",
25
- remove: "Remove",
26
- enable: "Enable",
27
- disable: "Disable",
28
- exclude: "Exclude",
29
- include: "Include",
30
- refresh: "Refresh",
37
+ unpin: "Unpinned",
31
38
  update: "Update",
32
- query: "Query",
33
- apply: "Apply",
34
- cancel: "Cancel",
35
- "delete": "Delete",
36
- basicFilter: "Basic Filter",
37
- customQuery: "Custom Query",
38
- forAdvanced: "For advanced users only!"
39
+ value: "Value",
40
+ view: "View"
39
41
  };
40
42
  var operator = {
43
+ ALL: "All of",
44
+ ANY: "Any of",
45
+ BETWEEN: "Between",
46
+ ENDS: "Ends with",
47
+ EQ: "=",
41
48
  EXISTS: "Exists",
49
+ GT: ">",
50
+ GTE: "≥",
42
51
  IS: "Is",
43
- IN: "In",
44
- EQ: "=",
52
+ LIKE: "Like",
45
53
  LT: "<",
46
- GT: ">",
47
54
  LTE: "≤",
48
- GTE: "≥",
49
- INCLUDES: "Includes",
50
55
  STARTS: "Starts with",
51
- ENDS: "Ends with",
52
- WITHIN: "Within",
53
- BETWEEN: "Between"
56
+ WITHIN: "Within"
54
57
  };
55
58
  var placeholder = "Search term...";
56
59
  var type = {
57
- STRING: "String",
58
- NUMBER: "Number",
59
- DECIMAL: "Decimal",
60
60
  BOOLEAN: "Bool",
61
61
  DATE: "Date",
62
62
  DATETIME: "Date Time",
63
- GEO: "GeoJSON"
63
+ DECIMAL: "Decimal",
64
+ GEO: "GeoJSON",
65
+ NUMBER: "Number",
66
+ STRING: "String"
64
67
  };
65
68
  var validate = {
69
+ compare: "Compare field required",
66
70
  field: "Field required",
71
+ label: "Label required",
67
72
  operator: "Operator required",
68
- value: "Value required",
69
- compare: "Compare field required",
70
- label: "Label required"
73
+ value: "Value required"
71
74
  };
72
75
  var en = {
73
76
  label: label,
@@ -15,6 +15,40 @@ var jsxRuntime = require('react/jsx-runtime');
15
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
+ /**
19
+ * This component provides a search input with autocomplete functionality,
20
+ * a button to trigger search, and an optional filter bar.
21
+ * It supports history of search queries, multiple selection, and custom decorations.
22
+ * It can be collapsed to hide filters and has options for customization.
23
+ *
24
+ * @param {SearchBarProps} props - The properties for the SearchBar component.
25
+ * @returns {JSX.Element} The rendered SearchBar component.
26
+ *
27
+ * @example
28
+ * ```jsx
29
+ * <SearchBar
30
+ * historyKey="myApp:searchHistory"
31
+ * historyCount={10}
32
+ * defaultQueryList={["example", "test"]}
33
+ * prepend={<span>Prepend</span>}
34
+ * append={<span>Append</span>}
35
+ * decorateEnd={<span>End Decoration</span>}
36
+ * decorateStart={<span>Start Decoration</span>}
37
+ * hideFilters={false}
38
+ * defaultCollapsed={false}
39
+ * disabled={false}
40
+ * onCollapsed={(collapsed) => console.log("Collapsed:", collapsed)}
41
+ * onQuery={(query) => console.log("Query:", query)}
42
+ * onSearch={({ query, filters }) => console.log("Search:", query, filters)}
43
+ * query={""}
44
+ * ref={searchInputRef}
45
+ * multiple={false}
46
+ * filters={[{ name: "filter1", value: "value1" }]}
47
+ * />
48
+ * ```
49
+ *
50
+ * @see {@link https://adarshpastakia.github.io/react-fabric/?path=/story/searchbar-searchbar--search-bar} for more details on the properties.
51
+ */
18
52
  var SearchBar = function SearchBar(_ref) {
19
53
  var _ref$historyKey = _ref.historyKey,
20
54
  historyKey = _ref$historyKey === void 0 ? "ruf:search" : _ref$historyKey,
@@ -41,13 +41,14 @@ var FIELD_TYPE = /*#__PURE__*/function (FIELD_TYPE) {
41
41
  var OPERATOR = /*#__PURE__*/function (OPERATOR) {
42
42
  OPERATOR["EXISTS"] = "EXISTS";
43
43
  OPERATOR["IS"] = "IS";
44
- OPERATOR["IN"] = "IN";
44
+ OPERATOR["ALL"] = "ALL";
45
+ OPERATOR["ANY"] = "ANY";
45
46
  OPERATOR["EQ"] = "EQ";
46
47
  OPERATOR["LT"] = "LT";
47
48
  OPERATOR["GT"] = "GT";
48
49
  OPERATOR["LTE"] = "LTE";
49
50
  OPERATOR["GTE"] = "GTE";
50
- OPERATOR["INCLUDES"] = "INCLUDES";
51
+ OPERATOR["LIKE"] = "LIKE";
51
52
  OPERATOR["STARTS"] = "STARTS";
52
53
  OPERATOR["ENDS"] = "ENDS";
53
54
  OPERATOR["WITHIN"] = "WITHIN";
@@ -58,7 +59,7 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
58
59
  /**
59
60
  * @internal
60
61
  */
61
- var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FIELD_TYPE.ID, [OPERATOR.IS, OPERATOR.IN]), FIELD_TYPE.STRING, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.IN]), FIELD_TYPE.TEXT, [OPERATOR.EXISTS, 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]);
62
+ var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FIELD_TYPE.ID, [OPERATOR.IS, OPERATOR.ANY]), FIELD_TYPE.STRING, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.ANY, OPERATOR.ALL]), FIELD_TYPE.TEXT, [OPERATOR.EXISTS, OPERATOR.LIKE, 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]);
62
63
 
63
64
  /**
64
65
  * @internal
@@ -66,7 +67,7 @@ var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_definePrope
66
67
  * 1 many values
67
68
  * 2 two values
68
69
  */
69
- (_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));
70
+ (_OperatorValueType = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.EXISTS, 0), OPERATOR.IS, 0), OPERATOR.ANY, 1), OPERATOR.ALL, 1), OPERATOR.BETWEEN, 2), OPERATOR.WITHIN, 0), OPERATOR.STARTS, 0), OPERATOR.ENDS, 0), OPERATOR.LIKE, 0), OPERATOR.EQ, 0), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.LT, 0), OPERATOR.GT, 0), OPERATOR.LTE, 0), OPERATOR.GTE, 0));
70
71
 
71
72
  /**
72
73
  * @internal
@@ -28,7 +28,19 @@ var FilterSchema = new yup.ObjectSchema({
28
28
  return schema.required();
29
29
  }
30
30
  }).when("operator", {
31
- is: OPERATOR.IN,
31
+ is: OPERATOR.ANY,
32
+ then: function then(schema) {
33
+ return schema.test({
34
+ name: "array-check",
35
+ message: "${path} is a required field",
36
+ test: function test() {
37
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
38
+ return (val === null || val === void 0 ? void 0 : val.length) > 0;
39
+ }
40
+ });
41
+ }
42
+ }).when("operator", {
43
+ is: OPERATOR.ALL,
32
44
  then: function then(schema) {
33
45
  return schema.test({
34
46
  name: "array-check",
@@ -118,7 +130,7 @@ var FilterForm = function FilterForm(_ref) {
118
130
  (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.setValue("value", undefined);
119
131
  }
120
132
  if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.STRING) {
121
- if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.IN) {
133
+ if ([OPERATOR.ALL, OPERATOR.ANY].includes(values === null || values === void 0 ? void 0 : values.operator)) {
122
134
  var _formRef$current5;
123
135
  !isArray(values.value) && ((_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setValue("value", []));
124
136
  } else {
@@ -153,7 +165,7 @@ var FilterForm = function FilterForm(_ref) {
153
165
  }
154
166
  if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.STRING || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.ID) {
155
167
  var _field$values2;
156
- if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.IN) {
168
+ if ([OPERATOR.ALL, OPERATOR.ANY].includes(values === null || values === void 0 ? void 0 : values.operator)) {
157
169
  var _field$values;
158
170
  return /*#__PURE__*/jsx(Controller, {
159
171
  name: "value",
@@ -5,12 +5,15 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
5
5
  import { Menu, MenuItem, CoreIcons, Divider } from '@react-fabric/core';
6
6
  import { useState } from 'react';
7
7
  import { useTranslation } from 'react-i18next';
8
+ import { OPERATOR } from '../types/index.js';
8
9
  import { FilterEdit } from './FilterEdit.js';
9
10
  import { FilterView } from './FilterView.js';
10
11
  import { jsx, jsxs } from 'react/jsx-runtime';
11
12
 
12
13
  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; }
13
14
  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; }
15
+ var MATCH_ALL = "M9,5C10.04,5 11.06,5.24 12,5.68C12.94,5.24 13.96,5 15,5A7,7 0 0,1 22,12A7,7 0 0,1 15,19C13.96,19 12.94,18.76 12,18.32C11.06,18.76 10.04,19 9,19A7,7 0 0,1 2,12A7,7 0 0,1 9,5M8.5,12C8.5,13.87 9.29,15.56 10.56,16.75L11.56,16.29C10.31,15.29 9.5,13.74 9.5,12C9.5,10.26 10.31,8.71 11.56,7.71L10.56,7.25C9.29,8.44 8.5,10.13 8.5,12M15.5,12C15.5,10.13 14.71,8.44 13.44,7.25L12.44,7.71C13.69,8.71 14.5,10.26 14.5,12C14.5,13.74 13.69,15.29 12.44,16.29L13.44,16.75C14.71,15.56 15.5,13.87 15.5,12Z";
16
+ var MATCH_ANY = "M9,5A7,7 0 0,0 2,12A7,7 0 0,0 9,19C10.04,19 11.06,18.76 12,18.32C12.94,18.76 13.96,19 15,19A7,7 0 0,0 22,12A7,7 0 0,0 15,5C13.96,5 12.94,5.24 12,5.68C11.06,5.24 10.04,5 9,5M9,7C9.34,7 9.67,7.03 10,7.1C8.72,8.41 8,10.17 8,12C8,13.83 8.72,15.59 10,16.89C9.67,16.96 9.34,17 9,17A5,5 0 0,1 4,12A5,5 0 0,1 9,7M15,7A5,5 0 0,1 20,12A5,5 0 0,1 15,17C14.66,17 14.33,16.97 14,16.9C15.28,15.59 16,13.83 16,12C16,10.17 15.28,8.41 14,7.11C14.33,7.04 14.66,7 15,7Z";
14
17
  var FilterMenu = function FilterMenu(_ref) {
15
18
  var filter = _ref.filter;
16
19
  _ref.fields;
@@ -46,7 +49,15 @@ var FilterMenu = function FilterMenu(_ref) {
46
49
  onClick: function onClick() {
47
50
  setView("view");
48
51
  }
49
- }), /*#__PURE__*/jsx(Divider, {}), filter.canPin !== false && /*#__PURE__*/jsx(MenuItem, {
52
+ }), /*#__PURE__*/jsx(Divider, {}), filter.operator && [OPERATOR.ALL, OPERATOR.ANY].includes(filter.operator) && /*#__PURE__*/jsx(MenuItem, {
53
+ label: t(filter.operator === OPERATOR.ALL ? "label.matchAny" : "label.matchAll"),
54
+ icon: t(filter.operator === OPERATOR.ALL ? MATCH_ANY : MATCH_ALL),
55
+ onClick: function onClick() {
56
+ return onChange(_objectSpread(_objectSpread({}, filter), {}, {
57
+ operator: filter.operator === OPERATOR.ALL ? OPERATOR.ANY : OPERATOR.ALL
58
+ }));
59
+ }
60
+ }), filter.canPin !== false && /*#__PURE__*/jsx(MenuItem, {
50
61
  label: t(filter.pinned ? "label.unpin" : "label.pin"),
51
62
  onClick: function onClick() {
52
63
  return onChange(_objectSpread(_objectSpread({}, filter), {}, {
@@ -45,10 +45,14 @@ var FilterView = function FilterView(_ref) {
45
45
  var _filter$value2;
46
46
  value = "[".concat((_filter$value2 = filter.value) === null || _filter$value2 === void 0 ? void 0 : _filter$value2.join(" - "), "]");
47
47
  }
48
- if (filter.operator === OPERATOR.IN && isArray(filter.value)) {
48
+ if (filter.operator === OPERATOR.ANY && isArray(filter.value)) {
49
49
  var _filter$value3;
50
50
  value = "[".concat((_filter$value3 = filter.value) === null || _filter$value3 === void 0 ? void 0 : _filter$value3.join(", "), "]");
51
51
  }
52
+ if (filter.operator === OPERATOR.ALL && isArray(filter.value)) {
53
+ var _filter$value4;
54
+ value = "(".concat((_filter$value4 = filter.value) === null || _filter$value4 === void 0 ? void 0 : _filter$value4.join(", "), ")");
55
+ }
52
56
  return /*#__PURE__*/jsxs(Fragment, {
53
57
  children: [filter.negate && /*#__PURE__*/jsx("b", {
54
58
  children: "NOT\xA0"
@@ -1,70 +1,73 @@
1
1
  'use client';
2
2
 
3
3
  var label = {
4
- filters: "المرشحات",
4
+ add: "إضافة عامل تصفية",
5
5
  all_filters: "جميع المرشحات",
6
+ apply: "يتقدم",
7
+ basicFilter: "الفلتر الأساسي",
8
+ cancel: "يلغي",
9
+ customQuery: "استعلام مخصص",
10
+ "delete": "يمسح",
11
+ disable: "إبطال",
12
+ disableAll: "تعطيل الكل",
13
+ edit: "يحرر",
14
+ enable: "يُمكَِن",
15
+ enableAll: "تمكين الكل",
16
+ exclude: "استبعاد",
17
+ excludeAll: "استبعاد الكل",
6
18
  field: "مجال",
7
- operator: "المشغل",
8
- value: "قيمة",
19
+ filters: "المرشحات",
20
+ forAdvanced: "للمستخدمين المتقدمين فقط!",
21
+ include: "يشمل",
22
+ includeAll: "تضمين الكل",
23
+ invertAll: "عكس التضمين/الاستبعاد",
9
24
  label: "ملصق",
25
+ operator: "المشغل",
10
26
  optional: "خياري",
11
- add: "إضافة عامل تصفية",
12
- edit: "يحرر",
13
- view: "منظر",
14
27
  pin: "مثبت",
15
- unpin: "غير مثبت",
16
- includeAll: "تضمين الكل",
17
- excludeAll: "استبعاد الكل",
18
- invertAll: "عكس التضمين/الاستبعاد",
28
+ query: "استفسار",
29
+ refresh: "ينعش",
30
+ remove: "يزيل",
19
31
  removeAll: "إزالة الكل",
20
- enableAll: "تمكين الكل",
21
- disableAll: "تعطيل الكل",
22
32
  toggleDisable: "عكس تعطيل/تمكين",
23
- remove: "يزيل",
24
- enable: "يُمكَِن",
25
- disable: "إبطال",
26
- exclude: "استبعاد",
27
- include: "يشمل",
28
- refresh: "ينعش",
33
+ unpin: "غير مثبت",
29
34
  update: "تحديث",
30
- query: "استفسار",
31
- apply: "يتقدم",
32
- cancel: "يلغي",
33
- "delete": "يمسح",
34
- basicFilter: "الفلتر الأساسي",
35
- customQuery: "استعلام مخصص",
36
- forAdvanced: "للمستخدمين المتقدمين فقط!"
35
+ value: "قيمة",
36
+ view: "منظر",
37
+ matchAll: "تطابق كل شيء",
38
+ matchAny: "تطابق أي"
37
39
  };
38
40
  var operator = {
41
+ ALL: "كل",
42
+ ANY: "أي من",
43
+ BETWEEN: "بين هذا وذاك",
44
+ ENDS: "ينتهي مع",
39
45
  EXISTS: "موجود",
46
+ GT: ">",
47
+ GTE: "≥",
40
48
  IS: "يكون",
41
- IN: "في",
49
+ LIKE: "يحب",
42
50
  LT: "<",
43
- GT: ">",
44
51
  LTE: "≤",
45
- GTE: "≥",
46
- INCLUDES: "يشمل",
47
52
  STARTS: "ابدا ب",
48
- ENDS: "ينتهي مع",
49
- WITHIN: "في غضون",
50
- BETWEEN: "بين هذا وذاك"
53
+ WITHIN: "في غضون"
51
54
  };
52
55
  var placeholder = "مصطلح البحث...";
53
56
  var type = {
54
- STRING: "سلسلة",
55
- NUMBER: "كثافة العمليات",
56
- DECIMAL: "يطفو",
57
57
  BOOLEAN: "رقم",
58
58
  DATE: "منطقي",
59
59
  DATETIME: "تاريخ",
60
- GEO: "GeoJSON"
60
+ DECIMAL: "يطفو",
61
+ GEO: "GeoJSON",
62
+ NUMBER: "كثافة العمليات",
63
+ STRING: "سلسلة"
61
64
  };
62
65
  var validate = {
66
+ compare: "مقارنة الحقل المطلوب",
63
67
  field: "حقل مطلوب",
68
+ label: "التصنيف مطلوب",
64
69
  operator: "عامل مطلوب",
65
- value: "القيمة المطلوبة",
66
- compare: "مقارنة الحقل المطلوب",
67
- label: "التصنيف مطلوب"
70
+ value: "القيمة المطلوبة"
68
71
  };
69
72
  var ar = {
70
73
  label: label,