@finos/legend-application-query 5.0.0 → 5.1.0

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.
Files changed (148) hide show
  1. package/lib/components/QueryBuilderExplorerPanel.d.ts.map +1 -1
  2. package/lib/components/QueryBuilderExplorerPanel.js +3 -1
  3. package/lib/components/QueryBuilderExplorerPanel.js.map +1 -1
  4. package/lib/components/QueryBuilderFetchStructurePanel.d.ts.map +1 -1
  5. package/lib/components/QueryBuilderFetchStructurePanel.js +39 -7
  6. package/lib/components/QueryBuilderFetchStructurePanel.js.map +1 -1
  7. package/lib/components/QueryBuilderFilterPanel.d.ts.map +1 -1
  8. package/lib/components/QueryBuilderFilterPanel.js +59 -15
  9. package/lib/components/QueryBuilderFilterPanel.js.map +1 -1
  10. package/lib/components/QueryBuilderFunctionsExplorerPanel.d.ts.map +1 -1
  11. package/lib/components/QueryBuilderFunctionsExplorerPanel.js.map +1 -1
  12. package/lib/components/QueryBuilderParameterPanel.d.ts.map +1 -1
  13. package/lib/components/QueryBuilderParameterPanel.js +3 -2
  14. package/lib/components/QueryBuilderParameterPanel.js.map +1 -1
  15. package/lib/components/QueryBuilderPostFilterPanel.d.ts.map +1 -1
  16. package/lib/components/QueryBuilderPostFilterPanel.js +29 -7
  17. package/lib/components/QueryBuilderPostFilterPanel.js.map +1 -1
  18. package/lib/components/QueryBuilderProjectionPanel.d.ts.map +1 -1
  19. package/lib/components/QueryBuilderProjectionPanel.js +6 -2
  20. package/lib/components/QueryBuilderProjectionPanel.js.map +1 -1
  21. package/lib/components/QueryBuilderPropertySearchPanel.d.ts.map +1 -1
  22. package/lib/components/QueryBuilderPropertySearchPanel.js +3 -2
  23. package/lib/components/QueryBuilderPropertySearchPanel.js.map +1 -1
  24. package/lib/components/QueryBuilderResultPanel.d.ts.map +1 -1
  25. package/lib/components/QueryBuilderResultPanel.js +13 -7
  26. package/lib/components/QueryBuilderResultPanel.js.map +1 -1
  27. package/lib/components/QueryBuilderSetupPanel.d.ts.map +1 -1
  28. package/lib/components/QueryBuilderSetupPanel.js +5 -3
  29. package/lib/components/QueryBuilderSetupPanel.js.map +1 -1
  30. package/lib/index.css +2 -2
  31. package/lib/index.css.map +1 -1
  32. package/lib/index.d.ts +2 -1
  33. package/lib/index.d.ts.map +1 -1
  34. package/lib/index.js +2 -1
  35. package/lib/index.js.map +1 -1
  36. package/lib/package.json +2 -3
  37. package/lib/stores/QueryBuilderExplorerState.d.ts +1 -1
  38. package/lib/stores/QueryBuilderExplorerState.d.ts.map +1 -1
  39. package/lib/stores/QueryBuilderExplorerState.js +13 -3
  40. package/lib/stores/QueryBuilderExplorerState.js.map +1 -1
  41. package/lib/stores/QueryBuilderFetchStructureState.d.ts +2 -1
  42. package/lib/stores/QueryBuilderFetchStructureState.d.ts.map +1 -1
  43. package/lib/stores/QueryBuilderFetchStructureState.js +2 -2
  44. package/lib/stores/QueryBuilderFetchStructureState.js.map +1 -1
  45. package/lib/stores/QueryBuilderFilterState.d.ts +11 -1
  46. package/lib/stores/QueryBuilderFilterState.d.ts.map +1 -1
  47. package/lib/stores/QueryBuilderFilterState.js +33 -2
  48. package/lib/stores/QueryBuilderFilterState.js.map +1 -1
  49. package/lib/stores/QueryBuilderOperatorLoader.d.ts +47 -0
  50. package/lib/stores/QueryBuilderOperatorLoader.d.ts.map +1 -0
  51. package/lib/stores/QueryBuilderOperatorLoader.js +94 -0
  52. package/lib/stores/QueryBuilderOperatorLoader.js.map +1 -0
  53. package/lib/stores/QueryBuilderOperatorsHelper.d.ts +1 -0
  54. package/lib/stores/QueryBuilderOperatorsHelper.d.ts.map +1 -1
  55. package/lib/stores/QueryBuilderOperatorsHelper.js +28 -1
  56. package/lib/stores/QueryBuilderOperatorsHelper.js.map +1 -1
  57. package/lib/stores/QueryBuilderPostFilterState.d.ts +5 -2
  58. package/lib/stores/QueryBuilderPostFilterState.d.ts.map +1 -1
  59. package/lib/stores/QueryBuilderPostFilterState.js +25 -1
  60. package/lib/stores/QueryBuilderPostFilterState.js.map +1 -1
  61. package/lib/stores/QueryBuilderPreviewDataHelper.d.ts +4 -3
  62. package/lib/stores/QueryBuilderPreviewDataHelper.d.ts.map +1 -1
  63. package/lib/stores/QueryBuilderPreviewDataHelper.js +77 -97
  64. package/lib/stores/QueryBuilderPreviewDataHelper.js.map +1 -1
  65. package/lib/stores/QueryBuilderProjectionState.d.ts +4 -2
  66. package/lib/stores/QueryBuilderProjectionState.d.ts.map +1 -1
  67. package/lib/stores/QueryBuilderProjectionState.js +24 -28
  68. package/lib/stores/QueryBuilderProjectionState.js.map +1 -1
  69. package/lib/stores/QueryBuilderPropertySearchPanelState.js +1 -1
  70. package/lib/stores/QueryBuilderPropertySearchPanelState.js.map +1 -1
  71. package/lib/stores/QueryBuilderResultState.d.ts +5 -2
  72. package/lib/stores/QueryBuilderResultState.d.ts.map +1 -1
  73. package/lib/stores/QueryBuilderResultState.js +19 -7
  74. package/lib/stores/QueryBuilderResultState.js.map +1 -1
  75. package/lib/stores/QueryBuilderState.d.ts +2 -0
  76. package/lib/stores/QueryBuilderState.d.ts.map +1 -1
  77. package/lib/stores/QueryBuilderState.js +11 -58
  78. package/lib/stores/QueryBuilderState.js.map +1 -1
  79. package/lib/stores/QueryBuilderTestUtils.d.ts +24 -0
  80. package/lib/stores/QueryBuilderTestUtils.d.ts.map +1 -0
  81. package/lib/stores/QueryBuilderTestUtils.js +49 -0
  82. package/lib/stores/QueryBuilderTestUtils.js.map +1 -0
  83. package/lib/stores/QueryBuilderTypeaheadHelper.d.ts +24 -0
  84. package/lib/stores/QueryBuilderTypeaheadHelper.d.ts.map +1 -0
  85. package/lib/stores/QueryBuilderTypeaheadHelper.js +89 -0
  86. package/lib/stores/QueryBuilderTypeaheadHelper.js.map +1 -0
  87. package/lib/stores/QueryEditorStore.d.ts.map +1 -1
  88. package/lib/stores/QueryEditorStore.js +3 -7
  89. package/lib/stores/QueryEditorStore.js.map +1 -1
  90. package/lib/stores/filterOperators/QueryBuilderFilterOperator_Equal.d.ts.map +1 -1
  91. package/lib/stores/filterOperators/QueryBuilderFilterOperator_Equal.js +5 -31
  92. package/lib/stores/filterOperators/QueryBuilderFilterOperator_Equal.js.map +1 -1
  93. package/lib/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.d.ts.map +1 -1
  94. package/lib/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.js +5 -31
  95. package/lib/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.js.map +1 -1
  96. package/lib/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.d.ts.map +1 -1
  97. package/lib/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.js +5 -31
  98. package/lib/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.js.map +1 -1
  99. package/lib/stores/filterOperators/QueryBuilderFilterOperator_LessThan.d.ts.map +1 -1
  100. package/lib/stores/filterOperators/QueryBuilderFilterOperator_LessThan.js +5 -32
  101. package/lib/stores/filterOperators/QueryBuilderFilterOperator_LessThan.js.map +1 -1
  102. package/lib/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.d.ts.map +1 -1
  103. package/lib/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.js +5 -31
  104. package/lib/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.js.map +1 -1
  105. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_Equal.d.ts.map +1 -1
  106. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_Equal.js +3 -29
  107. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_Equal.js.map +1 -1
  108. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_GreaterThan.d.ts.map +1 -1
  109. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_GreaterThan.js +4 -30
  110. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_GreaterThan.js.map +1 -1
  111. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_LessThan.d.ts.map +1 -1
  112. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_LessThan.js +4 -30
  113. package/lib/stores/postFilterOperators/QueryBuilderPostFilterOperator_LessThan.js.map +1 -1
  114. package/package.json +9 -10
  115. package/src/components/QueryBuilderExplorerPanel.tsx +3 -1
  116. package/src/components/QueryBuilderFetchStructurePanel.tsx +47 -7
  117. package/src/components/QueryBuilderFilterPanel.tsx +101 -21
  118. package/src/components/QueryBuilderFunctionsExplorerPanel.tsx +1 -0
  119. package/src/components/QueryBuilderParameterPanel.tsx +3 -2
  120. package/src/components/QueryBuilderPostFilterPanel.tsx +53 -7
  121. package/src/components/QueryBuilderProjectionPanel.tsx +19 -2
  122. package/src/components/QueryBuilderPropertySearchPanel.tsx +2 -1
  123. package/src/components/QueryBuilderResultPanel.tsx +75 -46
  124. package/src/components/QueryBuilderSetupPanel.tsx +5 -3
  125. package/src/index.ts +2 -4
  126. package/src/stores/QueryBuilderExplorerState.ts +17 -3
  127. package/src/stores/QueryBuilderFetchStructureState.ts +9 -2
  128. package/src/stores/QueryBuilderFilterState.ts +50 -0
  129. package/src/stores/QueryBuilderOperatorLoader.ts +133 -0
  130. package/src/stores/QueryBuilderOperatorsHelper.ts +35 -0
  131. package/src/stores/QueryBuilderPostFilterState.ts +40 -1
  132. package/src/stores/QueryBuilderPreviewDataHelper.ts +122 -217
  133. package/src/stores/QueryBuilderProjectionState.ts +40 -42
  134. package/src/stores/QueryBuilderPropertySearchPanelState.ts +1 -1
  135. package/src/stores/QueryBuilderResultState.ts +27 -9
  136. package/src/stores/QueryBuilderState.ts +27 -94
  137. package/src/stores/QueryBuilderTestUtils.ts +93 -0
  138. package/src/stores/QueryBuilderTypeaheadHelper.ts +149 -0
  139. package/src/stores/QueryEditorStore.ts +11 -12
  140. package/src/stores/filterOperators/QueryBuilderFilterOperator_Equal.ts +6 -35
  141. package/src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.ts +9 -35
  142. package/src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts +9 -35
  143. package/src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts +9 -36
  144. package/src/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.ts +9 -35
  145. package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_Equal.ts +6 -33
  146. package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_GreaterThan.ts +11 -36
  147. package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_LessThan.ts +11 -36
  148. package/tsconfig.json +3 -0
