@finos/legend-application-studio 28.1.4 → 28.2.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.
- package/lib/components/editor/__test-utils__/EditorComponentTestUtils.d.ts +0 -1
- package/lib/components/editor/__test-utils__/EditorComponentTestUtils.d.ts.map +1 -1
- package/lib/components/editor/__test-utils__/EditorComponentTestUtils.js +1 -3
- package/lib/components/editor/__test-utils__/EditorComponentTestUtils.js.map +1 -1
- package/lib/components/editor/editor-group/FunctionEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/FunctionEditor.js +43 -6
- package/lib/components/editor/editor-group/FunctionEditor.js.map +1 -1
- package/lib/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.js +4 -9
- package/lib/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.js +36 -47
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.js.map +1 -1
- package/lib/components/editor/editor-group/uml-editor/ClassQueryBuilder.js +6 -6
- package/lib/components/editor/editor-group/uml-editor/ClassQueryBuilder.js.map +1 -1
- package/lib/components/editor/side-bar/Explorer.js +1 -1
- package/lib/components/editor/side-bar/Explorer.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/lib/stores/editor/EditorGraphState.d.ts.map +1 -1
- package/lib/stores/editor/EditorGraphState.js +3 -27
- package/lib/stores/editor/EditorGraphState.js.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/FunctionEditorState.d.ts +1 -0
- package/lib/stores/editor/editor-state/element-editor-state/FunctionEditorState.d.ts.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/FunctionEditorState.js +16 -2
- package/lib/stores/editor/editor-state/element-editor-state/FunctionEditorState.js.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.d.ts.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.js.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.d.ts.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.js +5 -3
- package/lib/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.js.map +1 -1
- package/lib/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.d.ts.map +1 -1
- package/lib/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.js +0 -11
- package/lib/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.js.map +1 -1
- package/package.json +6 -6
- package/src/components/editor/__test-utils__/EditorComponentTestUtils.tsx +0 -7
- package/src/components/editor/editor-group/FunctionEditor.tsx +100 -2
- package/src/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.tsx +11 -18
- package/src/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.tsx +69 -83
- package/src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx +6 -6
- package/src/components/editor/side-bar/Explorer.tsx +1 -1
- package/src/stores/editor/EditorGraphState.ts +10 -53
- package/src/stores/editor/editor-state/element-editor-state/FunctionEditorState.ts +29 -0
- package/src/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.ts +1 -2
- package/src/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.ts +6 -2
- package/src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts +0 -16
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MappingExecutionQueryBuilderState.js","sourceRoot":"","sources":["../../../../../../src/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,mDAAmD,EAAE,MAAM,8FAA8F,CAAC;AAEnK,MAAM,OAAO,iCAAkC,SAAQ,iBAAiB;IAC7D,gBAAgB,CAAU;IAE1B,oCAAoC,GAAG,GAAoB,EAAE,CACpE,mDAAmD,CAAC,IAAI,CAAC,CAAC;IAE5D,YACE,gBAA+C,EAC/C,iBAAoC,EACpC,OAAgB;QAEhB,KAAK,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MappingExecutionQueryBuilderState.js","sourceRoot":"","sources":["../../../../../../src/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,mDAAmD,EAAE,MAAM,8FAA8F,CAAC;AAEnK,MAAM,OAAO,iCAAkC,SAAQ,iBAAiB;IAC7D,gBAAgB,CAAU;IAE1B,oCAAoC,GAAG,GAAoB,EAAE,CACpE,mDAAmD,CAAC,IAAI,CAAC,CAAC;IAE5D,YACE,gBAA+C,EAC/C,iBAAoC,EACpC,OAAgB;QAEhB,KAAK,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAChC,IAAI,CAAC,qBAAqB,CAAC,OAAO,GAAG,OAAO,CAAC;IAC/C,CAAC;IAED,IAAa,iBAAiB;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAa,iBAAiB;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAa,0BAA0B;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAa,mBAAmB;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAa,gBAAgB;QAC3B,OAAO,yCAAyC,CAAC;IACnD,CAAC;CACF"}
|
package/lib/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceEditorState.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,WAAW,EAKjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACL,KAAK,qBAAqB,EAK3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gFAAgF,CAAC;AAC1H,OAAO,EAAE,kBAAkB,EAAE,MAAM,kEAAkE,CAAC;AACtG,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,OAAO,EAKP,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"ServiceEditorState.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,WAAW,EAKjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACL,KAAK,qBAAqB,EAK3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gFAAgF,CAAC;AAC1H,OAAO,EAAE,kBAAkB,EAAE,MAAM,kEAAkE,CAAC;AACtG,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,OAAO,EAKP,KAAK,IAAI,EAGV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAG9E,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,IAAI,SAAS;IACb,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;CACpC;AAED,eAAO,MAAM,4BAA4B,YAC9B,OAAO,eACH,WAAW,KACvB,kBAAkB,GAAG,SAWvB,CAAC;AAEF,eAAO,MAAM,6BAA6B,YAC/B,OAAO,eACH,WAAW,KACvB,IAAI,GAAG,SAQT,CAAC;AAEF,eAAO,MAAM,iBAAiB,YACnB,OAAO,eACH,WAAW,KACvB,OASF,CAAC;AAEF,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,qBAAa,kBAAmB,SAAQ,kBAAkB;IACxD,cAAc,EAAE,qBAAqB,CAAC;IACtC,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,oBAAoB,CAAC;IACpC,WAAW,EAAE,WAAW,CAAC;IACzB,mBAAmB,EAAE,2BAA2B,CAAC;gBAErC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB;IAqCjE,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI;IAItC,aAAa,IAAI,IAAI;IAIrB,mBAAmB,IAAI,IAAI;IAI3B,mBAAmB,IAAI,qBAAqB;IAgC5C,IAAI,OAAO,IAAI,OAAO,CAMrB;IAEA,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;IAc/C,SAAS,CACP,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,WAAW,GACvB,kBAAkB;CAKtB"}
|
|
@@ -18,7 +18,7 @@ import { assertErrorThrown, guaranteeType, returnUndefOnError, } from '@finos/le
|
|
|
18
18
|
import { UnsupportedServiceExecutionState, SingleServicePureExecutionState, MultiServicePureExecutionState, InlineServicePureExecutionState, } from './ServiceExecutionState.js';
|
|
19
19
|
import { ServiceRegistrationState } from '../../../editor-state/element-editor-state/service/ServiceRegistrationState.js';
|
|
20
20
|
import { ElementEditorState } from '../../../editor-state/element-editor-state/ElementEditorState.js';
|
|
21
|
-
import { Service, PureSingleExecution, PureMultiExecution, isStubbed_RawLambda, getValueSpecificationReturnType, resolveServiceQueryRawLambda, } from '@finos/legend-graph';
|
|
21
|
+
import { Service, PureSingleExecution, PureMultiExecution, isStubbed_RawLambda, getValueSpecificationReturnType, resolveServiceQueryRawLambda, PureExecution, } from '@finos/legend-graph';
|
|
22
22
|
import { ServiceTestableState } from './testable/ServiceTestableState.js';
|
|
23
23
|
import { User } from '@finos/legend-server-sdlc';
|
|
24
24
|
import { ServicePostValidationsState } from './ServicePostValidationState.js';
|
|
@@ -76,10 +76,12 @@ export class ServiceEditorState extends ElementEditorState {
|
|
|
76
76
|
this.registrationState = new ServiceRegistrationState(editorStore, this.service, editorStore.applicationStore.config.options.TEMPORARY__serviceRegistrationConfig, editorStore.sdlcServerClient.featuresConfigHasBeenFetched &&
|
|
77
77
|
editorStore.sdlcServerClient.features.canCreateVersion);
|
|
78
78
|
this.testableState = new ServiceTestableState(editorStore, this);
|
|
79
|
-
const
|
|
79
|
+
const executionQuery = this.service.execution instanceof PureExecution
|
|
80
|
+
? this.service.execution.func
|
|
81
|
+
: undefined;
|
|
80
82
|
// default to execution tab if query is defined
|
|
81
83
|
this.selectedTab =
|
|
82
|
-
|
|
84
|
+
executionQuery && !isStubbed_RawLambda(executionQuery)
|
|
83
85
|
? SERVICE_TAB.EXECUTION
|
|
84
86
|
: SERVICE_TAB.GENERAL;
|
|
85
87
|
this.postValidationState = new ServicePostValidationsState(this);
|
package/lib/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceEditorState.js","sourceRoot":"","sources":["../../../../../../src/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC1E,OAAO,EAGL,iBAAiB,EACjB,aAAa,EACb,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,gCAAgC,EAChC,+BAA+B,EAC/B,8BAA8B,EAC9B,+BAA+B,GAChC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gFAAgF,CAAC;AAC1H,OAAO,EAAE,kBAAkB,EAAE,MAAM,kEAAkE,CAAC;AACtG,OAAO,EAGL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,+BAA+B,EAE/B,4BAA4B,
|
|
1
|
+
{"version":3,"file":"ServiceEditorState.js","sourceRoot":"","sources":["../../../../../../src/stores/editor/editor-state/element-editor-state/service/ServiceEditorState.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectConfigurationEditorState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAShD,OAAO,EACL,KAAK,WAAW,EAMhB,WAAW,EAEZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EACL,KAAK,oBAAoB,EACzB,uBAAuB,EACvB,iCAAiC,EAEjC,WAAW,EACZ,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAkB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,oBAAY,wBAAwB;IAClC,iBAAiB,sBAAsB;IACvC,oBAAoB,yBAAyB;IAC7C,uBAAuB,4BAA4B;IACnD,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,oBAAoB,SACzB,WAAW,OACZ,wBAAwB,KAC5B,OAQF,CAAC;AAEF,qBAAa,+BAAgC,SAAQ,WAAW;IAC9D,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,0BAA0B,cAAwB;IAC3D,QAAQ,CAAC,4BAA4B,cAAwB;IAE7D,4BAA4B,EAAE,4BAA4B,CAAC;IAC3D,4BAA4B,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChE,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,WAAW,EAAE,wBAAwB,CAAC;IACtC,UAAU,UAAS;IACnB,QAAQ,gCAAuC;IAC/C,QAAQ,wBAA+B;IACvC,6BAA6B,EAAE,uBAAuB,GAAG,SAAS,CAAC;IACnE,eAAe,UAAS;IACxB,oCAAoC,UAAS;gBAEjC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe;IAyChE,+BAA+B,CAC7B,oBAAoB,EAAE,oBAAoB,GACzC,IAAI;IAIP,uBAAuB,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI;IAIzE,cAAc,CAAC,GAAG,EAAE,wBAAwB,GAAG,IAAI;IAInD,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAIxC,IAAI,KAAK,IAAI,MAAM,CAElB;IAEQ,KAAK,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAIzC,IAAI,2BAA2B,IAAI,oBAAoB,CAKtD;IAED,IAAI,cAAc,IAAI,oBAAoB,CAKzC;IAED,IAAI,gBAAgB,IAAI,OAAO,CAK9B;IAED,IAAI,mBAAmB,IAAI,OAAO,CAKjC;IAED,IAAI,4BAA4B,IAAI,OAAO,CAM1C;IAED,IAAI,gBAAgB,IAAI,OAAO,CAI9B;IAEA,mCAAmC,IAAI,WAAW,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ProjectConfigurationEditorState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAShD,OAAO,EACL,KAAK,WAAW,EAMhB,WAAW,EAEZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EACL,KAAK,oBAAoB,EACzB,uBAAuB,EACvB,iCAAiC,EAEjC,WAAW,EACZ,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAkB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,oBAAY,wBAAwB;IAClC,iBAAiB,sBAAsB;IACvC,oBAAoB,yBAAyB;IAC7C,uBAAuB,4BAA4B;IACnD,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,oBAAoB,SACzB,WAAW,OACZ,wBAAwB,KAC5B,OAQF,CAAC;AAEF,qBAAa,+BAAgC,SAAQ,WAAW;IAC9D,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,0BAA0B,cAAwB;IAC3D,QAAQ,CAAC,4BAA4B,cAAwB;IAE7D,4BAA4B,EAAE,4BAA4B,CAAC;IAC3D,4BAA4B,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChE,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,WAAW,EAAE,wBAAwB,CAAC;IACtC,UAAU,UAAS;IACnB,QAAQ,gCAAuC;IAC/C,QAAQ,wBAA+B;IACvC,6BAA6B,EAAE,uBAAuB,GAAG,SAAS,CAAC;IACnE,eAAe,UAAS;IACxB,oCAAoC,UAAS;gBAEjC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe;IAyChE,+BAA+B,CAC7B,oBAAoB,EAAE,oBAAoB,GACzC,IAAI;IAIP,uBAAuB,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI;IAIzE,cAAc,CAAC,GAAG,EAAE,wBAAwB,GAAG,IAAI;IAInD,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAIxC,IAAI,KAAK,IAAI,MAAM,CAElB;IAEQ,KAAK,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAIzC,IAAI,2BAA2B,IAAI,oBAAoB,CAKtD;IAED,IAAI,cAAc,IAAI,oBAAoB,CAKzC;IAED,IAAI,gBAAgB,IAAI,OAAO,CAK9B;IAED,IAAI,mBAAmB,IAAI,OAAO,CAKjC;IAED,IAAI,4BAA4B,IAAI,OAAO,CAM1C;IAED,IAAI,gBAAgB,IAAI,OAAO,CAI9B;IAEA,mCAAmC,IAAI,WAAW,CAAC,IAAI,CAAC;IAsCxD,0BAA0B,CACzB,0BAA0B,EAAE,iCAAiC,GAC5D,WAAW,CAAC,IAAI,CAAC;IAyCnB,uBAAuB,IAAI,WAAW,CAAC,IAAI,CAAC;IAgC5C,iBAAiB,IAAI,WAAW,CAAC,IAAI,CAAC;IA2BtC,aAAa,IAAI,WAAW,CAAC,IAAI,CAAC;IA0DlC,kCAAkC,IAAI,WAAW,CAAC,IAAI,CAAC;CAezD"}
|
|
@@ -126,17 +126,6 @@ export class ProjectConfigurationEditorState extends EditorState {
|
|
|
126
126
|
(yield this.editorStore.depotServerClient.getProjects())
|
|
127
127
|
.map((v) => StoreProjectData.serialization.fromJson(v))
|
|
128
128
|
.forEach((project) => this.projects.set(project.coordinates, project));
|
|
129
|
-
// Update the legacy dependency to newer format (using group ID and artifact ID instead of just project ID)
|
|
130
|
-
this.projectConfiguration?.projectDependencies.forEach((dependency) => {
|
|
131
|
-
if (!dependency.isLegacyDependency) {
|
|
132
|
-
return;
|
|
133
|
-
}
|
|
134
|
-
const project = Array.from(this.projects.values()).find((e) => e.projectId === dependency.projectId);
|
|
135
|
-
// re-write to new format
|
|
136
|
-
if (project) {
|
|
137
|
-
dependency.setProjectId(project.coordinates);
|
|
138
|
-
}
|
|
139
|
-
});
|
|
140
129
|
// fetch the versions for the dependency projects
|
|
141
130
|
for (const dep of this.projectConfiguration?.projectDependencies ?? []) {
|
|
142
131
|
const project = this.projects.get(dep.projectId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectConfigurationEditorState.js","sourceRoot":"","sources":["../../../../../src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ProjectConfigurationEditorState.js","sourceRoot":"","sources":["../../../../../src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-application-studio",
|
|
3
|
-
"version": "28.
|
|
3
|
+
"version": "28.2.0",
|
|
4
4
|
"description": "Legend Studio application core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -47,11 +47,11 @@
|
|
|
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.
|
|
51
|
-
"@finos/legend-lego": "1.1.
|
|
52
|
-
"@finos/legend-query-builder": "4.
|
|
53
|
-
"@finos/legend-server-depot": "6.0.
|
|
54
|
-
"@finos/legend-server-sdlc": "5.0.
|
|
50
|
+
"@finos/legend-graph": "31.1.2",
|
|
51
|
+
"@finos/legend-lego": "1.1.18",
|
|
52
|
+
"@finos/legend-query-builder": "4.3.0",
|
|
53
|
+
"@finos/legend-server-depot": "6.0.24",
|
|
54
|
+
"@finos/legend-server-sdlc": "5.0.26",
|
|
55
55
|
"@finos/legend-server-showcase": "0.0.6",
|
|
56
56
|
"@finos/legend-shared": "10.0.22",
|
|
57
57
|
"@finos/legend-storage": "3.0.72",
|
|
@@ -221,7 +221,6 @@ export const TEST__setUpEditor = async (
|
|
|
221
221
|
latestProjectStructureVersion: PlainObject<ProjectStructureVersion>;
|
|
222
222
|
availableGenerationDescriptions: GenerationConfigurationDescription[];
|
|
223
223
|
projects: PlainObject<StoreProjectData>[];
|
|
224
|
-
projectData: PlainObject<StoreProjectData>[];
|
|
225
224
|
projectDependency: PlainObject<ProjectVersionEntities>[];
|
|
226
225
|
projectDependencyVersions: string[];
|
|
227
226
|
projectDependencyReport: PlainObject<RawProjectDependencyReport>;
|
|
@@ -236,7 +235,6 @@ export const TEST__setUpEditor = async (
|
|
|
236
235
|
entities,
|
|
237
236
|
latestProjectStructureVersion,
|
|
238
237
|
availableGenerationDescriptions,
|
|
239
|
-
projectData,
|
|
240
238
|
projects,
|
|
241
239
|
projectDependency,
|
|
242
240
|
projectDependencyVersions,
|
|
@@ -295,10 +293,6 @@ export const TEST__setUpEditor = async (
|
|
|
295
293
|
MOCK__editorStore.depotServerClient,
|
|
296
294
|
'getVersions',
|
|
297
295
|
).mockResolvedValue(projectDependencyVersions);
|
|
298
|
-
createSpy(
|
|
299
|
-
MOCK__editorStore.depotServerClient,
|
|
300
|
-
'getProjectById',
|
|
301
|
-
).mockResolvedValue(projectData);
|
|
302
296
|
createSpy(
|
|
303
297
|
MOCK__editorStore.depotServerClient,
|
|
304
298
|
'collectDependencyEntities',
|
|
@@ -417,7 +411,6 @@ export const TEST__setUpEditorWithDefaultSDLCData = (
|
|
|
417
411
|
...TEST_DATA__DefaultSDLCInfo.availableCodeGenerations,
|
|
418
412
|
],
|
|
419
413
|
projects: [],
|
|
420
|
-
projectData: [],
|
|
421
414
|
projectDependency: [],
|
|
422
415
|
projectDependencyVersions: [],
|
|
423
416
|
projectDependencyReport: TEST_DATA__DefaultDepotReport.dependencyReport,
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import { useState, useEffect, useCallback, useRef } from 'react';
|
|
17
|
+
import React, { useState, useEffect, useCallback, useRef } from 'react';
|
|
18
18
|
import { observer } from 'mobx-react-lite';
|
|
19
19
|
import {
|
|
20
20
|
FunctionEditorState,
|
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
} from '../../../stores/editor/utils/DnDUtils.js';
|
|
28
28
|
import {
|
|
29
29
|
assertErrorThrown,
|
|
30
|
+
assertTrue,
|
|
30
31
|
prettyCONSTName,
|
|
31
32
|
returnUndefOnError,
|
|
32
33
|
UnsupportedOperationError,
|
|
@@ -61,6 +62,7 @@ import {
|
|
|
61
62
|
PauseCircleIcon,
|
|
62
63
|
PlayIcon,
|
|
63
64
|
PanelLoadingIndicator,
|
|
65
|
+
PencilIcon,
|
|
64
66
|
} from '@finos/legend-art';
|
|
65
67
|
import { LEGEND_STUDIO_TEST_ID } from '../../../__lib__/LegendStudioTesting.js';
|
|
66
68
|
import {
|
|
@@ -98,6 +100,7 @@ import {
|
|
|
98
100
|
getClassProperty,
|
|
99
101
|
RawExecutionResult,
|
|
100
102
|
extractExecutionResultValues,
|
|
103
|
+
RawLambda,
|
|
101
104
|
} from '@finos/legend-graph';
|
|
102
105
|
import {
|
|
103
106
|
type ApplicationStore,
|
|
@@ -131,7 +134,9 @@ import {
|
|
|
131
134
|
} from '../../../stores/graph-modifier/RawValueSpecificationGraphModifierHelper.js';
|
|
132
135
|
import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../__lib__/LegendStudioApplicationNavigationContext.js';
|
|
133
136
|
import {
|
|
137
|
+
type QueryBuilderState,
|
|
134
138
|
ExecutionPlanViewer,
|
|
139
|
+
FunctionQueryBuilderState,
|
|
135
140
|
LambdaEditor,
|
|
136
141
|
LambdaParameterValuesEditor,
|
|
137
142
|
} from '@finos/legend-query-builder';
|
|
@@ -1055,7 +1060,7 @@ export const FunctionEditor = observer(() => {
|
|
|
1055
1060
|
const debugPlanGeneration = applicationStore.guardUnhandledError(() =>
|
|
1056
1061
|
flowResult(functionEditorState.generatePlan(true)),
|
|
1057
1062
|
);
|
|
1058
|
-
|
|
1063
|
+
const embeddedQueryBuilderState = editorStore.embeddedQueryBuilderState;
|
|
1059
1064
|
useEffect(() => {
|
|
1060
1065
|
flowResult(
|
|
1061
1066
|
functionEditorState.functionDefinitionEditorState.convertLambdaObjectToGrammarString(
|
|
@@ -1071,6 +1076,88 @@ export const FunctionEditor = observer(() => {
|
|
|
1071
1076
|
LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.FUNCTION_EDITOR,
|
|
1072
1077
|
);
|
|
1073
1078
|
|
|
1079
|
+
const editWithQueryBuilder = (): (() => void) =>
|
|
1080
|
+
applicationStore.guardUnhandledError(async () => {
|
|
1081
|
+
try {
|
|
1082
|
+
const functionQueryBuilderState = new FunctionQueryBuilderState(
|
|
1083
|
+
embeddedQueryBuilderState.editorStore.applicationStore,
|
|
1084
|
+
embeddedQueryBuilderState.editorStore.graphManagerState,
|
|
1085
|
+
functionEditorState.functionElement,
|
|
1086
|
+
);
|
|
1087
|
+
functionQueryBuilderState.initializeWithQuery(
|
|
1088
|
+
new RawLambda(
|
|
1089
|
+
functionEditorState.functionElement.parameters.map((_param) =>
|
|
1090
|
+
functionEditorState.editorStore.graphManagerState.graphManager.serializeRawValueSpecification(
|
|
1091
|
+
_param,
|
|
1092
|
+
),
|
|
1093
|
+
),
|
|
1094
|
+
functionEditorState.functionElement.expressionSequence,
|
|
1095
|
+
),
|
|
1096
|
+
);
|
|
1097
|
+
assertTrue(
|
|
1098
|
+
Boolean(
|
|
1099
|
+
functionQueryBuilderState.isQuerySupported &&
|
|
1100
|
+
functionQueryBuilderState.executionContextState.mapping &&
|
|
1101
|
+
functionQueryBuilderState.executionContextState.runtimeValue,
|
|
1102
|
+
),
|
|
1103
|
+
`Only functions returning TDS/graph fetch using the from() function can be edited via query builder`,
|
|
1104
|
+
);
|
|
1105
|
+
await flowResult(
|
|
1106
|
+
embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
|
|
1107
|
+
setupQueryBuilderState: (): QueryBuilderState =>
|
|
1108
|
+
functionQueryBuilderState,
|
|
1109
|
+
actionConfigs: [
|
|
1110
|
+
{
|
|
1111
|
+
key: 'save-query-btn',
|
|
1112
|
+
renderer: (
|
|
1113
|
+
queryBuilderState: QueryBuilderState,
|
|
1114
|
+
): React.ReactNode => {
|
|
1115
|
+
const save = applicationStore.guardUnhandledError(
|
|
1116
|
+
async () => {
|
|
1117
|
+
try {
|
|
1118
|
+
const rawLambda = queryBuilderState.buildQuery();
|
|
1119
|
+
await flowResult(
|
|
1120
|
+
functionEditorState.updateFunctionWithQuery(
|
|
1121
|
+
rawLambda,
|
|
1122
|
+
),
|
|
1123
|
+
);
|
|
1124
|
+
applicationStore.notificationService.notifySuccess(
|
|
1125
|
+
`Function query is updated`,
|
|
1126
|
+
);
|
|
1127
|
+
embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration(
|
|
1128
|
+
undefined,
|
|
1129
|
+
);
|
|
1130
|
+
} catch (error) {
|
|
1131
|
+
assertErrorThrown(error);
|
|
1132
|
+
applicationStore.notificationService.notifyError(
|
|
1133
|
+
`Can't save query: ${error.message}`,
|
|
1134
|
+
);
|
|
1135
|
+
}
|
|
1136
|
+
},
|
|
1137
|
+
);
|
|
1138
|
+
return (
|
|
1139
|
+
<button
|
|
1140
|
+
className="query-builder__dialog__header__custom-action"
|
|
1141
|
+
tabIndex={-1}
|
|
1142
|
+
disabled={isReadOnly}
|
|
1143
|
+
onClick={save}
|
|
1144
|
+
>
|
|
1145
|
+
Save Query
|
|
1146
|
+
</button>
|
|
1147
|
+
);
|
|
1148
|
+
},
|
|
1149
|
+
},
|
|
1150
|
+
],
|
|
1151
|
+
}),
|
|
1152
|
+
);
|
|
1153
|
+
} catch (error) {
|
|
1154
|
+
assertErrorThrown(error);
|
|
1155
|
+
applicationStore.notificationService.notifyError(
|
|
1156
|
+
`Unable to edit via query builder: ${error.message}`,
|
|
1157
|
+
);
|
|
1158
|
+
}
|
|
1159
|
+
});
|
|
1160
|
+
|
|
1074
1161
|
return (
|
|
1075
1162
|
<div className="function-editor uml-editor uml-editor--dark">
|
|
1076
1163
|
<Panel>
|
|
@@ -1102,6 +1189,17 @@ export const FunctionEditor = observer(() => {
|
|
|
1102
1189
|
))}
|
|
1103
1190
|
</div>
|
|
1104
1191
|
<div className="panel__header__actions">
|
|
1192
|
+
<div className="btn__dropdown-combo btn__dropdown-combo--primary">
|
|
1193
|
+
<button
|
|
1194
|
+
className="btn__dropdown-combo__label"
|
|
1195
|
+
onClick={editWithQueryBuilder()}
|
|
1196
|
+
title="Edit Query"
|
|
1197
|
+
tabIndex={-1}
|
|
1198
|
+
>
|
|
1199
|
+
<PencilIcon className="btn__dropdown-combo__label__icon" />
|
|
1200
|
+
<div className="btn__dropdown-combo__label__title">Edit</div>
|
|
1201
|
+
</button>
|
|
1202
|
+
</div>
|
|
1105
1203
|
<div className="btn__dropdown-combo btn__dropdown-combo--primary">
|
|
1106
1204
|
{functionEditorState.isRunningFunc ? (
|
|
1107
1205
|
<button
|
package/src/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.tsx
CHANGED
|
@@ -850,19 +850,17 @@ const ProjectVersionDependencyEditor = observer(
|
|
|
850
850
|
}
|
|
851
851
|
};
|
|
852
852
|
const viewProject = (): void => {
|
|
853
|
-
|
|
854
|
-
applicationStore.navigationService.navigator.
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
: projectDependency.versionId,
|
|
862
|
-
),
|
|
853
|
+
applicationStore.navigationService.navigator.visitAddress(
|
|
854
|
+
applicationStore.navigationService.navigator.generateAddress(
|
|
855
|
+
generateViewProjectByGAVRoute(
|
|
856
|
+
guaranteeNonNullable(projectDependency.groupId),
|
|
857
|
+
guaranteeNonNullable(projectDependency.artifactId),
|
|
858
|
+
projectDependency.versionId === MASTER_SNAPSHOT_ALIAS
|
|
859
|
+
? SNAPSHOT_VERSION_ALIAS
|
|
860
|
+
: projectDependency.versionId,
|
|
863
861
|
),
|
|
864
|
-
)
|
|
865
|
-
|
|
862
|
+
),
|
|
863
|
+
);
|
|
866
864
|
};
|
|
867
865
|
// NOTE: This assumes that the dependant project is in the same studio instance as the current project
|
|
868
866
|
// In the future, the studio instance may be part of the project data
|
|
@@ -927,11 +925,7 @@ const ProjectVersionDependencyEditor = observer(
|
|
|
927
925
|
content={
|
|
928
926
|
<MenuContent>
|
|
929
927
|
<MenuContentItem
|
|
930
|
-
disabled={
|
|
931
|
-
projectDependency.isLegacyDependency ||
|
|
932
|
-
!selectedProject ||
|
|
933
|
-
!selectedVersionOption
|
|
934
|
-
}
|
|
928
|
+
disabled={!selectedProject || !selectedVersionOption}
|
|
935
929
|
onClick={viewProject}
|
|
936
930
|
title="View project"
|
|
937
931
|
>
|
|
@@ -940,7 +934,6 @@ const ProjectVersionDependencyEditor = observer(
|
|
|
940
934
|
<MenuContentItem
|
|
941
935
|
title="View SDLC project"
|
|
942
936
|
disabled={
|
|
943
|
-
projectDependency.isLegacyDependency ||
|
|
944
937
|
!selectedProject ||
|
|
945
938
|
!selectedVersionOption ||
|
|
946
939
|
!projectDependencyData
|
|
@@ -36,7 +36,6 @@ import { assertErrorThrown } from '@finos/legend-shared';
|
|
|
36
36
|
import { flowResult } from 'mobx';
|
|
37
37
|
import { useEditorStore } from '../../EditorStoreProvider.js';
|
|
38
38
|
import {
|
|
39
|
-
isStubbed_PackageableElement,
|
|
40
39
|
isStubbed_RawLambda,
|
|
41
40
|
KeyedExecutionParameter,
|
|
42
41
|
} from '@finos/legend-graph';
|
|
@@ -115,91 +114,78 @@ export const ServiceExecutionQueryEditor = observer(
|
|
|
115
114
|
applicationStore.guardUnhandledError(async () => {
|
|
116
115
|
const selectedExecutionState =
|
|
117
116
|
executionState.selectedExecutionContextState;
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
117
|
+
|
|
118
|
+
await flowResult(
|
|
119
|
+
embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
|
|
120
|
+
setupQueryBuilderState: (): QueryBuilderState => {
|
|
121
|
+
const queryBuilderState = new ServiceQueryBuilderState(
|
|
122
|
+
embeddedQueryBuilderState.editorStore.applicationStore,
|
|
123
|
+
embeddedQueryBuilderState.editorStore.graphManagerState,
|
|
124
|
+
service,
|
|
125
|
+
undefined,
|
|
126
|
+
selectedExecutionState?.executionContext instanceof
|
|
127
|
+
KeyedExecutionParameter
|
|
128
|
+
? selectedExecutionState.executionContext.key
|
|
129
|
+
: undefined,
|
|
130
|
+
);
|
|
131
|
+
queryBuilderState.initializeWithQuery(
|
|
132
|
+
executionState.execution.func,
|
|
133
|
+
);
|
|
134
|
+
if (openInTextMode) {
|
|
135
|
+
queryBuilderState.textEditorState.openModal(
|
|
136
|
+
QueryBuilderTextEditorMode.TEXT,
|
|
137
|
+
);
|
|
138
|
+
}
|
|
139
|
+
return queryBuilderState;
|
|
140
|
+
},
|
|
141
|
+
actionConfigs: [
|
|
142
|
+
{
|
|
143
|
+
key: 'save-query-btn',
|
|
144
|
+
renderer: (
|
|
145
|
+
queryBuilderState: QueryBuilderState,
|
|
146
|
+
): React.ReactNode => {
|
|
147
|
+
const save = applicationStore.guardUnhandledError(
|
|
148
|
+
async () => {
|
|
149
|
+
try {
|
|
150
|
+
const rawLambda = queryBuilderState.buildQuery();
|
|
151
|
+
await flowResult(
|
|
152
|
+
executionState.queryState.updateLamba(rawLambda),
|
|
153
|
+
);
|
|
154
|
+
applicationStore.notificationService.notifySuccess(
|
|
155
|
+
`Service query is updated`,
|
|
156
|
+
);
|
|
157
|
+
embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration(
|
|
158
|
+
undefined,
|
|
159
|
+
);
|
|
160
|
+
} catch (error) {
|
|
161
|
+
assertErrorThrown(error);
|
|
162
|
+
applicationStore.notificationService.notifyError(
|
|
163
|
+
`Can't save query: ${error.message}`,
|
|
164
|
+
);
|
|
165
|
+
}
|
|
166
|
+
},
|
|
138
167
|
);
|
|
139
|
-
|
|
140
|
-
|
|
168
|
+
|
|
169
|
+
return (
|
|
170
|
+
<button
|
|
171
|
+
className="query-builder__dialog__header__custom-action"
|
|
172
|
+
tabIndex={-1}
|
|
173
|
+
disabled={isReadOnly}
|
|
174
|
+
onClick={save}
|
|
175
|
+
>
|
|
176
|
+
Save Query
|
|
177
|
+
</button>
|
|
141
178
|
);
|
|
142
|
-
if (openInTextMode) {
|
|
143
|
-
queryBuilderState.textEditorState.openModal(
|
|
144
|
-
QueryBuilderTextEditorMode.TEXT,
|
|
145
|
-
);
|
|
146
|
-
}
|
|
147
|
-
return queryBuilderState;
|
|
148
179
|
},
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
const rawLambda = queryBuilderState.buildQuery();
|
|
159
|
-
await flowResult(
|
|
160
|
-
executionState.queryState.updateLamba(rawLambda),
|
|
161
|
-
);
|
|
162
|
-
applicationStore.notificationService.notifySuccess(
|
|
163
|
-
`Service query is updated`,
|
|
164
|
-
);
|
|
165
|
-
embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration(
|
|
166
|
-
undefined,
|
|
167
|
-
);
|
|
168
|
-
} catch (error) {
|
|
169
|
-
assertErrorThrown(error);
|
|
170
|
-
applicationStore.notificationService.notifyError(
|
|
171
|
-
`Can't save query: ${error.message}`,
|
|
172
|
-
);
|
|
173
|
-
}
|
|
174
|
-
},
|
|
175
|
-
);
|
|
176
|
-
|
|
177
|
-
return (
|
|
178
|
-
<button
|
|
179
|
-
className="query-builder__dialog__header__custom-action"
|
|
180
|
-
tabIndex={-1}
|
|
181
|
-
disabled={isReadOnly}
|
|
182
|
-
onClick={save}
|
|
183
|
-
>
|
|
184
|
-
Save Query
|
|
185
|
-
</button>
|
|
186
|
-
);
|
|
187
|
-
},
|
|
188
|
-
},
|
|
189
|
-
],
|
|
190
|
-
disableCompile: isStubbed_RawLambda(
|
|
191
|
-
executionState.queryState.query,
|
|
192
|
-
),
|
|
193
|
-
}),
|
|
194
|
-
);
|
|
195
|
-
executionState.setOpeningQueryEditor(false);
|
|
196
|
-
return;
|
|
197
|
-
}
|
|
198
|
-
applicationStore.notificationService.notifyWarning(
|
|
199
|
-
'Please specify a mapping and a runtime for the execution context to edit with query builder',
|
|
200
|
-
);
|
|
201
|
-
executionState.setOpeningQueryEditor(false);
|
|
202
|
-
}
|
|
180
|
+
},
|
|
181
|
+
],
|
|
182
|
+
disableCompile: isStubbed_RawLambda(
|
|
183
|
+
executionState.queryState.query,
|
|
184
|
+
),
|
|
185
|
+
}),
|
|
186
|
+
);
|
|
187
|
+
executionState.setOpeningQueryEditor(false);
|
|
188
|
+
return;
|
|
203
189
|
});
|
|
204
190
|
|
|
205
191
|
const importQuery = (): void =>
|
|
@@ -68,11 +68,11 @@ const promoteQueryToService = async (
|
|
|
68
68
|
const applicationStore = editorStore.applicationStore;
|
|
69
69
|
try {
|
|
70
70
|
const mapping = guaranteeNonNullable(
|
|
71
|
-
queryBuilderState.mapping,
|
|
71
|
+
queryBuilderState.executionContextState.mapping,
|
|
72
72
|
'Mapping is required to create service execution',
|
|
73
73
|
);
|
|
74
74
|
const runtime = guaranteeNonNullable(
|
|
75
|
-
queryBuilderState.runtimeValue,
|
|
75
|
+
queryBuilderState.executionContextState.runtimeValue,
|
|
76
76
|
'Runtime is required to create service execution',
|
|
77
77
|
);
|
|
78
78
|
const query = queryBuilderState.buildQuery();
|
|
@@ -269,15 +269,15 @@ const PromoteToServiceQueryBuilderAction = observer(
|
|
|
269
269
|
setPromoteQueryType(type);
|
|
270
270
|
const closeNewServiceModal = (): void => setPromoteQueryType(undefined);
|
|
271
271
|
const allowPromotion = Boolean(
|
|
272
|
-
queryBuilderState.mapping &&
|
|
273
|
-
queryBuilderState.runtimeValue &&
|
|
272
|
+
queryBuilderState.executionContextState.mapping &&
|
|
273
|
+
queryBuilderState.executionContextState.runtimeValue &&
|
|
274
274
|
!queryBuilderState.allValidationIssues.length,
|
|
275
275
|
);
|
|
276
276
|
|
|
277
277
|
const renderSaveAsModal = (): React.ReactNode => {
|
|
278
278
|
if (
|
|
279
279
|
promoteQueryModal === PROMOTE_QUERY_TYPE.SERVICE &&
|
|
280
|
-
queryBuilderState.mapping
|
|
280
|
+
queryBuilderState.executionContextState.mapping
|
|
281
281
|
) {
|
|
282
282
|
const promoteToService = async (
|
|
283
283
|
packagePath: string,
|
|
@@ -295,7 +295,7 @@ const PromoteToServiceQueryBuilderAction = observer(
|
|
|
295
295
|
|
|
296
296
|
return (
|
|
297
297
|
<NewServiceModal
|
|
298
|
-
mapping={queryBuilderState.mapping}
|
|
298
|
+
mapping={queryBuilderState.executionContextState.mapping}
|
|
299
299
|
close={closeNewServiceModal}
|
|
300
300
|
showModal={true}
|
|
301
301
|
promoteToService={promoteToService}
|
|
@@ -698,7 +698,7 @@ const ExplorerContextMenu = observer(
|
|
|
698
698
|
editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
|
|
699
699
|
(dep) => dep.projectId === node?.packageableElement.name,
|
|
700
700
|
);
|
|
701
|
-
if (projectDependency
|
|
701
|
+
if (projectDependency) {
|
|
702
702
|
applicationStore.navigationService.navigator.visitAddress(
|
|
703
703
|
applicationStore.navigationService.navigator.generateAddress(
|
|
704
704
|
generateViewProjectByGAVRoute(
|