@finos/legend-query-builder 4.15.16 → 4.15.18
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/__lib__/QueryBuilderTesting.d.ts +1 -0
- package/lib/__lib__/QueryBuilderTesting.d.ts.map +1 -1
- package/lib/__lib__/QueryBuilderTesting.js +1 -0
- package/lib/__lib__/QueryBuilderTesting.js.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderAggParam.d.ts +22 -0
- package/lib/components/fetch-structure/QueryBuilderAggParam.d.ts.map +1 -0
- package/lib/components/fetch-structure/QueryBuilderAggParam.js +59 -0
- package/lib/components/fetch-structure/QueryBuilderAggParam.js.map +1 -0
- package/lib/components/fetch-structure/QueryBuilderTDSPanel.d.ts +4 -0
- package/lib/components/fetch-structure/QueryBuilderTDSPanel.d.ts.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderTDSPanel.js +3 -0
- package/lib/components/fetch-structure/QueryBuilderTDSPanel.js.map +1 -1
- package/lib/graph/QueryBuilderMetaModelConst.d.ts +2 -0
- package/lib/graph/QueryBuilderMetaModelConst.d.ts.map +1 -1
- package/lib/graph/QueryBuilderMetaModelConst.js +2 -0
- package/lib/graph/QueryBuilderMetaModelConst.js.map +1 -1
- package/lib/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.d.ts.map +1 -1
- package/lib/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.js +6 -0
- package/lib/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.js.map +1 -1
- package/lib/index.css +2 -2
- package/lib/index.css.map +1 -1
- package/lib/package.json +1 -1
- package/lib/stores/QueryBuilderStateBuilder.d.ts.map +1 -1
- package/lib/stores/QueryBuilderStateBuilder.js +6 -1
- package/lib/stores/QueryBuilderStateBuilder.js.map +1 -1
- package/lib/stores/QueryBuilderStateHashUtils.d.ts +1 -0
- package/lib/stores/QueryBuilderStateHashUtils.d.ts.map +1 -1
- package/lib/stores/QueryBuilderStateHashUtils.js +1 -0
- package/lib/stores/QueryBuilderStateHashUtils.js.map +1 -1
- package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperatorLoader.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperatorLoader.js +2 -0
- package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperatorLoader.js.map +1 -1
- package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.d.ts +1 -0
- package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.js +26 -1
- package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.js.map +1 -1
- package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Wavg.d.ts +33 -0
- package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Wavg.d.ts.map +1 -0
- package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Wavg.js +78 -0
- package/lib/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Wavg.js.map +1 -0
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.d.ts +2 -0
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js +6 -0
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js.map +1 -1
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.js +29 -1
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.js.map +1 -1
- package/package.json +6 -6
- package/src/__lib__/QueryBuilderTesting.ts +1 -0
- package/src/components/fetch-structure/QueryBuilderAggParam.tsx +122 -0
- package/src/components/fetch-structure/QueryBuilderTDSPanel.tsx +10 -2
- package/src/graph/QueryBuilderMetaModelConst.ts +2 -0
- package/src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts +18 -1
- package/src/stores/QueryBuilderStateBuilder.ts +15 -1
- package/src/stores/QueryBuilderStateHashUtils.ts +1 -0
- package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperatorLoader.ts +2 -0
- package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.ts +69 -0
- package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Wavg.ts +136 -0
- package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts +7 -0
- package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts +37 -0
- package/tsconfig.json +2 -0
package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueryBuilderProjectionColumnState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EACL,KAAK,WAAW,EAMhB,KAAK,QAAQ,EAEb,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,wCAAwC,EAE9C,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAEL,mCAAmC,EACpC,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,IAAI,EACT,KAAK,kBAAkB,EAOvB,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAMvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAGzE,eAAO,MAAM,wCAAwC,sBAAsB,CAAC;AAE5E,MAAM,WAAW,sCAAsC;IACrD,WAAW,EAAE,iCAAiC,CAAC;CAChD;AAED,8BAAsB,iCACpB,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"QueryBuilderProjectionColumnState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"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"}
|
@@ -27,13 +27,16 @@ export const QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE = 'PROJECTION_COLUMN';
|
|
27
27
|
export class QueryBuilderProjectionColumnState extends QueryBuilderTDSColumnState {
|
28
28
|
tdsState;
|
29
29
|
columnName;
|
30
|
+
wavgWeight;
|
30
31
|
constructor(tdsState, columnName) {
|
31
32
|
super();
|
32
33
|
makeObservable(this, {
|
33
34
|
uuid: false,
|
34
35
|
tdsState: false,
|
35
36
|
columnName: observable,
|
37
|
+
wavgWeight: observable,
|
36
38
|
setColumnName: action,
|
39
|
+
setWavgWeight: action,
|
37
40
|
hashCode: computed,
|
38
41
|
});
|
39
42
|
this.tdsState = tdsState;
|
@@ -42,6 +45,9 @@ export class QueryBuilderProjectionColumnState extends QueryBuilderTDSColumnStat
|
|
42
45
|
setColumnName(val) {
|
43
46
|
this.columnName = val;
|
44
47
|
}
|
48
|
+
setWavgWeight(val) {
|
49
|
+
this.wavgWeight = val;
|
50
|
+
}
|
45
51
|
}
|
46
52
|
export class QueryBuilderSimpleProjectionColumnState extends QueryBuilderProjectionColumnState {
|
47
53
|
lambdaParameterName = DEFAULT_LAMBDA_VARIABLE_NAME;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueryBuilderProjectionColumnState.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,MAAM,EACN,cAAc,EACd,UAAU,EACV,IAAI,EACJ,QAAQ,EACR,UAAU,GACX,MAAM,MAAM,CAAC;AACd,OAAO,EAEL,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EAEpB,SAAS,EACT,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,+CAA+C,GAChD,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,mCAAmC,GACpC,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAIL,mCAAmC,EACnC,mBAAmB,EACnB,8BAA8B,EAC9B,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,cAAc,EACd,YAAY,EACZ,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,kCAAkC,EAAE,MAAM,kDAAkD,CAAC;AAEtG,MAAM,CAAC,MAAM,wCAAwC,GAAG,mBAAmB,CAAC;AAM5E,MAAM,OAAgB,iCACpB,SAAQ,0BAA0B;IAGlC,QAAQ,CAAuB;IAC/B,UAAU,CAAS;
|
1
|
+
{"version":3,"file":"QueryBuilderProjectionColumnState.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,cAAc,
|
1
|
+
{"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,cAAc,EAepB,MAAM,qBAAqB,CAAC;AAU7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAOvE,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,yDAAyD,CAAC;AAiMjE,eAAO,MAAM,gBAAgB,aACjB,oBAAoB,kBACd,cAAc,YACpB,2BAA2B,KACpC,IAgTF,CAAC"}
|
package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.js
CHANGED
@@ -13,7 +13,7 @@
|
|
13
13
|
* See the License for the specific language governing permissions and
|
14
14
|
* limitations under the License.
|
15
15
|
*/
|
16
|
-
import { CollectionInstanceValue, extractElementNameFromPath, GenericType, GenericTypeExplicitReference, PrimitiveInstanceValue, SimpleFunctionExpression, INTERNAL__UnknownValueSpecification, V1_serializeRawValueSpecification, V1_transformRawLambda, V1_GraphTransformerContextBuilder, matchFunctionName, PrimitiveType, } from '@finos/legend-graph';
|
16
|
+
import { CollectionInstanceValue, extractElementNameFromPath, GenericType, GenericTypeExplicitReference, PrimitiveInstanceValue, SimpleFunctionExpression, INTERNAL__UnknownValueSpecification, V1_serializeRawValueSpecification, V1_transformRawLambda, V1_GraphTransformerContextBuilder, matchFunctionName, PrimitiveType, LambdaFunctionInstanceValue, } from '@finos/legend-graph';
|
17
17
|
import { guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
|
18
18
|
import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, } from './QueryBuilderProjectionColumnState.js';
|
19
19
|
import {} from '../QueryResultSetModifierState.js';
|
@@ -24,6 +24,7 @@ import { appendOLAPGroupByState } from '../window/QueryBuilderWindowValueSpecifi
|
|
24
24
|
import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
|
25
25
|
import { buildTDSSortTypeExpression } from '../QueryBuilderTDSHelper.js';
|
26
26
|
import { buildRelationProjection } from './QueryBuilderRelationProjectValueSpecBuidler.js';
|
27
|
+
import { QueryBuilderAggregateOperator_Wavg } from '../aggregation/operators/QueryBuilderAggregateOperator_Wavg.js';
|
27
28
|
const buildSortExpression = (sortColumnState) => buildTDSSortTypeExpression(sortColumnState.sortType, sortColumnState.columnState.columnName);
|
28
29
|
const appendResultSetModifier = (resultModifierState, lambdaFunction, options) => {
|
29
30
|
if (lambdaFunction.expressionSequence.length === 1) {
|
@@ -156,6 +157,10 @@ export const appendProjection = (tdsState, lambdaFunction, options) => {
|
|
156
157
|
}
|
157
158
|
// column aggregation
|
158
159
|
if (aggregateColumnState) {
|
160
|
+
if (aggregateColumnState.operator instanceof
|
161
|
+
QueryBuilderAggregateOperator_Wavg) {
|
162
|
+
aggregateColumnState.setLambdaParameterName('y');
|
163
|
+
}
|
159
164
|
const aggregateFunctionExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_AGG));
|
160
165
|
const aggregateLambda = buildGenericLambdaFunctionInstanceValue(aggregateColumnState.lambdaParameterName, [
|
161
166
|
aggregateColumnState.operator.buildAggregateExpressionFromState(aggregateColumnState),
|
@@ -169,6 +174,29 @@ export const appendProjection = (tdsState, lambdaFunction, options) => {
|
|
169
174
|
.lambdaParameterName, [aggregateCalendarLambdaState], aggregateColumnState.aggregationState.tdsState.queryBuilderState
|
170
175
|
.graphManagerState.graph);
|
171
176
|
}
|
177
|
+
//TODO support wavg on non SimpleProjectionColumnStates as well
|
178
|
+
if (aggregateColumnState.operator instanceof
|
179
|
+
QueryBuilderAggregateOperator_Wavg &&
|
180
|
+
aggregateColumnState.operator.weight &&
|
181
|
+
aggregateColumnState.projectionColumnState instanceof
|
182
|
+
QueryBuilderSimpleProjectionColumnState &&
|
183
|
+
columnLambda instanceof LambdaFunctionInstanceValue) {
|
184
|
+
//build row mapper
|
185
|
+
const wavgRowMapper = new SimpleFunctionExpression(QUERY_BUILDER_SUPPORTED_FUNCTIONS.WAVG_ROW_MAPPER);
|
186
|
+
//add params
|
187
|
+
const quantity = aggregateColumnState.projectionColumnState.propertyExpressionState
|
188
|
+
.propertyExpression;
|
189
|
+
const weight = aggregateColumnState.operator.weight;
|
190
|
+
wavgRowMapper.parametersValues = [quantity, weight];
|
191
|
+
if (aggregateCalendarLambda &&
|
192
|
+
aggregateCalendarLambda instanceof LambdaFunctionInstanceValue) {
|
193
|
+
aggregateCalendarLambda.values[0].expressionSequence[0] =
|
194
|
+
wavgRowMapper;
|
195
|
+
}
|
196
|
+
else if (columnLambda instanceof LambdaFunctionInstanceValue) {
|
197
|
+
columnLambda.values[0].expressionSequence[0] = wavgRowMapper;
|
198
|
+
}
|
199
|
+
}
|
172
200
|
aggregateFunctionExpression.parametersValues = [
|
173
201
|
aggregateCalendarLambda ?? columnLambda,
|
174
202
|
aggregateLambda,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@finos/legend-query-builder",
|
3
|
-
"version": "4.15.
|
3
|
+
"version": "4.15.18",
|
4
4
|
"description": "Legend query builder core",
|
5
5
|
"keywords": [
|
6
6
|
"legend",
|
@@ -44,11 +44,11 @@
|
|
44
44
|
"dependencies": {
|
45
45
|
"@finos/legend-application": "16.0.10",
|
46
46
|
"@finos/legend-art": "7.1.68",
|
47
|
-
"@finos/legend-code-editor": "2.0.
|
48
|
-
"@finos/legend-data-cube": "0.0.
|
49
|
-
"@finos/legend-graph": "31.10.
|
50
|
-
"@finos/legend-lego": "2.0.
|
51
|
-
"@finos/legend-server-depot": "6.0.
|
47
|
+
"@finos/legend-code-editor": "2.0.19",
|
48
|
+
"@finos/legend-data-cube": "0.0.24",
|
49
|
+
"@finos/legend-graph": "31.10.53",
|
50
|
+
"@finos/legend-lego": "2.0.21",
|
51
|
+
"@finos/legend-server-depot": "6.0.70",
|
52
52
|
"@finos/legend-shared": "10.0.61",
|
53
53
|
"@finos/legend-storage": "3.0.112",
|
54
54
|
"@testing-library/dom": "10.4.0",
|
@@ -47,6 +47,7 @@ export enum QUERY_BUILDER_TEST_ID {
|
|
47
47
|
QUERY_BUILDER_EXPLORER = 'query__builder__explorer',
|
48
48
|
QUERY_BUILDER_PROPERTY_SEARCH_PANEL = 'query__builder__property__search__panel',
|
49
49
|
QUERY_BUILDER_PERCENTILE_PANEL = 'query__builder__percentile__panel',
|
50
|
+
QUERY_BUILDER_WAVG_DROPZONE = 'query__builder__wavg__dropzone',
|
50
51
|
//preview data modal
|
51
52
|
QUERY_BUILDER_PREVIEW_DATA_MODAL = 'query__builder__preview-data__modal',
|
52
53
|
// parameter panel
|
@@ -0,0 +1,122 @@
|
|
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
|
+
|
17
|
+
import { QueryBuilderSimpleProjectionColumnState } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
|
18
|
+
import { useDragLayer, useDrop } from 'react-dnd';
|
19
|
+
import {
|
20
|
+
ExclamationCircleIcon,
|
21
|
+
PanelEntryDropZonePlaceholder,
|
22
|
+
} from '@finos/legend-art';
|
23
|
+
import {
|
24
|
+
QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
|
25
|
+
buildPropertyExpressionFromExplorerTreeNodeData,
|
26
|
+
type QueryBuilderExplorerTreeDragSource,
|
27
|
+
} from '../../stores/explorer/QueryBuilderExplorerState.js';
|
28
|
+
import { type QueryBuilderTDSPanelDropTarget } from './QueryBuilderTDSPanel.js';
|
29
|
+
import { QueryBuilderAggregateOperator_Wavg } from '../../stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Wavg.js';
|
30
|
+
import type { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
|
31
|
+
import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
|
32
|
+
|
33
|
+
export const WavgParamDNDZone = (props: {
|
34
|
+
column: QueryBuilderAggregateOperator_Wavg;
|
35
|
+
tdsState: QueryBuilderTDSState;
|
36
|
+
}): React.ReactNode => {
|
37
|
+
const { column, tdsState } = props;
|
38
|
+
|
39
|
+
const handleDrop = (item: QueryBuilderTDSPanelDropTarget): void => {
|
40
|
+
const projectionColumnState = new QueryBuilderSimpleProjectionColumnState(
|
41
|
+
tdsState,
|
42
|
+
buildPropertyExpressionFromExplorerTreeNodeData(
|
43
|
+
(item as QueryBuilderExplorerTreeDragSource).node,
|
44
|
+
tdsState.queryBuilderState.explorerState,
|
45
|
+
),
|
46
|
+
tdsState.queryBuilderState.explorerState.humanizePropertyName,
|
47
|
+
);
|
48
|
+
if (
|
49
|
+
column instanceof QueryBuilderAggregateOperator_Wavg &&
|
50
|
+
column.isCompatibleWithColumn(projectionColumnState)
|
51
|
+
) {
|
52
|
+
column.setWeight(
|
53
|
+
projectionColumnState.propertyExpressionState.propertyExpression,
|
54
|
+
);
|
55
|
+
}
|
56
|
+
};
|
57
|
+
|
58
|
+
const [{ isDragOver }, dropWavgParam] = useDrop<
|
59
|
+
QueryBuilderTDSPanelDropTarget,
|
60
|
+
void,
|
61
|
+
{ isDragOver: boolean }
|
62
|
+
>(
|
63
|
+
() => ({
|
64
|
+
accept: QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
|
65
|
+
drop: (item, monitor): void => {
|
66
|
+
handleDrop(item);
|
67
|
+
},
|
68
|
+
collect: (monitor) => ({
|
69
|
+
isDragOver: monitor.isOver({ shallow: true }),
|
70
|
+
}),
|
71
|
+
}),
|
72
|
+
[handleDrop],
|
73
|
+
);
|
74
|
+
|
75
|
+
const { isDroppable } = useDragLayer((monitor) => ({
|
76
|
+
isDroppable:
|
77
|
+
monitor.isDragging() &&
|
78
|
+
QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY.includes(
|
79
|
+
monitor.getItemType()?.toString() ?? '',
|
80
|
+
),
|
81
|
+
}));
|
82
|
+
|
83
|
+
const weightIsSet = () => column.weight !== undefined;
|
84
|
+
|
85
|
+
const getWeightName = (): string => {
|
86
|
+
if (column instanceof QueryBuilderAggregateOperator_Wavg) {
|
87
|
+
return column.weight?.func.value.name ?? '';
|
88
|
+
} else {
|
89
|
+
return '';
|
90
|
+
}
|
91
|
+
};
|
92
|
+
|
93
|
+
return (
|
94
|
+
<div
|
95
|
+
data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_WAVG_DROPZONE}
|
96
|
+
ref={dropWavgParam}
|
97
|
+
>
|
98
|
+
<div>
|
99
|
+
<PanelEntryDropZonePlaceholder
|
100
|
+
isDragOver={isDragOver}
|
101
|
+
isDroppable={isDroppable}
|
102
|
+
label="Drop Numeric Property"
|
103
|
+
>
|
104
|
+
<div
|
105
|
+
className={
|
106
|
+
weightIsSet()
|
107
|
+
? 'query-builder__projection__column__aggregate__operator__percentile__badge'
|
108
|
+
: 'query-builder__projection__column__aggregate__operator__percentile__badge__unset'
|
109
|
+
}
|
110
|
+
>
|
111
|
+
{!weightIsSet() && (
|
112
|
+
<>
|
113
|
+
<ExclamationCircleIcon /> Drop weight value{' '}
|
114
|
+
</>
|
115
|
+
)}
|
116
|
+
{weightIsSet() && getWeightName()}
|
117
|
+
</div>
|
118
|
+
</PanelEntryDropZonePlaceholder>
|
119
|
+
</div>
|
120
|
+
</div>
|
121
|
+
);
|
122
|
+
};
|
@@ -127,6 +127,8 @@ import {
|
|
127
127
|
} from '../../stores/filter/QueryBuilderFilterState.js';
|
128
128
|
import { cloneAbstractPropertyExpression } from '../../stores/shared/ValueSpecificationEditorHelper.js';
|
129
129
|
import { buildPropertyExpressionFromExistsNode } from '../filter/QueryBuilderFilterPanel.js';
|
130
|
+
import { QueryBuilderAggregateOperator_Wavg } from '../../stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Wavg.js';
|
131
|
+
import { WavgParamDNDZone } from './QueryBuilderAggParam.js';
|
130
132
|
|
131
133
|
const CAN_DROP_MAIN_GROUP_DND_TYPES = [
|
132
134
|
QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
|
@@ -143,8 +145,7 @@ const CAN_DROP_DERIVATION_PROJECTION_COLUMN_DND_TYPES = [
|
|
143
145
|
QUERY_BUILDER_VARIABLE_DND_TYPE,
|
144
146
|
QUERY_BUILDER_FUNCTION_DND_TYPE,
|
145
147
|
];
|
146
|
-
|
147
|
-
type QueryBuilderTDSPanelDropTarget =
|
148
|
+
export type QueryBuilderTDSPanelDropTarget =
|
148
149
|
| QueryBuilderExplorerTreeDragSource
|
149
150
|
| QueryBuilderFunctionsExplorerDragSource
|
150
151
|
| QueryBuilderFilterConditionDragSource;
|
@@ -899,6 +900,13 @@ const QueryBuilderProjectionColumnEditor = observer(
|
|
899
900
|
{aggregateColumnState.operator.getLabel(
|
900
901
|
projectionColumnState,
|
901
902
|
)}
|
903
|
+
{aggregateColumnState.operator instanceof
|
904
|
+
QueryBuilderAggregateOperator_Wavg && (
|
905
|
+
<WavgParamDNDZone
|
906
|
+
column={aggregateColumnState.operator}
|
907
|
+
tdsState={tdsState}
|
908
|
+
/>
|
909
|
+
)}
|
902
910
|
{aggregateColumnState.operator instanceof
|
903
911
|
QueryBuilderAggregateOperator_Percentile && (
|
904
912
|
<button
|
@@ -147,6 +147,8 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
|
|
147
147
|
STD_DEV_SAMPLE = 'meta::pure::functions::math::stdDevSample',
|
148
148
|
SUM = 'meta::pure::functions::math::sum',
|
149
149
|
UNIQUE_VALUE_ONLY = 'meta::pure::functions::collection::uniqueValueOnly',
|
150
|
+
WAVG = 'meta::pure::functions::math::wavg',
|
151
|
+
WAVG_ROW_MAPPER = 'meta::pure::functions::math::wavgUtility::wavgRowMapper',
|
150
152
|
|
151
153
|
// watermark
|
152
154
|
WATERMARK = 'meta::datalake::functions::forWatermark',
|
@@ -86,7 +86,6 @@ const buildProjectionColumnLambda = (
|
|
86
86
|
V1_Lambda,
|
87
87
|
`Can't build projection column: only support lambda`,
|
88
88
|
);
|
89
|
-
|
90
89
|
// lambda parameter
|
91
90
|
assertTrue(
|
92
91
|
valueSpecification.parameters.length === 1,
|
@@ -106,6 +105,24 @@ const buildProjectionColumnLambda = (
|
|
106
105
|
let currentPropertyExpression: V1_ValueSpecification = valueSpecification
|
107
106
|
.body[0] as V1_ValueSpecification;
|
108
107
|
|
108
|
+
//catch if wavg row mapper
|
109
|
+
if (
|
110
|
+
currentPropertyExpression instanceof V1_AppliedFunction &&
|
111
|
+
currentPropertyExpression.parameters.length === 2 &&
|
112
|
+
matchFunctionName(
|
113
|
+
currentPropertyExpression.function,
|
114
|
+
QUERY_BUILDER_SUPPORTED_FUNCTIONS.WAVG_ROW_MAPPER,
|
115
|
+
)
|
116
|
+
) {
|
117
|
+
return valueSpecification.accept_ValueSpecificationVisitor(
|
118
|
+
new V1_ValueSpecificationBuilder(
|
119
|
+
compileContext,
|
120
|
+
processingContext,
|
121
|
+
openVariables,
|
122
|
+
),
|
123
|
+
);
|
124
|
+
}
|
125
|
+
|
109
126
|
assertType(
|
110
127
|
currentPropertyExpression,
|
111
128
|
V1_AppliedProperty,
|
@@ -60,6 +60,7 @@ import { processFilterExpression } from './filter/QueryBuilderFilterStateBuilder
|
|
60
60
|
import {
|
61
61
|
processTDSAggregateExpression,
|
62
62
|
processTDSGroupByExpression,
|
63
|
+
processWAVGRowMapperExpression,
|
63
64
|
} from './fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.js';
|
64
65
|
import {
|
65
66
|
processGraphFetchExpression,
|
@@ -834,6 +835,19 @@ export class QueryBuilderValueSpecificationProcessor
|
|
834
835
|
this.queryBuilderState,
|
835
836
|
);
|
836
837
|
return;
|
838
|
+
} else if (
|
839
|
+
matchFunctionName(
|
840
|
+
functionName,
|
841
|
+
QUERY_BUILDER_SUPPORTED_FUNCTIONS.WAVG_ROW_MAPPER,
|
842
|
+
)
|
843
|
+
) {
|
844
|
+
processWAVGRowMapperExpression(
|
845
|
+
valueSpecification,
|
846
|
+
this.parentExpression,
|
847
|
+
this.queryBuilderState,
|
848
|
+
this.parentLambda,
|
849
|
+
);
|
850
|
+
return;
|
837
851
|
}
|
838
852
|
throw new UnsupportedOperationError(
|
839
853
|
`Can't process expression of function ${functionName}()`,
|
@@ -851,13 +865,13 @@ export class QueryBuilderValueSpecificationProcessor
|
|
851
865
|
this.parentExpression,
|
852
866
|
`Can't process property expression: parent expression cannot be retrieved`,
|
853
867
|
);
|
854
|
-
|
855
868
|
if (
|
856
869
|
matchFunctionName(this.parentExpression.functionName, [
|
857
870
|
QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
|
858
871
|
QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_PROJECT,
|
859
872
|
QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
|
860
873
|
QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_AGG,
|
874
|
+
QUERY_BUILDER_SUPPORTED_FUNCTIONS.WAVG_ROW_MAPPER,
|
861
875
|
...Object.values(
|
862
876
|
QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS,
|
863
877
|
),
|
@@ -31,6 +31,7 @@ export enum QUERY_BUILDER_STATE_HASH_STRUCTURE {
|
|
31
31
|
AGGREGATE_OPERATOR_STD_DEV_POPULATION = 'AGGREGATE_OPERATOR_STD_DEV_POPULATION',
|
32
32
|
AGGREGATE_OPERATOR_STD_DEV_SAMPLE = 'AGGREGATE_OPERATOR_STD_DEV_SAMPLE',
|
33
33
|
AGGREGATE_OPERATOR_SUM = 'AGGREGATE_OPERATOR_SUM',
|
34
|
+
AGGREGATE_OPERATOR_WAVG = 'AGGREGATE_OPERATOR_WAVG',
|
34
35
|
AGGREGATE_COLUMN_STATE = 'AGGREGATE_COLUMN_STATE',
|
35
36
|
AGGREGATE_OPERATOR_PERCENTILE = 'AGGREGATE_OPERATOR_PERCENTILE',
|
36
37
|
AGGREGATION_STATE = 'AGGREGATION_STATE',
|
@@ -26,6 +26,7 @@ import { QueryBuilderAggregateOperator_Max } from './operators/QueryBuilderAggre
|
|
26
26
|
import { QueryBuilderAggregateOperator_JoinString } from './operators/QueryBuilderAggregateOperator_JoinString.js';
|
27
27
|
import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
|
28
28
|
import { QueryBuilderAggregateOperator_Percentile } from './operators/QueryBuilderAggregateOperator_Percentile.js';
|
29
|
+
import { QueryBuilderAggregateOperator_Wavg } from './operators/QueryBuilderAggregateOperator_Wavg.js';
|
29
30
|
|
30
31
|
export const getQueryBuilderCoreAggregrationOperators =
|
31
32
|
(): QueryBuilderAggregateOperator[] => [
|
@@ -40,4 +41,5 @@ export const getQueryBuilderCoreAggregrationOperators =
|
|
40
41
|
new QueryBuilderAggregateOperator_StdDev_Population(),
|
41
42
|
new QueryBuilderAggregateOperator_StdDev_Sample(),
|
42
43
|
new QueryBuilderAggregateOperator_JoinString(),
|
44
|
+
new QueryBuilderAggregateOperator_Wavg(),
|
43
45
|
];
|
@@ -21,6 +21,7 @@ import {
|
|
21
21
|
matchFunctionName,
|
22
22
|
SimpleFunctionExpression,
|
23
23
|
VariableExpression,
|
24
|
+
AbstractPropertyExpression,
|
24
25
|
} from '@finos/legend-graph';
|
25
26
|
import {
|
26
27
|
assertTrue,
|
@@ -41,6 +42,8 @@ import { extractNullableStringFromInstanceValue } from '../../../QueryBuilderVal
|
|
41
42
|
import { FETCH_STRUCTURE_IMPLEMENTATION } from '../../QueryBuilderFetchStructureImplementationState.js';
|
42
43
|
import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
|
43
44
|
|
45
|
+
import { QueryBuilderAggregateOperator_Wavg } from './operators/QueryBuilderAggregateOperator_Wavg.js';
|
46
|
+
|
44
47
|
export const processTDSAggregateExpression = (
|
45
48
|
expression: SimpleFunctionExpression,
|
46
49
|
parentExpression: SimpleFunctionExpression | undefined,
|
@@ -151,6 +154,16 @@ export const processTDSAggregateExpression = (
|
|
151
154
|
projectionColumnState,
|
152
155
|
),
|
153
156
|
);
|
157
|
+
if (
|
158
|
+
projectionColumnState.wavgWeight &&
|
159
|
+
aggregateColumnState &&
|
160
|
+
aggregateColumnState.operator instanceof
|
161
|
+
QueryBuilderAggregateOperator_Wavg
|
162
|
+
) {
|
163
|
+
aggregateColumnState.operator.setWeight(
|
164
|
+
projectionColumnState.wavgWeight,
|
165
|
+
);
|
166
|
+
}
|
154
167
|
if (aggregateColumnState) {
|
155
168
|
aggregationState.addColumn(aggregateColumnState);
|
156
169
|
if (
|
@@ -181,6 +194,62 @@ export const processTDSAggregateExpression = (
|
|
181
194
|
}
|
182
195
|
};
|
183
196
|
|
197
|
+
export const processWAVGRowMapperExpression = (
|
198
|
+
expression: SimpleFunctionExpression,
|
199
|
+
parentExpression: SimpleFunctionExpression | undefined,
|
200
|
+
queryBuilderState: QueryBuilderState,
|
201
|
+
parentLambda: LambdaFunction,
|
202
|
+
): void => {
|
203
|
+
// check parent expression is agg
|
204
|
+
assertTrue(
|
205
|
+
Boolean(
|
206
|
+
parentExpression &&
|
207
|
+
matchFunctionName(
|
208
|
+
parentExpression.functionName,
|
209
|
+
QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_AGG,
|
210
|
+
),
|
211
|
+
),
|
212
|
+
`Can't process wavgRowMapper() expression: only support wavgRowMapper() used within an agg() expression`,
|
213
|
+
);
|
214
|
+
|
215
|
+
// check number of parameters
|
216
|
+
assertTrue(
|
217
|
+
expression.parametersValues.length === 2,
|
218
|
+
`Can't process wavgRowMapper() expression: wavgRowMapper() expects 2 arguments`,
|
219
|
+
);
|
220
|
+
|
221
|
+
//checking type of parameters
|
222
|
+
const wavgInput = expression.parametersValues;
|
223
|
+
wavgInput.map((p) =>
|
224
|
+
assertType(
|
225
|
+
p,
|
226
|
+
AbstractPropertyExpression,
|
227
|
+
`Can't process wavgRowMapper() expression: wavgRowMapper() expects arguments to be Property Expressions`,
|
228
|
+
),
|
229
|
+
);
|
230
|
+
|
231
|
+
QueryBuilderValueSpecificationProcessor.processChild(
|
232
|
+
guaranteeNonNullable(expression.parametersValues[0]),
|
233
|
+
expression,
|
234
|
+
parentLambda,
|
235
|
+
queryBuilderState,
|
236
|
+
);
|
237
|
+
|
238
|
+
//setting weight here then build when agg is built
|
239
|
+
if (
|
240
|
+
queryBuilderState.fetchStructureState.implementation instanceof
|
241
|
+
QueryBuilderTDSState
|
242
|
+
) {
|
243
|
+
const tdsState = queryBuilderState.fetchStructureState.implementation;
|
244
|
+
const projectionColumnState = guaranteeNonNullable(
|
245
|
+
tdsState.projectionColumns[tdsState.projectionColumns.length - 1],
|
246
|
+
);
|
247
|
+
projectionColumnState.setWavgWeight(
|
248
|
+
expression.parametersValues[1] as AbstractPropertyExpression,
|
249
|
+
);
|
250
|
+
}
|
251
|
+
};
|
252
|
+
|
184
253
|
export const processTDSGroupByExpression = (
|
185
254
|
expression: SimpleFunctionExpression,
|
186
255
|
queryBuilderState: QueryBuilderState,
|