@cubejs-client/react 0.30.0 → 0.30.4
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/CHANGELOG.md +11 -0
- package/dist/cubejs-client-react.esm.js +3 -7
- package/dist/cubejs-client-react.esm.js.map +1 -1
- package/dist/cubejs-client-react.js +2 -6
- package/dist/cubejs-client-react.js.map +1 -1
- package/dist/cubejs-client-react.umd.js +62 -29
- package/dist/cubejs-client-react.umd.js.map +1 -1
- package/package.json +3 -3
- package/src/QueryBuilder.jsx +8 -7
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cubejs-client/react",
|
|
3
|
-
"version": "0.30.
|
|
3
|
+
"version": "0.30.4",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"engines": {},
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
],
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@babel/runtime": "^7.1.2",
|
|
27
|
-
"@cubejs-client/core": "^0.30.
|
|
27
|
+
"@cubejs-client/core": "^0.30.4",
|
|
28
28
|
"anser": "^2.0.1",
|
|
29
29
|
"core-js": "^3.6.5",
|
|
30
30
|
"html-entities": "^2.3.2",
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"peerDependencies": {
|
|
45
45
|
"react": ">=16.10.2"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "b7df8f6a3cfe104e639e0f7607868afa193ed0a3"
|
|
48
48
|
}
|
package/src/QueryBuilder.jsx
CHANGED
|
@@ -8,7 +8,9 @@ import {
|
|
|
8
8
|
isQueryPresent,
|
|
9
9
|
moveItemInArray,
|
|
10
10
|
movePivotItem,
|
|
11
|
-
|
|
11
|
+
validateQuery,
|
|
12
|
+
ResultSet,
|
|
13
|
+
removeEmptyQueryFields
|
|
12
14
|
} from '@cubejs-client/core';
|
|
13
15
|
|
|
14
16
|
import QueryRenderer from './QueryRenderer.jsx';
|
|
@@ -200,6 +202,7 @@ export default class QueryBuilder extends React.Component {
|
|
|
200
202
|
|
|
201
203
|
prepareRenderProps(queryRendererProps) {
|
|
202
204
|
const getName = (member) => member.name;
|
|
205
|
+
|
|
203
206
|
const toTimeDimension = (member) => {
|
|
204
207
|
const rangeSelection = member.compareDateRange
|
|
205
208
|
? { compareDateRange: member.compareDateRange }
|
|
@@ -211,6 +214,7 @@ export default class QueryBuilder extends React.Component {
|
|
|
211
214
|
...rangeSelection,
|
|
212
215
|
});
|
|
213
216
|
};
|
|
217
|
+
|
|
214
218
|
const toFilter = (member) => ({
|
|
215
219
|
member: member.member?.name || member.dimension?.name,
|
|
216
220
|
operator: member.operator,
|
|
@@ -420,10 +424,10 @@ export default class QueryBuilder extends React.Component {
|
|
|
420
424
|
const { query } = this.state;
|
|
421
425
|
|
|
422
426
|
this.updateVizState({
|
|
423
|
-
query: {
|
|
427
|
+
query: removeEmptyQueryFields({
|
|
424
428
|
...query,
|
|
425
429
|
...queryUpdate,
|
|
426
|
-
},
|
|
430
|
+
}),
|
|
427
431
|
});
|
|
428
432
|
}
|
|
429
433
|
|
|
@@ -525,10 +529,7 @@ export default class QueryBuilder extends React.Component {
|
|
|
525
529
|
validatedQuery(state) {
|
|
526
530
|
const { query } = state || this.state;
|
|
527
531
|
|
|
528
|
-
return
|
|
529
|
-
...query,
|
|
530
|
-
filters: (query.filters || []).filter((f) => f.operator),
|
|
531
|
-
};
|
|
532
|
+
return validateQuery(query);
|
|
532
533
|
}
|
|
533
534
|
|
|
534
535
|
defaultHeuristics(newState) {
|