@elliemae/ds-query-builder 2.0.0-alpha.9 → 2.0.0-next.12
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.
- package/cjs/DSQueryBuilder.js +60 -56
- package/cjs/components/AndOrController/AndOrController.js +21 -27
- package/cjs/components/ConditionController/ConditionController.js +27 -33
- package/cjs/components/DisplayOutput/DisplayOutput.js +18 -17
- package/cjs/components/DragContainerController/DragContainerController.js +14 -16
- package/cjs/components/DragControllerRow/DragControllerRow.js +10 -6
- package/cjs/components/FieldControllerRow/FieldControllerRow.js +22 -22
- package/cjs/components/Nestable/Nestable.js +27 -13
- package/cjs/components/Nestable/NestableItem.js +21 -13
- package/cjs/components/Nestable/actions/events.js +6 -1
- package/cjs/components/Nestable/actions/getPaths.js +11 -1
- package/cjs/components/Nestable/actions/moveItem.js +12 -5
- package/cjs/components/Nestable/actions/paths.js +15 -3
- package/cjs/components/QueryBuilderImpl.js +6 -1
- package/cjs/components/QueryBuilderItem/QueryBuilderItem.js +28 -20
- package/cjs/components/QueryBuilderRow/QueryBuilderRow.js +45 -30
- package/cjs/components/ToolBarAnimation/ToolBarAnimation.js +5 -0
- package/cjs/components/format/sqlFormat.js +25 -23
- package/cjs/components/format/sqlSafeFormat.js +27 -25
- package/cjs/components/format/xmlFormat.js +25 -23
- package/cjs/components/helpers/actions.js +61 -36
- package/cjs/components/helpers/dependencies.js +17 -8
- package/cjs/components/helpers/store.js +5 -0
- package/cjs/index.js +2 -1
- package/cjs/propTypes.js +1 -3
- package/esm/DSQueryBuilder.js +60 -57
- package/esm/components/AndOrController/AndOrController.js +11 -13
- package/esm/components/ConditionController/ConditionController.js +21 -23
- package/esm/components/DisplayOutput/DisplayOutput.js +14 -11
- package/esm/components/DragContainerController/DragContainerController.js +11 -11
- package/esm/components/DragControllerRow/DragControllerRow.js +7 -2
- package/esm/components/FieldControllerRow/FieldControllerRow.js +22 -20
- package/esm/components/Nestable/Nestable.js +26 -12
- package/esm/components/Nestable/NestableItem.js +21 -13
- package/esm/components/Nestable/actions/events.js +6 -1
- package/esm/components/Nestable/actions/getPaths.js +11 -1
- package/esm/components/Nestable/actions/moveItem.js +12 -5
- package/esm/components/Nestable/actions/paths.js +15 -3
- package/esm/components/QueryBuilderImpl.js +6 -1
- package/esm/components/QueryBuilderItem/QueryBuilderItem.js +28 -20
- package/esm/components/QueryBuilderRow/QueryBuilderRow.js +45 -29
- package/esm/components/ToolBarAnimation/ToolBarAnimation.js +5 -0
- package/esm/components/format/sqlFormat.js +25 -23
- package/esm/components/format/sqlSafeFormat.js +27 -25
- package/esm/components/format/xmlFormat.js +25 -23
- package/esm/components/helpers/actions.js +61 -36
- package/esm/components/helpers/dependencies.js +17 -8
- package/esm/components/helpers/store.js +5 -0
- package/esm/index.js +1 -1
- package/esm/propTypes.js +1 -3
- package/package.json +9 -7
- package/types/DSQueryBuilder.d.ts +1 -1
- package/types/components/AndOrController/AndOrController.d.ts +4 -4
- package/types/components/ConditionController/ConditionController.d.ts +2 -2
- package/types/components/DragContainerController/DragContainerController.d.ts +3 -3
- package/types/components/DragControllerRow/DragControllerRow.d.ts +2 -2
- package/cjs/package.json +0 -7
- package/esm/package.json +0 -7
|
@@ -2,10 +2,19 @@
|
|
|
2
2
|
|
|
3
3
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
4
4
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
5
|
+
require('core-js/modules/esnext.async-iterator.find.js');
|
|
6
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
7
|
+
require('core-js/modules/esnext.iterator.find.js');
|
|
8
|
+
require('core-js/modules/esnext.async-iterator.map.js');
|
|
9
|
+
require('core-js/modules/esnext.iterator.map.js');
|
|
10
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
11
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
12
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
13
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
5
14
|
var React = require('react');
|
|
6
15
|
var cn = require('classnames');
|
|
7
16
|
var utils = require('@elliemae/ds-shared/utils');
|
|
8
|
-
var
|
|
17
|
+
var dsUtilities = require('@elliemae/ds-utilities');
|
|
9
18
|
var tryIncreaseDepth = require('./actions/tryIncreaseDepth.js');
|
|
10
19
|
var tryDecreaseDepth = require('./actions/tryDecreaseDepth.js');
|
|
11
20
|
var moveItem = require('./actions/moveItem.js');
|
|
@@ -24,7 +33,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
24
33
|
|
|
25
34
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
26
35
|
|
|
27
|
-
const shallowCompare = (instance, nextProps, nextState) => !
|
|
36
|
+
const shallowCompare = (instance, nextProps, nextState) => !dsUtilities.isEqualWith(instance.props, nextProps) || !dsUtilities.isEqualWith(instance.state, nextState);
|
|
28
37
|
|
|
29
38
|
class Nestable extends React.Component {
|
|
30
39
|
constructor(props) {
|
|
@@ -170,15 +179,18 @@ class Nestable extends React.Component {
|
|
|
170
179
|
return null;
|
|
171
180
|
}
|
|
172
181
|
|
|
173
|
-
getPathById(id
|
|
182
|
+
getPathById(id) {
|
|
183
|
+
let items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.getDefaultItems();
|
|
174
184
|
return paths.getPathById.call(this, id, items);
|
|
175
185
|
}
|
|
176
186
|
|
|
177
|
-
getItemByPath(path
|
|
187
|
+
getItemByPath(path) {
|
|
188
|
+
let items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.getDefaultItems();
|
|
178
189
|
return paths.getItemByPath.call(this, path, items);
|
|
179
190
|
}
|
|
180
191
|
|
|
181
|
-
getSplicePath(path
|
|
192
|
+
getSplicePath(path) {
|
|
193
|
+
let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
182
194
|
return paths.getSplicePath.call(this, path, options);
|
|
183
195
|
}
|
|
184
196
|
|
|
@@ -215,11 +227,13 @@ class Nestable extends React.Component {
|
|
|
215
227
|
tryDecreaseDepth.tryDecreaseDepth.call(this, dragItem);
|
|
216
228
|
}
|
|
217
229
|
|
|
218
|
-
moveItem({
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
230
|
+
moveItem(_ref) {
|
|
231
|
+
let {
|
|
232
|
+
dragItem,
|
|
233
|
+
pathFrom,
|
|
234
|
+
pathTo
|
|
235
|
+
} = _ref;
|
|
236
|
+
let extraProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
223
237
|
moveItem.moveItem.call(this, {
|
|
224
238
|
dragItem,
|
|
225
239
|
pathFrom,
|
|
@@ -234,7 +248,7 @@ class Nestable extends React.Component {
|
|
|
234
248
|
const {
|
|
235
249
|
dragItem
|
|
236
250
|
} = this.state;
|
|
237
|
-
const el = document.querySelector(
|
|
251
|
+
const el = document.querySelector(".nestable-".concat(group, " .nestable-item-").concat(dragItem.id));
|
|
238
252
|
let listStyles = {};
|
|
239
253
|
|
|
240
254
|
if (el) {
|
|
@@ -276,11 +290,11 @@ class Nestable extends React.Component {
|
|
|
276
290
|
let childClass = 'single';
|
|
277
291
|
if (childLength === 0) childClass = 'empty';else if (childLength > 1) childClass = 'multiple';
|
|
278
292
|
return /*#__PURE__*/_jsx__default["default"]("div", {
|
|
279
|
-
className: cn__default["default"]('nestable',
|
|
293
|
+
className: cn__default["default"]('nestable', "nestable-".concat(group), {
|
|
280
294
|
'is-drag-active': dragItem
|
|
281
295
|
})
|
|
282
296
|
}, void 0, /*#__PURE__*/_jsx__default["default"]("ol", {
|
|
283
|
-
className:
|
|
297
|
+
className: "nestable-list nestable-group nestable-child-count-".concat(childClass)
|
|
284
298
|
}, void 0, items.map((item, i) => /*#__PURE__*/_jsx__default["default"](NestableItem, {
|
|
285
299
|
index: i,
|
|
286
300
|
isAndItem: isAndItem,
|
|
@@ -2,6 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
4
4
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
5
|
+
require('core-js/modules/esnext.async-iterator.map.js');
|
|
6
|
+
require('core-js/modules/esnext.iterator.map.js');
|
|
7
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
8
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
9
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
10
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
11
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
5
12
|
require('react');
|
|
6
13
|
var cn = require('classnames');
|
|
7
14
|
var jsxRuntime = require('react/jsx-runtime');
|
|
@@ -16,16 +23,17 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
16
23
|
|
|
17
24
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
18
25
|
|
|
19
|
-
const NestableItem =
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
const NestableItem = _ref => {
|
|
27
|
+
let {
|
|
28
|
+
item,
|
|
29
|
+
isCopy,
|
|
30
|
+
options,
|
|
31
|
+
index,
|
|
32
|
+
isAndItem,
|
|
33
|
+
isOrItem,
|
|
34
|
+
isDraggableItem,
|
|
35
|
+
singleRow
|
|
36
|
+
} = _ref;
|
|
29
37
|
const {
|
|
30
38
|
dragItem,
|
|
31
39
|
renderItem,
|
|
@@ -39,7 +47,7 @@ const NestableItem = ({
|
|
|
39
47
|
const isOrGroup = item.element.type === 'group' && (item.element.condition === '' || item.element.condition === false);
|
|
40
48
|
const isAndGroup = item.element.type === 'group' && !(item.element.condition === '' || item.element.condition === false);
|
|
41
49
|
const itemProps = {
|
|
42
|
-
className: cn__default["default"](
|
|
50
|
+
className: cn__default["default"]("nestable-item".concat(isCopy ? '-copy' : ''), "nestable-item".concat(isCopy ? '-copy' : '', "-").concat(item.id), "nestable-item-type-".concat(item.element.type), {
|
|
43
51
|
'is-or-group': isOrGroup,
|
|
44
52
|
'is-and-group': isAndGroup,
|
|
45
53
|
'is-and-filter': item.element.type === 'filter' && isAndItem,
|
|
@@ -79,7 +87,7 @@ const NestableItem = ({
|
|
|
79
87
|
if (childLength === 0) childClass = 'empty';else if (childLength > 1) childClass = 'multiple';
|
|
80
88
|
return /*#__PURE__*/jsxRuntime.jsxs("li", _objectSpread(_objectSpread({}, itemProps), {}, {
|
|
81
89
|
children: [/*#__PURE__*/jsxRuntime.jsx("div", _objectSpread(_objectSpread({
|
|
82
|
-
className:
|
|
90
|
+
className: "nestable-item-name nestable-item-name--".concat(item.element.type, " ")
|
|
83
91
|
}, rowProps), {}, {
|
|
84
92
|
children: renderItem({
|
|
85
93
|
item,
|
|
@@ -87,7 +95,7 @@ const NestableItem = ({
|
|
|
87
95
|
index
|
|
88
96
|
})
|
|
89
97
|
})), hasChildren && item.element.type === 'group' && !isCollapsed && /*#__PURE__*/_jsx__default["default"]("ol", {
|
|
90
|
-
className:
|
|
98
|
+
className: "nestable-list nestable-child-count-".concat(childClass, " ")
|
|
91
99
|
}, void 0, item[childrenProp].map((currentitem, i) => /*#__PURE__*/_jsx__default["default"](NestableItem, {
|
|
92
100
|
index: i,
|
|
93
101
|
isAndItem: isAndGroup,
|
|
@@ -3,6 +3,11 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
7
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
8
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
9
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
10
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
6
11
|
var utils = require('@elliemae/ds-shared/utils');
|
|
7
12
|
|
|
8
13
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
@@ -54,7 +59,7 @@ function onMouseMove(e) {
|
|
|
54
59
|
clientY
|
|
55
60
|
} = e;
|
|
56
61
|
const transformProps = utils.getTransformProps(clientX, clientY);
|
|
57
|
-
const elCopy = document.querySelector(
|
|
62
|
+
const elCopy = document.querySelector(".nestable-".concat(group, " .nestable-drag-layer > .nestable-list"));
|
|
58
63
|
|
|
59
64
|
if (!this.elCopyStyles) {
|
|
60
65
|
const offset = utils.getOffsetRect(this.el);
|
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
+
require('core-js/modules/esnext.async-iterator.map.js');
|
|
6
|
+
require('core-js/modules/esnext.iterator.map.js');
|
|
7
|
+
require('core-js/modules/esnext.async-iterator.every.js');
|
|
8
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
9
|
+
require('core-js/modules/esnext.iterator.every.js');
|
|
10
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
11
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
12
|
+
require('core-js/modules/web.dom-collections.iterator.js');
|
|
13
|
+
|
|
5
14
|
function getRealNextPath(prevPath, nextPath) {
|
|
6
15
|
const {
|
|
7
16
|
childrenProp
|
|
@@ -87,7 +96,8 @@ function getItemDepth(item) {
|
|
|
87
96
|
|
|
88
97
|
return level;
|
|
89
98
|
}
|
|
90
|
-
function getSplicePath(path
|
|
99
|
+
function getSplicePath(path) {
|
|
100
|
+
let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
91
101
|
const splicePath = {};
|
|
92
102
|
const numToRemove = options.numToRemove || 0;
|
|
93
103
|
const itemsToInsert = options.itemsToInsert || [];
|
|
@@ -2,6 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
6
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
7
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
8
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
9
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
5
10
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
11
|
var update = require('react-addons-update');
|
|
7
12
|
|
|
@@ -13,11 +18,13 @@ var update__default = /*#__PURE__*/_interopDefaultLegacy(update);
|
|
|
13
18
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
14
19
|
|
|
15
20
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
16
|
-
function moveItem({
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
+
function moveItem(_ref) {
|
|
22
|
+
let {
|
|
23
|
+
dragItem,
|
|
24
|
+
pathFrom,
|
|
25
|
+
pathTo
|
|
26
|
+
} = _ref;
|
|
27
|
+
let extraProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
21
28
|
const {
|
|
22
29
|
childrenProp
|
|
23
30
|
} = this.props;
|
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
+
require('core-js/modules/esnext.async-iterator.map.js');
|
|
6
|
+
require('core-js/modules/esnext.iterator.map.js');
|
|
7
|
+
require('core-js/modules/esnext.async-iterator.every.js');
|
|
8
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
9
|
+
require('core-js/modules/esnext.iterator.every.js');
|
|
10
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
11
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
12
|
+
require('core-js/modules/web.dom-collections.iterator.js');
|
|
13
|
+
|
|
5
14
|
function getRealNextPath(prevPath, nextPath) {
|
|
6
15
|
const {
|
|
7
16
|
childrenProp
|
|
@@ -43,7 +52,8 @@ function getRealNextPath(prevPath, nextPath) {
|
|
|
43
52
|
|
|
44
53
|
return nextPath;
|
|
45
54
|
}
|
|
46
|
-
function getPathById(id
|
|
55
|
+
function getPathById(id) {
|
|
56
|
+
let items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.getDefaultItems();
|
|
47
57
|
const {
|
|
48
58
|
childrenProp
|
|
49
59
|
} = this.props;
|
|
@@ -63,7 +73,8 @@ function getPathById(id, items = this.getDefaultItems()) {
|
|
|
63
73
|
});
|
|
64
74
|
return path;
|
|
65
75
|
}
|
|
66
|
-
function getItemByPath(path
|
|
76
|
+
function getItemByPath(path) {
|
|
77
|
+
let items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.getDefaultItems();
|
|
67
78
|
const {
|
|
68
79
|
childrenProp
|
|
69
80
|
} = this.props;
|
|
@@ -87,7 +98,8 @@ function getItemDepth(item) {
|
|
|
87
98
|
|
|
88
99
|
return level;
|
|
89
100
|
}
|
|
90
|
-
function getSplicePath(path
|
|
101
|
+
function getSplicePath(path) {
|
|
102
|
+
let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
91
103
|
const splicePath = {};
|
|
92
104
|
const numToRemove = options.numToRemove || 0;
|
|
93
105
|
const itemsToInsert = options.itemsToInsert || [];
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
4
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
5
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
6
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
7
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
3
8
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
4
9
|
var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
|
|
5
10
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
@@ -268,7 +273,7 @@ class QueryBuilderImpl extends React.Component {
|
|
|
268
273
|
singleRow
|
|
269
274
|
}
|
|
270
275
|
}, void 0, /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({}, containerProps), {}, {
|
|
271
|
-
className:
|
|
276
|
+
className: "nested-main-group ".concat(condition !== true ? 'is-or-group' : 'is-and-groupL', " ").concat(singleRow ? 'query-main-single-row' : 'query-main-multiple-row'),
|
|
272
277
|
children: [/*#__PURE__*/_jsx__default["default"](Nestable, {
|
|
273
278
|
isAndItem: condition === true,
|
|
274
279
|
isDraggableItem: this.isDraggableItem,
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
4
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
5
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
6
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
7
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
3
8
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
4
9
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
5
10
|
require('react');
|
|
@@ -18,9 +23,10 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
18
23
|
|
|
19
24
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
20
25
|
|
|
21
|
-
const QueryBuilderItem =
|
|
22
|
-
|
|
23
|
-
|
|
26
|
+
const QueryBuilderItem = _ref => {
|
|
27
|
+
let {
|
|
28
|
+
item
|
|
29
|
+
} = _ref;
|
|
24
30
|
const {
|
|
25
31
|
element
|
|
26
32
|
} = item;
|
|
@@ -30,23 +36,25 @@ const QueryBuilderItem = ({
|
|
|
30
36
|
idGroup,
|
|
31
37
|
condition
|
|
32
38
|
} = element;
|
|
33
|
-
return /*#__PURE__*/_jsx__default["default"](QueryBuilderContext.QueryBuilderContext.Consumer, {}, void 0,
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
39
|
+
return /*#__PURE__*/_jsx__default["default"](QueryBuilderContext.QueryBuilderContext.Consumer, {}, void 0, _ref2 => {
|
|
40
|
+
let {
|
|
41
|
+
fields,
|
|
42
|
+
handleFieldChange,
|
|
43
|
+
onAddFilter,
|
|
44
|
+
onAddFilterToGroup,
|
|
45
|
+
onAddRuleContainer,
|
|
46
|
+
onRemoveFilter,
|
|
47
|
+
showDragController,
|
|
48
|
+
handleRuleContainerOperator,
|
|
49
|
+
handleRuleContainerUnGroup,
|
|
50
|
+
step,
|
|
51
|
+
items,
|
|
52
|
+
isDraggableItem,
|
|
53
|
+
setDraggableItems,
|
|
54
|
+
singleRow,
|
|
55
|
+
toolTipZIndex
|
|
56
|
+
} = _ref2;
|
|
57
|
+
|
|
50
58
|
if (type === types.QB_DRAG_TYPES.FILTER) {
|
|
51
59
|
return /*#__PURE__*/jsxRuntime.jsx(QueryBuilderRow, _objectSpread(_objectSpread({}, element), {}, {
|
|
52
60
|
fields: fields,
|
|
@@ -2,9 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
4
4
|
var _jsx = require('@babel/runtime/helpers/jsx');
|
|
5
|
+
require('core-js/modules/web.dom-collections.iterator.js');
|
|
6
|
+
require('core-js/modules/esnext.async-iterator.map.js');
|
|
7
|
+
require('core-js/modules/esnext.iterator.map.js');
|
|
8
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
9
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
10
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
11
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
12
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
5
13
|
var React = require('react');
|
|
6
|
-
var
|
|
7
|
-
var DSTooltip = require('@elliemae/ds-
|
|
14
|
+
var dsIcons = require('@elliemae/ds-icons');
|
|
15
|
+
var DSTooltip = require('@elliemae/ds-tooltip');
|
|
8
16
|
var dsClassnames = require('@elliemae/ds-classnames');
|
|
9
17
|
var dependencies = require('../helpers/dependencies.js');
|
|
10
18
|
var ConditionController = require('../ConditionController/ConditionController.js');
|
|
@@ -16,31 +24,31 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
16
24
|
var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
|
|
17
25
|
var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
|
|
18
26
|
var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
19
|
-
var AlertsDetail__default = /*#__PURE__*/_interopDefaultLegacy(AlertsDetail);
|
|
20
27
|
|
|
21
28
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
22
29
|
|
|
23
30
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
24
31
|
|
|
25
|
-
const RenderField =
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
const RenderField = _ref => {
|
|
33
|
+
let {
|
|
34
|
+
target,
|
|
35
|
+
component,
|
|
36
|
+
valueProp,
|
|
37
|
+
additionalInfo,
|
|
38
|
+
handleMouseEnterInput,
|
|
39
|
+
handleMouseLeaveInput,
|
|
40
|
+
onChangeHandler,
|
|
41
|
+
hasError
|
|
42
|
+
} = _ref;
|
|
35
43
|
const ref = React__default["default"].useRef();
|
|
36
|
-
const id = React__default["default"].useMemo(() =>
|
|
44
|
+
const id = React__default["default"].useMemo(() => "el_".concat(String.fromCharCode(65 + Math.floor(Math.random() * 26))), []);
|
|
37
45
|
return /*#__PURE__*/_jsx__default["default"]("div", {
|
|
38
|
-
className:
|
|
46
|
+
className: "em-ds-query-builder-row-input child-type-".concat(target, " ").concat(hasError && hasError.error ? 'row-input-error' : ''),
|
|
39
47
|
onMouseDownCapture: () => {
|
|
40
48
|
var _ref$current;
|
|
41
49
|
|
|
42
50
|
// eslint-disable-next-line no-underscore-dangle
|
|
43
|
-
const _refInput = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector(
|
|
51
|
+
const _refInput = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector("#".concat(id));
|
|
44
52
|
|
|
45
53
|
if (_refInput && _refInput.focus) setTimeout(_refInput.focus());
|
|
46
54
|
handleMouseEnterInput();
|
|
@@ -55,19 +63,26 @@ const RenderField = ({
|
|
|
55
63
|
onChange: (e, extraData) => onChangeHandler(e, target, extraData),
|
|
56
64
|
value: valueProp != null ? valueProp : '',
|
|
57
65
|
checked: valueProp === true,
|
|
58
|
-
additionalInfo: additionalInfo ? additionalInfo[target] : additionalInfo || {}
|
|
66
|
+
additionalInfo: additionalInfo ? additionalInfo[target] : additionalInfo || {},
|
|
67
|
+
'aria-invalid': Boolean(hasError)
|
|
59
68
|
})
|
|
60
|
-
}), hasError && hasError.errorMessage ? /*#__PURE__*/_jsx__default["default"]("
|
|
69
|
+
}), hasError && hasError.errorMessage ? /*#__PURE__*/_jsx__default["default"]("div", {
|
|
70
|
+
style: {
|
|
71
|
+
width: '40px'
|
|
72
|
+
}
|
|
73
|
+
}, void 0, /*#__PURE__*/_jsx__default["default"](DSTooltip.DSTooltipV3, {
|
|
74
|
+
text: hasError.errorMessage
|
|
75
|
+
}, void 0, /*#__PURE__*/_jsx__default["default"]("div", {
|
|
76
|
+
tabIndex: 0,
|
|
61
77
|
className: "row-icon-alert",
|
|
62
|
-
"data-testid": "qb-error-state-icon"
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
})) : null); // return React.useMemo(
|
|
78
|
+
"data-testid": "qb-error-state-icon",
|
|
79
|
+
role: "alert"
|
|
80
|
+
}, void 0, /*#__PURE__*/_jsx__default["default"](dsIcons.AlertsDetail, {
|
|
81
|
+
width: 20,
|
|
82
|
+
height: 20,
|
|
83
|
+
color: ['danger', 900],
|
|
84
|
+
title: hasError.errorMessage
|
|
85
|
+
})))) : null); // return React.useMemo(
|
|
71
86
|
// () => (
|
|
72
87
|
// <div
|
|
73
88
|
// className={`em-ds-query-builder-row-input child-type-${target}`}
|
|
@@ -156,8 +171,8 @@ class QueryBuilderRow extends React.Component {
|
|
|
156
171
|
idGroup,
|
|
157
172
|
additionalInfo: _objectSpread(_objectSpread({}, additionalInfo), {}, {
|
|
158
173
|
[target]: extraData,
|
|
159
|
-
[
|
|
160
|
-
[
|
|
174
|
+
["".concat(target, "_error")]: hasError,
|
|
175
|
+
["".concat(target, "_touched")]: true
|
|
161
176
|
}),
|
|
162
177
|
target
|
|
163
178
|
});
|
|
@@ -212,7 +227,7 @@ class QueryBuilderRow extends React.Component {
|
|
|
212
227
|
const {
|
|
213
228
|
[target]: valueProp
|
|
214
229
|
} = this.props;
|
|
215
|
-
const isTouched = additionalInfo && additionalInfo[
|
|
230
|
+
const isTouched = additionalInfo && additionalInfo["".concat(target, "_touched")];
|
|
216
231
|
const hasError = renderField && renderField.validation ? renderField.validation(valueProp, {
|
|
217
232
|
field,
|
|
218
233
|
operator,
|
|
@@ -2,6 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
+
require('core-js/modules/esnext.async-iterator.filter.js');
|
|
6
|
+
require('core-js/modules/esnext.iterator.constructor.js');
|
|
7
|
+
require('core-js/modules/esnext.iterator.filter.js');
|
|
8
|
+
require('core-js/modules/esnext.async-iterator.for-each.js');
|
|
9
|
+
require('core-js/modules/esnext.iterator.for-each.js');
|
|
5
10
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
11
|
var React = require('react');
|
|
7
12
|
var GrowRight = require('@elliemae/ds-shared/Animations/GrowRight');
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
+
require('core-js/modules/esnext.async-iterator.map.js');
|
|
6
|
+
require('core-js/modules/esnext.iterator.map.js');
|
|
5
7
|
var types = require('../helpers/types.js');
|
|
6
8
|
|
|
7
|
-
/* eslint-disable complexity */
|
|
8
|
-
|
|
9
9
|
const conditionSql = (condition, value) => {
|
|
10
10
|
const {
|
|
11
11
|
EQUAL,
|
|
@@ -19,16 +19,16 @@ const conditionSql = (condition, value) => {
|
|
|
19
19
|
LESS_THAN_OR_EQUAL,
|
|
20
20
|
START_WITH
|
|
21
21
|
} = types.QB_OPERATOR_TYPES;
|
|
22
|
-
if (condition === EQUAL) return
|
|
23
|
-
if (condition === NOT_EQUAL) return
|
|
24
|
-
if (condition === GREATER_THAN) return
|
|
25
|
-
if (condition === LESS_THAN) return
|
|
26
|
-
if (condition === CONTAINS) return
|
|
27
|
-
if (condition === NOT_CONTAINS) return
|
|
28
|
-
if (condition === BETWEEN) return
|
|
29
|
-
if (condition === GREATER_THAN_OR_EQUAL) return
|
|
30
|
-
if (condition === LESS_THAN_OR_EQUAL) return
|
|
31
|
-
if (condition === START_WITH) return
|
|
22
|
+
if (condition === EQUAL) return " = '".concat(value, "'");
|
|
23
|
+
if (condition === NOT_EQUAL) return " <> '".concat(value, "'");
|
|
24
|
+
if (condition === GREATER_THAN) return " > ".concat(value);
|
|
25
|
+
if (condition === LESS_THAN) return " < ".concat(value);
|
|
26
|
+
if (condition === CONTAINS) return " LIKE '%".concat(value, "%'");
|
|
27
|
+
if (condition === NOT_CONTAINS) return " NOT LIKE '%".concat(value, "%'");
|
|
28
|
+
if (condition === BETWEEN) return " BETWEEN ".concat(value[0], " AND ").concat(value[1], " ");
|
|
29
|
+
if (condition === GREATER_THAN_OR_EQUAL) return " >= ".concat(value);
|
|
30
|
+
if (condition === LESS_THAN_OR_EQUAL) return " <= ".concat(value);
|
|
31
|
+
if (condition === START_WITH) return " LIKE '".concat(value, "%'");
|
|
32
32
|
return condition;
|
|
33
33
|
};
|
|
34
34
|
|
|
@@ -38,33 +38,35 @@ const renderFilterSQl = filter => {
|
|
|
38
38
|
operator,
|
|
39
39
|
value
|
|
40
40
|
} = filter.element;
|
|
41
|
-
return
|
|
41
|
+
return "".concat(field, " ").concat(conditionSql(operator, value) || '');
|
|
42
42
|
};
|
|
43
43
|
|
|
44
|
-
const sqlFormat =
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
const sqlFormat = _ref => {
|
|
45
|
+
let {
|
|
46
|
+
main,
|
|
47
|
+
mapGroups,
|
|
48
|
+
items
|
|
49
|
+
} = _ref;
|
|
50
|
+
|
|
49
51
|
const groupSql = (item, idGroup) => {
|
|
50
52
|
if (idGroup === main) {
|
|
51
53
|
const groupCondition = mapGroups[idGroup].condition === true ? 'AND' : 'OR';
|
|
52
|
-
return
|
|
54
|
+
return " ( ".concat(filterSql(item, groupCondition), " ) "); // eslint-disable-line
|
|
53
55
|
}
|
|
54
56
|
|
|
55
57
|
const groupCondition = item.element.condition === true ? 'AND' : 'OR';
|
|
56
|
-
return
|
|
58
|
+
return " ( ".concat(filterSql(item.children, groupCondition), " ) "); // eslint-disable-line
|
|
57
59
|
};
|
|
58
60
|
|
|
59
61
|
const filterSql = (filters, groupCondition) => {
|
|
60
62
|
const filterGroup = filters.map(filter => {
|
|
61
|
-
if (filter.element.type === 'filter') return
|
|
62
|
-
return
|
|
63
|
+
if (filter.element.type === 'filter') return " ".concat(renderFilterSQl(filter), " ");
|
|
64
|
+
return " ".concat(groupSql(filter) || '', " ");
|
|
63
65
|
});
|
|
64
66
|
return filterGroup.join(groupCondition);
|
|
65
67
|
};
|
|
66
68
|
|
|
67
|
-
const sql =
|
|
69
|
+
const sql = " FROM [TABLE_NAME] WHERE ".concat(groupSql(items, main) || '', " ");
|
|
68
70
|
return sql;
|
|
69
71
|
};
|
|
70
72
|
|