@finos/legend-application-studio 28.18.135 → 28.18.136
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/lib/components/editor/editor-group/uml-editor/ClassQueryBuilder.d.ts.map +1 -1
- package/lib/components/editor/editor-group/uml-editor/ClassQueryBuilder.js +17 -4
- package/lib/components/editor/editor-group/uml-editor/ClassQueryBuilder.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/package.json +8 -8
- package/src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx +24 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClassQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"ClassQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,KAAK,EAeX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,iBAAiB,EAIvB,MAAM,6BAA6B,CAAC;AASrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wDAAwD,CAAC;AAiExG,eAAO,MAAM,sBAAsB,GACjC,aAAa,MAAM,EACnB,cAAc,MAAM,EACpB,2BAA2B,yBAAyB,EACpD,mBAAmB,iBAAiB,KACnC,OAAO,CAAC,IAAI,CA0Dd,CAAC;AAOF,eAAO,MAAM,gBAAgB,WACnB;IACN,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC;IAC1B,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,CACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,KACjB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;;CA4FF,CAAC;AA8GF,eAAO,MAAM,UAAU,GACrB,QAAQ,KAAK,EACb,aAAa,WAAW,KACvB,OAAO,CAAC,IAAI,CA+Bd,CAAC"}
|
|
@@ -14,8 +14,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
|
14
14
|
* See the License for the specific language governing permissions and
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
|
-
import { PackageableElementExplicitReference, PureSingleExecution, Service, ConcreteFunctionDefinition, Multiplicity, resolvePackagePathAndElementName, ELEMENT_PATH_DELIMITER, RawVariableExpression, getFunctionSignature, GenericTypeExplicitReference, GenericType, } from '@finos/legend-graph';
|
|
18
|
-
import { ClassQueryBuilderState, QueryBuilderAdvancedWorkflowState, } from '@finos/legend-query-builder';
|
|
17
|
+
import { PackageableElementExplicitReference, PureSingleExecution, Service, ConcreteFunctionDefinition, Multiplicity, resolvePackagePathAndElementName, ELEMENT_PATH_DELIMITER, RawVariableExpression, getFunctionSignature, GenericTypeExplicitReference, GenericType, CORE_PURE_PATH, requireTypeArugments, } from '@finos/legend-graph';
|
|
18
|
+
import { ClassQueryBuilderState, QueryBuilderAdvancedWorkflowState, QueryBuilderEmbeddedFromExecutionContextState, } from '@finos/legend-query-builder';
|
|
19
19
|
import { assertErrorThrown, guaranteeNonNullable, prettyCONSTName, } from '@finos/legend-shared';
|
|
20
20
|
import { flowResult } from 'mobx';
|
|
21
21
|
import { observer } from 'mobx-react-lite';
|
|
@@ -47,10 +47,23 @@ export const promoteQueryToFunction = async (packagePath, functionName, embedded
|
|
|
47
47
|
const editorStore = embeddedQueryBuilderState.editorStore;
|
|
48
48
|
const applicationStore = editorStore.applicationStore;
|
|
49
49
|
try {
|
|
50
|
-
|
|
50
|
+
let query;
|
|
51
|
+
if (queryBuilderState.executionContextState instanceof
|
|
52
|
+
QueryBuilderEmbeddedFromExecutionContextState) {
|
|
53
|
+
query = queryBuilderState.buildQuery();
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
query = queryBuilderState.buildFromQuery();
|
|
57
|
+
}
|
|
51
58
|
const returnType = queryBuilderState.getQueryReturnType();
|
|
59
|
+
const _genericType = new GenericType(returnType);
|
|
60
|
+
if (requireTypeArugments(returnType)) {
|
|
61
|
+
_genericType.typeArguments = [
|
|
62
|
+
GenericTypeExplicitReference.create(new GenericType(editorStore.graphManagerState.graph.getType(CORE_PURE_PATH.ANY))),
|
|
63
|
+
];
|
|
64
|
+
}
|
|
52
65
|
const _function = new ConcreteFunctionDefinition(functionName, // use functionName for now and it will be reset after composing _function.parameters and _function.returnType
|
|
53
|
-
GenericTypeExplicitReference.create(
|
|
66
|
+
GenericTypeExplicitReference.create(_genericType), Multiplicity.ONE);
|
|
54
67
|
// we will copy the body of the query to the body of the function and extract the parameters out
|
|
55
68
|
// to the function parameters
|
|
56
69
|
_function.expressionSequence = query.body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClassQueryBuilder.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,mCAAmC,EACnC,mBAAmB,EACnB,OAAO,EACP,0BAA0B,EAC1B,YAAY,EACZ,gCAAgC,EAChC,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACpB,4BAA4B,EAC5B,WAAW,
|
|
1
|
+
{"version":3,"file":"ClassQueryBuilder.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx"],"names":[],"mappings":"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"}
|
package/lib/index.css
CHANGED
package/lib/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-application-studio",
|
|
3
|
-
"version": "28.18.
|
|
3
|
+
"version": "28.18.136",
|
|
4
4
|
"description": "Legend Studio application core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -45,13 +45,13 @@
|
|
|
45
45
|
"test:watch": "jest --watch"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@finos/legend-application": "16.0.
|
|
49
|
-
"@finos/legend-art": "7.1.
|
|
50
|
-
"@finos/legend-code-editor": "2.0.
|
|
51
|
-
"@finos/legend-data-cube": "0.2.
|
|
52
|
-
"@finos/legend-graph": "32.1.
|
|
53
|
-
"@finos/legend-lego": "2.0.
|
|
54
|
-
"@finos/legend-query-builder": "4.16.
|
|
48
|
+
"@finos/legend-application": "16.0.48",
|
|
49
|
+
"@finos/legend-art": "7.1.102",
|
|
50
|
+
"@finos/legend-code-editor": "2.0.78",
|
|
51
|
+
"@finos/legend-data-cube": "0.2.10",
|
|
52
|
+
"@finos/legend-graph": "32.1.36",
|
|
53
|
+
"@finos/legend-lego": "2.0.83",
|
|
54
|
+
"@finos/legend-query-builder": "4.16.44",
|
|
55
55
|
"@finos/legend-server-depot": "6.0.92",
|
|
56
56
|
"@finos/legend-server-sdlc": "5.3.58",
|
|
57
57
|
"@finos/legend-server-showcase": "0.2.54",
|
|
@@ -27,11 +27,15 @@ import {
|
|
|
27
27
|
getFunctionSignature,
|
|
28
28
|
GenericTypeExplicitReference,
|
|
29
29
|
GenericType,
|
|
30
|
+
type RawLambda,
|
|
31
|
+
CORE_PURE_PATH,
|
|
32
|
+
requireTypeArugments,
|
|
30
33
|
} from '@finos/legend-graph';
|
|
31
34
|
import {
|
|
32
35
|
type QueryBuilderState,
|
|
33
36
|
ClassQueryBuilderState,
|
|
34
37
|
QueryBuilderAdvancedWorkflowState,
|
|
38
|
+
QueryBuilderEmbeddedFromExecutionContextState,
|
|
35
39
|
} from '@finos/legend-query-builder';
|
|
36
40
|
import {
|
|
37
41
|
assertErrorThrown,
|
|
@@ -116,11 +120,29 @@ export const promoteQueryToFunction = async (
|
|
|
116
120
|
const editorStore = embeddedQueryBuilderState.editorStore;
|
|
117
121
|
const applicationStore = editorStore.applicationStore;
|
|
118
122
|
try {
|
|
119
|
-
|
|
123
|
+
let query: RawLambda;
|
|
124
|
+
if (
|
|
125
|
+
queryBuilderState.executionContextState instanceof
|
|
126
|
+
QueryBuilderEmbeddedFromExecutionContextState
|
|
127
|
+
) {
|
|
128
|
+
query = queryBuilderState.buildQuery();
|
|
129
|
+
} else {
|
|
130
|
+
query = queryBuilderState.buildFromQuery();
|
|
131
|
+
}
|
|
120
132
|
const returnType = queryBuilderState.getQueryReturnType();
|
|
133
|
+
const _genericType = new GenericType(returnType);
|
|
134
|
+
if (requireTypeArugments(returnType)) {
|
|
135
|
+
_genericType.typeArguments = [
|
|
136
|
+
GenericTypeExplicitReference.create(
|
|
137
|
+
new GenericType(
|
|
138
|
+
editorStore.graphManagerState.graph.getType(CORE_PURE_PATH.ANY),
|
|
139
|
+
),
|
|
140
|
+
),
|
|
141
|
+
];
|
|
142
|
+
}
|
|
121
143
|
const _function = new ConcreteFunctionDefinition(
|
|
122
144
|
functionName, // use functionName for now and it will be reset after composing _function.parameters and _function.returnType
|
|
123
|
-
GenericTypeExplicitReference.create(
|
|
145
|
+
GenericTypeExplicitReference.create(_genericType),
|
|
124
146
|
Multiplicity.ONE,
|
|
125
147
|
);
|
|
126
148
|
// we will copy the body of the query to the body of the function and extract the parameters out
|