@@ -0,0 +1,89 @@
1
+ /**
2
+ * Copyright (c) 2020-present, Goldman Sachs
3
+ *
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ */
16
+ import { PrimitiveInstanceValue, PRIMITIVE_TYPE, TdsExecutionResult, } from '@finos/legend-graph';
17
+ import { guaranteeType, isNonNullable, isString } from '@finos/legend-shared';
18
+ import { QueryBuilderPostFilterOperator_StartWith } from './postFilterOperators/QueryBuilderPostFilterOperator_StartWith.js';
19
+ import { PostFilterConditionState, QueryBuilderPostFilterTreeConditionNodeData, } from './QueryBuilderPostFilterState.js';
20
+ import { QueryBuilderProjectionColumnState, QueryBuilderSimpleProjectionColumnState, } from './QueryBuilderProjectionState.js';
21
+ const TYPEAHEAD_TAKE_LIMIT = 10;
22
+ const START_LENGTH = 3;
23
+ const createAndSetupQueryBuilderStateForTypeAhead = (queryBuilderState) => {
24
+ // builderState to build dummy query
25
+ const builderState = queryBuilderState.createBareBuilderState();
26
+ // setup
27
+ builderState.querySetupState = queryBuilderState.querySetupState;
28
+ // result modifiers
29
+ builderState.resultSetModifierState.distinct = true;
30
+ builderState.resultSetModifierState.limit = TYPEAHEAD_TAKE_LIMIT;
31
+ return builderState;
32
+ };
33
+ const buildColumnTypeAheadQuery = (builderState, columnState, value) => {
34
+ // projection column
35
+ let projectionState;
36
+ if (columnState instanceof QueryBuilderProjectionColumnState) {
37
+ projectionState = columnState;
38
+ }
39
+ else {
40
+ projectionState = columnState.projectionColumnState;
41
+ const aggregationState = builderState.fetchStructureState.projectionState.aggregationState;
42
+ aggregationState.columns = [columnState];
43
+ }
44
+ builderState.fetchStructureState.projectionState.columns = [projectionState];
45
+ // post filter
46
+ const postConditionState = new PostFilterConditionState(builderState.postFilterState, columnState, value, new QueryBuilderPostFilterOperator_StartWith());
47
+ const postFilterNode = new QueryBuilderPostFilterTreeConditionNodeData(undefined, postConditionState);
48
+ builderState.postFilterState.addNodeFromNode(postFilterNode, undefined);
49
+ return builderState;
50
+ };
51
+ export const buildPropertyTypeAheadQuery = (queryBuilderState, propertyExpression, value) => {
52
+ // builderState to build dummy query
53
+ const builderState = createAndSetupQueryBuilderStateForTypeAhead(queryBuilderState);
54
+ const projectionState = new QueryBuilderSimpleProjectionColumnState(builderState.fetchStructureState.projectionState, propertyExpression, false);
55
+ return buildColumnTypeAheadQuery(builderState, projectionState, value);
56
+ };
57
+ export const buildProjectionColumnTypeAheadQuery = (queryBuilderState, columnState, value) => {
58
+ // builderState to build dummy query
59
+ const builderState = createAndSetupQueryBuilderStateForTypeAhead(queryBuilderState);
60
+ return buildColumnTypeAheadQuery(builderState, columnState, value);
61
+ };
62
+ export const buildTypeAheadOptions = (result) => {
63
+ const tdsResult = guaranteeType(result, TdsExecutionResult, 'Type ahead search is only supported for tds result sets');
64
+ const options = [];
65
+ tdsResult.result.rows
66
+ .map((r) => r.values[0])
67
+ .filter(isNonNullable)
68
+ .forEach((r) => {
69
+ if (isString(r)) {
70
+ options.push(r);
71
+ }
72
+ });
73
+ return options;
74
+ };
75
+ export const performTypeAhead = (val) => {
76
+ if (val instanceof PrimitiveInstanceValue) {
77
+ const _type = val.genericType.value.rawType;
78
+ switch (_type.path) {
79
+ case PRIMITIVE_TYPE.STRING: {
80
+ const value = val.values[0];
81
+ return value.length >= START_LENGTH;
82
+ }
83
+ default:
84
+ return false;
85
+ }
86
+ }
87
+ return false;
88
+ };
89
+ //# sourceMappingURL=QueryBuilderTypeaheadHelper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"QueryBuilderTypeaheadHelper.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderTypeaheadHelper.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryEditorStore.d.ts","sourceRoot":"","sources":["../../src/stores/QueryEditorStore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryEditorStore.d.ts","sourceRoot":"","sources":["../../src/stores/QueryEditorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EACL,KAAK,WAAW,EAOhB,WAAW,EAGZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,UAAU,EACf,KAAK,SAAS,EACd,iBAAiB,EAGjB,KAAK,EAUN,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAE3B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAE3F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAE7E,MAAM,WAAW,wBAAwB;IACvC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,aAAa,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACrD,SAAS,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACjD;AAED,qBAAa,gBAAgB;IAC3B,WAAW,EAAE,gBAAgB,CAAC;IAC9B,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,UAAS;IACpB,aAAa,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACrD,SAAS,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACjD,iBAAiB,cAAwB;gBAGvC,WAAW,EAAE,gBAAgB,EAC7B,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,wBAAwB;IAgBlC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI/B,IAAI,YAAY,IAAI,OAAO,CAO1B;IAEK,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CA6EtD;AAED,8BAAsB,gBAAgB;IACpC,gBAAgB,EAAE,2BAA2B,CAAC;IAC9C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,aAAa,EAAE,wBAAwB,CAAC;IACxC,iBAAiB,EAAE,iBAAiB,CAAC;IAErC,SAAS,cAAwB;IACjC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;gBAGzC,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,wBAAwB;IAuBzC,cAAc,CAAC,GAAG,EAAE,gBAAgB,GAAG,SAAS,GAAG,IAAI;IAIvD,QAAQ,CAAC,cAAc,IAAI,qBAAqB;IAChD;;OAEG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGjD;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IACrD,QAAQ,CAAC,sBAAsB,CAC7B,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,wBAAwB,CAAC;IAEnC,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC;IAoD/B,UAAU,CACT,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,WAAW,CAAC,IAAI,CAAC;CAoFrB;AAED,qBAAa,sBAAuB,SAAQ,gBAAgB;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;gBAG5B,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,wBAAwB,EACvC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAAG,SAAS;IAY/B,cAAc,IAAI,qBAAqB;IAQjC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BlC,sBAAsB,IAAI,OAAO,CAAC,wBAAwB,CAAC;CAUlE;AAED,qBAAa,uBAAwB,SAAQ,gBAAgB;IAC3D,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;gBAG/B,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,wBAAwB,EACvC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GAAG,SAAS;IAWlC,cAAc,IAAI,qBAAqB;IAQjC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6ClC,sBAAsB,IAAI,OAAO,CAAC,wBAAwB,CAAC;CAalE;AAED,qBAAa,wBAAyB,SAAQ,gBAAgB;IAC5D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,CAAyB;gBAGtC,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,wBAAwB,EACvC,OAAO,EAAE,MAAM;IAajB,IAAI,KAAK,IAAI,UAAU,CAEtB;IAED,QAAQ,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI;IAI/B,cAAc,IAAI,qBAAqB;IAQxB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBlC,sBAAsB,IAAI,OAAO,CAAC,wBAAwB,CAAC;CAelE"}
@@ -238,18 +238,14 @@ export class CreateQueryEditorStore extends QueryEditorStore {
238
238
  this.queryBuilderState.querySetupState.setMapping(this.graphManagerState.graph.getMapping(this.mappingPath));
239
239
  this.queryBuilderState.querySetupState.setRuntimeValue(new RuntimePointer(PackageableElementExplicitReference.create(this.graphManagerState.graph.getRuntime(this.runtimePath))));
240
240
  if (this.classPath) {
241
- this.queryBuilderState.querySetupState._class =
242
- this.queryBuilderState.graphManagerState.graph.getClass(this.classPath);
241
+ this.queryBuilderState.changeClass(this.queryBuilderState.graphManagerState.graph.getClass(this.classPath));
243
242
  this.queryBuilderState.querySetupState.setClassIsReadOnly(true);
244
243
  }
245
244
  else {
246
- this.queryBuilderState.querySetupState._class = getNullableFirstElement(this.queryBuilderState.querySetupState.mapping
245
+ this.queryBuilderState.changeClass(getNullableFirstElement(this.queryBuilderState.querySetupState.mapping
247
246
  ? getAllClassMappings(this.queryBuilderState.querySetupState.mapping).map((classMapping) => classMapping.class.value)
248
- : []);
247
+ : []));
249
248
  }
250
- // initialize query builder state after setting up
251
- this.queryBuilderState.resetQueryBuilder();
252
- this.queryBuilderState.resetQuerySetup();
253
249
  }
