@finos/legend-application-studio 28.2.4 → 28.2.5

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.
@@ -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,EASX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,iBAAiB,EAEvB,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,gBACpB,MAAM,gBACL,MAAM,6BACO,yBAAyB,qBACjC,iBAAiB,KACnC,QAAQ,IAAI,CAsCd,CAAC;AAOF,eAAO,MAAM,gBAAgB;YAEjB,KAAK,GAAG,SAAS;WAClB,MAAM,IAAI;eACN,OAAO;qCAEH,MAAM,gBACL,MAAM,KACjB,QAAQ,IAAI,CAAC;iBACL,OAAO;;;CA6FvB,CAAC;AA8GF,eAAO,MAAM,UAAU,WACb,KAAK,eACA,WAAW,KACvB,QAAQ,IAAI,CA4Bd,CAAC"}
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,EAUX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,iBAAiB,EAEvB,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,gBACpB,MAAM,gBACL,MAAM,6BACO,yBAAyB,qBACjC,iBAAiB,KACnC,QAAQ,IAAI,CAwCd,CAAC;AAOF,eAAO,MAAM,gBAAgB;YAEjB,KAAK,GAAG,SAAS;WAClB,MAAM,IAAI;eACN,OAAO;qCAEH,MAAM,gBACL,MAAM,KACjB,QAAQ,IAAI,CAAC;iBACL,OAAO;;;CA6FvB,CAAC;AA8GF,eAAO,MAAM,UAAU,WACb,KAAK,eACA,WAAW,KACvB,QAAQ,IAAI,CA4Bd,CAAC"}
@@ -14,7 +14,7 @@ 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, } from '@finos/legend-graph';
17
+ import { PackageableElementExplicitReference, PureSingleExecution, Service, ConcreteFunctionDefinition, Multiplicity, resolvePackagePathAndElementName, ELEMENT_PATH_DELIMITER, RawVariableExpression, getFunctionSignature, } from '@finos/legend-graph';
18
18
  import { ClassQueryBuilderState, } from '@finos/legend-query-builder';
19
19
  import { assertErrorThrown, guaranteeNonNullable, prettyCONSTName, } from '@finos/legend-shared';
20
20
  import { flowResult } from 'mobx';
@@ -49,12 +49,15 @@ export const promoteQueryToFunction = async (packagePath, functionName, embedded
49
49
  try {
50
50
  const query = queryBuilderState.buildFromQuery();
51
51
  const returnType = queryBuilderState.getQueryReturnType();
52
- const _function = new ConcreteFunctionDefinition(functionName, PackageableElementExplicitReference.create(returnType), Multiplicity.ONE);
52
+ const _function = new ConcreteFunctionDefinition(functionName, // use functionName for now and it will be reset after composing _function.parameters and _function.returnType
53
+ PackageableElementExplicitReference.create(returnType), Multiplicity.ONE);
53
54
  // we will copy the body of the query to the body of the function and extract the parameters out
54
55
  // to the function parameters
55
56
  _function.expressionSequence = query.body;
56
57
  _function.parameters =
57
58
  queryBuilderState.parametersState.parameterStates.map((e) => new RawVariableExpression(e.parameter.name, e.parameter.multiplicity, PackageableElementExplicitReference.create(guaranteeNonNullable(e.parameter.genericType?.value.rawType))));
59
+ // reset function name to be function signature
60
+ _function.name = functionName + getFunctionSignature(_function);
58
61
  await flowResult(editorStore.graphEditorMode.addElement(_function, packagePath, true));
59
62
  await flowResult(embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration(undefined)).catch(applicationStore.alertUnhandledError);
60
63
  applicationStore.notificationService.notifySuccess(`Function '${_function.name}' created`);
@@ -1 +1 @@
1
- {"version":3,"file":"ClassQueryBuilder.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx"],"names":[],"mappings":"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"}
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
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-application-studio v28.2.4
1
+ /** @license @finos/legend-application-studio v28.2.5
2
2
  * Copyright (c) 2020-present, Goldman Sachs
3
3
  *
4
4
  * Licensed under the Apache License, Version 2.0 (the "License");
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-application-studio",
3
- "version": "28.2.4",
3
+ "version": "28.2.5",
4
4
  "description": "Legend Studio application core",
5
5
  "keywords": [
6
6
  "legend",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-application-studio",
3
- "version": "28.2.4",
3
+ "version": "28.2.5",
4
4
  "description": "Legend Studio application core",
5
5
  "keywords": [
6
6
  "legend",
@@ -47,9 +47,9 @@
47
47
  "dependencies": {
48
48
  "@finos/legend-application": "15.0.36",
49
49
  "@finos/legend-art": "7.0.36",
50
- "@finos/legend-graph": "31.1.4",
51
- "@finos/legend-lego": "1.1.20",
52
- "@finos/legend-query-builder": "4.3.2",
50
+ "@finos/legend-graph": "31.1.5",
51
+ "@finos/legend-lego": "1.1.21",
52
+ "@finos/legend-query-builder": "4.3.3",
53
53
  "@finos/legend-server-depot": "6.0.24",
54
54
  "@finos/legend-server-sdlc": "5.0.26",
55
55
  "@finos/legend-server-showcase": "0.0.6",
@@ -24,6 +24,7 @@ import {
24
24
  resolvePackagePathAndElementName,
25
25
  ELEMENT_PATH_DELIMITER,
26
26
  RawVariableExpression,
27
+ getFunctionSignature,
27
28
  } from '@finos/legend-graph';
28
29
  import {
29
30
  type QueryBuilderState,
@@ -115,7 +116,7 @@ export const promoteQueryToFunction = async (
115
116
  const query = queryBuilderState.buildFromQuery();
116
117
  const returnType = queryBuilderState.getQueryReturnType();
117
118
  const _function = new ConcreteFunctionDefinition(
118
- functionName,
119
+ functionName, // use functionName for now and it will be reset after composing _function.parameters and _function.returnType
119
120
  PackageableElementExplicitReference.create(returnType),
120
121
  Multiplicity.ONE,
121
122
  );
@@ -133,6 +134,8 @@ export const promoteQueryToFunction = async (
133
134
  ),
134
135
  ),
135
136
  );
137
+ // reset function name to be function signature
138
+ _function.name = functionName + getFunctionSignature(_function);
136
139
  await flowResult(
137
140
  editorStore.graphEditorMode.addElement(_function, packagePath, true),
138
141
  );