254
250
  async getExportConfiguration() {
255
251
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"QueryEditorStore.js","sourceRoot":"","sources":["../../src/stores/QueryEditorStore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryEditorStore.js","sourceRoot":"","sources":["../../src/stores/QueryEditorStore.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAa9B,MAAM,qBAAqB,CAAC;AAc7B,qBAAa,gCAAiC,SAAQ,0BAA0B;IAC9E,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAuBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAuCV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAqDjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC;AAED,qBAAa,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAQZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAMpC"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAY9B,MAAM,qBAAqB,CAAC;AAe7B,qBAAa,gCAAiC,SAAQ,0BAA0B;IAC9E,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAuBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAqDjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC;AAED,qBAAa,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAQZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAMpC"}
@@ -14,12 +14,12 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
17
- import { EnumValueInstanceValue, GenericTypeExplicitReference, GenericType, TYPICAL_MULTIPLICITY_TYPE, EnumValueExplicitReference, Enumeration, PRIMITIVE_TYPE, isSuperType, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
17
+ import { EnumValueInstanceValue, GenericTypeExplicitReference, GenericType, TYPICAL_MULTIPLICITY_TYPE, EnumValueExplicitReference, Enumeration, PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
18
18
  import { UnsupportedOperationError } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
21
21
  import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
22
- import { buildNotExpression, unwrapNotExpression, getNonCollectionValueSpecificationType, } from '../QueryBuilderOperatorsHelper.js';
22
+ import { buildNotExpression, unwrapNotExpression, getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, } from '../QueryBuilderOperatorsHelper.js';
23
23
  export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator {
24
24
  getLabel(filterConditionState) {
25
25
  return 'is';
@@ -42,36 +42,10 @@ export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator
42
42
  (propertyType instanceof Enumeration && propertyType.values.length > 0));
43
43
  }
44
44
  isCompatibleWithFilterConditionValue(filterConditionState) {
45
- const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
46
- .genericType.value.rawType;
47
- const type = filterConditionState.value
45
+ return isTypeCompatibleWithConditionValueType(filterConditionState.value
48
46
  ? getNonCollectionValueSpecificationType(filterConditionState.value)
49
- : undefined;
50
- const NUMERIC_PRIMITIVE_TYPES = [
51
- PRIMITIVE_TYPE.NUMBER,
52
- PRIMITIVE_TYPE.INTEGER,
53
- PRIMITIVE_TYPE.DECIMAL,
54
- PRIMITIVE_TYPE.FLOAT,
55
- ];
56
- const DATE_PRIMITIVE_TYPES = [
57
- PRIMITIVE_TYPE.DATE,
58
- PRIMITIVE_TYPE.DATETIME,
59
- PRIMITIVE_TYPE.STRICTDATE,
60
- PRIMITIVE_TYPE.LATESTDATE,
61
- ];
62
- // When changing the return type for LHS, the RHS value should be adjusted accordingly.
63
- return (type !== undefined &&
64
- // Numeric value is handled loosely because of autoboxing
65
- // e.g. LHS (integer) = RHS (float) is acceptable
66
- ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
67
- NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
68
- // Date value is handled loosely as well if the LHS is of type DateTime
69
- // This is because we would simulate auto-boxing for date by altering the
70
- // Pure function used for the operation
71
- // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
72
- DATE_PRIMITIVE_TYPES.includes(type.path) ||
73
- type === propertyType ||
74
- isSuperType(propertyType, type)));
47
+ : undefined, filterConditionState.propertyExpressionState.propertyExpression.func
48
+ .genericType.value.rawType);
75
49
  }
76
50
  getDefaultFilterConditionValue(filterConditionState) {
77
51
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_Equal.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_Equal.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAM9B,MAAM,qBAAqB,CAAC;AAU7B,qBAAa,sCAAuC,SAAQ,0BAA0B;IACpF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAsCV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAK9B,MAAM,qBAAqB,CAAC;AAa7B,qBAAa,sCAAuC,SAAQ,0BAA0B;IACpF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
@@ -14,12 +14,12 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
17
- import { PRIMITIVE_TYPE, isSuperType, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
17
+ import { PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
18
18
  import { UnsupportedOperationError } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
21
21
  import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
22
- import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
22
+ import { getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, } from '../QueryBuilderOperatorsHelper.js';
23
23
  export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOperator {
24
24
  getLabel(filterConditionState) {
25
25
  return '>';
@@ -38,36 +38,10 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
38
38
  ].includes(propertyType.path);
39
39
  }
40
40
  isCompatibleWithFilterConditionValue(filterConditionState) {
41
- const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
42
- .genericType.value.rawType;
43
- const type = filterConditionState.value
41
+ return isTypeCompatibleWithConditionValueType(filterConditionState.value
44
42
  ? getNonCollectionValueSpecificationType(filterConditionState.value)
45
- : undefined;
46
- const NUMERIC_PRIMITIVE_TYPES = [
47
- PRIMITIVE_TYPE.NUMBER,
48
- PRIMITIVE_TYPE.INTEGER,
49
- PRIMITIVE_TYPE.DECIMAL,
50
- PRIMITIVE_TYPE.FLOAT,
51
- ];
52
- const DATE_PRIMITIVE_TYPES = [
53
- PRIMITIVE_TYPE.DATE,
54
- PRIMITIVE_TYPE.DATETIME,
55
- PRIMITIVE_TYPE.STRICTDATE,
56
- PRIMITIVE_TYPE.LATESTDATE,
57
- ];
58
- // When changing the return type for LHS, the RHS value should be adjusted accordingly.
59
- return (type !== undefined &&
60
- // Numeric value is handled loosely because of autoboxing
61
- // e.g. LHS (integer) = RHS (float) is acceptable
62
- ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
63
- NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
64
- // Date value is handled loosely as well if the LHS is of type DateTime
65
- // This is because we would simulate auto-boxing for date by altering the
66
- // Pure function used for the operation
67
- // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
68
- DATE_PRIMITIVE_TYPES.includes(type.path) ||
69
- type === propertyType ||
70
- isSuperType(propertyType, type)));
43
+ : undefined, filterConditionState.propertyExpressionState.propertyExpression.func
44
+ .genericType.value.rawType);
71
45
  }
72
46
  getDefaultFilterConditionValue(filterConditionState) {
73
47
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAK9B,MAAM,qBAAqB,CAAC;AAU7B,qBAAa,2CAA4C,SAAQ,0BAA0B;IACzF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAsCV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAa7B,qBAAa,2CAA4C,SAAQ,0BAA0B;IACzF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
@@ -14,12 +14,12 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
17
- import { PRIMITIVE_TYPE, isSuperType, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
17
+ import { PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
18
18
  import { UnsupportedOperationError } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
21
21
  import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
22
- import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
22
+ import { getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, } from '../QueryBuilderOperatorsHelper.js';
23
23
  export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFilterOperator {
24
24
  getLabel(filterConditionState) {
25
25
  return '>=';
@@ -38,36 +38,10 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
38
38
  ].includes(propertyType.path);
39
39
  }
40
40
  isCompatibleWithFilterConditionValue(filterConditionState) {
41
- const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
42
- .genericType.value.rawType;
43
- const type = filterConditionState.value
41
+ return isTypeCompatibleWithConditionValueType(filterConditionState.value
44
42
  ? getNonCollectionValueSpecificationType(filterConditionState.value)
45
- : undefined;
46
- const NUMERIC_PRIMITIVE_TYPES = [
47
- PRIMITIVE_TYPE.NUMBER,
48
- PRIMITIVE_TYPE.INTEGER,
49
- PRIMITIVE_TYPE.DECIMAL,
50
- PRIMITIVE_TYPE.FLOAT,
51
- ];
52
- const DATE_PRIMITIVE_TYPES = [
53
- PRIMITIVE_TYPE.DATE,
54
- PRIMITIVE_TYPE.DATETIME,
55
- PRIMITIVE_TYPE.STRICTDATE,
56
- PRIMITIVE_TYPE.LATESTDATE,
57
- ];
58
- // When changing the return type for LHS, the RHS value should be adjusted accordingly.
59
- return (type !== undefined &&
60
- // Numeric value is handled loosely because of autoboxing
61
- // e.g. LHS (integer) = RHS (float) is acceptable
62
- ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
63
- NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
64
- // Date value is handled loosely as well if the LHS is of type DateTime
65
- // This is because we would simulate auto-boxing for date by altering the
66
- // Pure function used for the operation
67
- // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
68
- DATE_PRIMITIVE_TYPES.includes(type.path) ||
69
- type === propertyType ||
70
- isSuperType(propertyType, type)));
43
+ : undefined, filterConditionState.propertyExpressionState.propertyExpression.func
44
+ .genericType.value.rawType);
71
45
  }
72
46
  getDefaultFilterConditionValue(filterConditionState) {
73
47
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,GAG3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,cAAc,EAId,WAAW,EACX,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,oCAAoC,EAAE,MAAM,mDAAmD,CAAC;AACzG,OAAO,EAAE,sCAAsC,EAAE,MAAM,mCAAmC,CAAC;AAE3F,MAAM,OAAO,2CAA4C,SAAQ,0BAA0B;IACzF,QAAQ,CAAC,oBAA0C;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,OACE;YACE,cAAc,CAAC,MAAM;YACrB,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,KAAK;YACpB,cAAc,CAAC,IAAI;YACnB,cAAc,CAAC,UAAU;YACzB,cAAc,CAAC,QAAQ;SAE1B,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK;YACrC,CAAC,CAAC,sCAAsC,CAAC,oBAAoB,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,uBAAuB,GAAG;YAC9B,cAAc,CAAC,MAAM;YACrB,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,KAAK;SACT,CAAC;QAEd,MAAM,oBAAoB,GAAG;YAC3B,cAAc,CAAC,IAAI;YACnB,cAAc,CAAC,QAAQ;YACvB,cAAc,CAAC,UAAU;YACzB,cAAc,CAAC,UAAU;SACd,CAAC;QAEd,uFAAuF;QACvF,OAAO,CACL,IAAI,KAAK,SAAS;YAClB,yDAAyD;YACzD,iDAAiD;YACjD,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC3C,uBAAuB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBACpD,uEAAuE;gBACvE,yEAAyE;gBACzE,uCAAuC;gBACvC,qEAAqE;gBACrE,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBACxC,IAAI,KAAK,YAAY;gBACrB,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CACnC,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,QAAQ,YAAY,CAAC,IAAI,EAAE;YACzB,KAAK,cAAc,CAAC,MAAM,CAAC;YAC3B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,IAAI,CAAC;YACzB,KAAK,cAAc,CAAC,UAAU,CAAC;YAC/B,KAAK,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAC5B,OAAO,2BAA2B,CAChC,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,CAAC,IAAI,EACjB,oCAAoC,CAAC,YAAY,CAAC,IAAI,CAAC,CACxD,CAAC;aACH;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,CAC3D,oBAAoB,CACrB,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC7D,CAAC;SACL;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;YAC3D,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBACzD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,mBAAmB,CAAC,kBAAkB;YACxC,CAAC,CAAC,iCAAiC,CAAC,kBAAkB,CACzD,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACT,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAgC,CAAC,IAAI;aAChE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;YAC3D,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,mBAAmB,CAAC,kBAAkB;YACxC,CAAC,CAAC,iCAAiC,CAAC,kBAAkB,EACxD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_LessThan.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAK9B,MAAM,qBAAqB,CAAC;AAU7B,qBAAa,mCAAoC,SAAQ,0BAA0B;IACjF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAuCV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_LessThan.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAa7B,qBAAa,mCAAoC,SAAQ,0BAA0B;IACjF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
@@ -14,12 +14,12 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
17
- import { PRIMITIVE_TYPE, isSuperType, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
17
+ import { PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
18
18
  import { UnsupportedOperationError } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
21
21
  import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
22
- import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
22
+ import { getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, } from '../QueryBuilderOperatorsHelper.js';
23
23
  export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOperator {
24
24
  getLabel(filterConditionState) {
25
25
  return '<';
@@ -38,37 +38,10 @@ export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOpera
38
38
  ].includes(propertyType.path);
39
39
  }
40
40
  isCompatibleWithFilterConditionValue(filterConditionState) {
41
- const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
42
- .genericType.value.rawType;
43
- const type = filterConditionState.value
41
+ return isTypeCompatibleWithConditionValueType(filterConditionState.value
44
42
  ? getNonCollectionValueSpecificationType(filterConditionState.value)
45
- : undefined;
46
- const NUMERIC_PRIMITIVE_TYPES = [
47
- PRIMITIVE_TYPE.NUMBER,
48
- PRIMITIVE_TYPE.INTEGER,
49
- PRIMITIVE_TYPE.DECIMAL,
50
- PRIMITIVE_TYPE.FLOAT,
51
- ];
52
- const DATE_PRIMITIVE_TYPES = [
53
- PRIMITIVE_TYPE.DATE,
54
- PRIMITIVE_TYPE.DATETIME,
55
- PRIMITIVE_TYPE.STRICTDATE,
56
- PRIMITIVE_TYPE.LATESTDATE,
57
- ];
58
- // When changing the return type for LHS, the RHS value should be adjusted accordingly.
59
- return (type !== undefined &&
60
- // Numeric value is handled loosely because of autoboxing
61
- // e.g. LHS (integer) = RHS (float) is acceptable
62
- ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
63
- NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
64
- // Date value is handled loosely as well if the LHS is of type DateTime
65
- // This is because we would simulate auto-boxing for date by altering the
66
- // Pure function used for the operation
67
- // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
68
- (propertyType.path === PRIMITIVE_TYPE.DATETIME &&
69
- DATE_PRIMITIVE_TYPES.includes(type.path)) ||
70
- type === propertyType ||
71
- isSuperType(propertyType, type)));
43
+ : undefined, filterConditionState.propertyExpressionState.propertyExpression.func
44
+ .genericType.value.rawType);
72
45
  }
73
46
  getDefaultFilterConditionValue(filterConditionState) {
74
47
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_LessThan.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_LessThan.js","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAK9B,MAAM,qBAAqB,CAAC;AAU7B,qBAAa,wCAAyC,SAAQ,0BAA0B;IACtF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAsCV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.d.ts","sourceRoot":"","sources":["../../../src/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAa7B,qBAAa,wCAAyC,SAAQ,0BAA0B;IACtF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAapC"}
@@ -14,12 +14,12 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
17
- import { PRIMITIVE_TYPE, isSuperType, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
17
+ import { PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
18
18
  import { UnsupportedOperationError } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
21
21
  import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
22
- import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
22
+ import { getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, } from '../QueryBuilderOperatorsHelper.js';
23
23
  export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilterOperator {
24
24
  getLabel(filterConditionState) {
25
25
  return '<=';
@@ -38,36 +38,10 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
38
38
  ].includes(propertyType.path);
39
39
  }
40
40
  isCompatibleWithFilterConditionValue(filterConditionState) {
41
- const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func
42
- .genericType.value.rawType;
43
- const type = filterConditionState.value
41
+ return isTypeCompatibleWithConditionValueType(filterConditionState.value
44
42
  ? getNonCollectionValueSpecificationType(filterConditionState.value)
45
- : undefined;
46
- const NUMERIC_PRIMITIVE_TYPES = [
47
- PRIMITIVE_TYPE.NUMBER,
48
- PRIMITIVE_TYPE.INTEGER,
49
- PRIMITIVE_TYPE.DECIMAL,
50
- PRIMITIVE_TYPE.FLOAT,
51
- ];
52
- const DATE_PRIMITIVE_TYPES = [
53
- PRIMITIVE_TYPE.DATE,
54
- PRIMITIVE_TYPE.DATETIME,
55
- PRIMITIVE_TYPE.STRICTDATE,
56
- PRIMITIVE_TYPE.LATESTDATE,
57
- ];
58
- // When changing the return type for LHS, the RHS value should be adjusted accordingly.
59
- return (type !== undefined &&
60
- // Numeric value is handled loosely because of autoboxing
61
- // e.g. LHS (integer) = RHS (float) is acceptable
62
- ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
63
- NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
64
- // Date value is handled loosely as well if the LHS is of type DateTime
65
- // This is because we would simulate auto-boxing for date by altering the
66
- // Pure function used for the operation
67
- // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
68
- DATE_PRIMITIVE_TYPES.includes(type.path) ||
69
- type === propertyType ||
70
- isSuperType(propertyType, type)));
43
+ : undefined, filterConditionState.propertyExpressionState.propertyExpression.func
44
+ .genericType.value.rawType);
71
45
  }
72
46
  getDefaultFilterConditionValue(filterConditionState) {
73
47
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func