@finos/legend-extension-dsl-data-space-studio 0.1.353 → 0.1.354
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/DataSpaceExecutableQueryAction.d.ts.map +1 -1
- package/lib/components/DataSpaceExecutableQueryAction.js +2 -0
- package/lib/components/DataSpaceExecutableQueryAction.js.map +1 -1
- package/lib/components/DataSpaceQueryAction.d.ts.map +1 -1
- package/lib/components/DataSpaceQueryAction.js +23 -9
- package/lib/components/DataSpaceQueryAction.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/package.json +3 -3
- package/src/components/DataSpaceExecutableQueryAction.tsx +4 -0
- package/src/components/DataSpaceQueryAction.tsx +33 -16
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceExecutableQueryAction.d.ts","sourceRoot":"","sources":["../../src/components/DataSpaceExecutableQueryAction.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EACL,SAAS,EACT,KAAK,2BAA2B,EAIjC,MAAM,8CAA8C,CAAC;AAStD,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,+CAA+C,CAAC;AAE5G,eAAO,MAAM,6CAA6C,GACxD,WAAW,SAAS,EACpB,oBAAoB,2BAA2B,EAC/C,aAAa,sCAAsC,EACnD,aAAa,WAAW,KACvB,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"DataSpaceExecutableQueryAction.d.ts","sourceRoot":"","sources":["../../src/components/DataSpaceExecutableQueryAction.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EACL,SAAS,EACT,KAAK,2BAA2B,EAIjC,MAAM,8CAA8C,CAAC;AAStD,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,+CAA+C,CAAC;AAE5G,eAAO,MAAM,6CAA6C,GACxD,WAAW,SAAS,EACpB,oBAAoB,2BAA2B,EAC/C,aAAa,sCAAsC,EACnD,aAAa,WAAW,KACvB,OAAO,CAAC,IAAI,CAwHd,CAAC"}
|
|
@@ -42,6 +42,8 @@ export const editDataSpaceExecutableTemplateInQueryBuilder = async (dataSpace, e
|
|
|
42
42
|
}
|
|
43
43
|
}, undefined, undefined, undefined, undefined, editorStore.applicationStore.config.options.queryBuilderConfig, sourceInfo);
|
|
44
44
|
queryBuilderState.setExecutionContext(executionContext);
|
|
45
|
+
queryBuilderState.setRestrictToCurrentDataSpace(true);
|
|
46
|
+
queryBuilderState.setShowRuntimeSelector(executionContext.defaultRuntime === undefined);
|
|
45
47
|
queryBuilderState.changeMapping(mapping);
|
|
46
48
|
const mappingModelCoverageAnalysisResult = queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(mapping.path);
|
|
47
49
|
if (mappingModelCoverageAnalysisResult) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceExecutableQueryAction.js","sourceRoot":"","sources":["../../src/components/DataSpaceExecutableQueryAction.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EACL,SAAS,EAET,0CAA0C,EAC1C,8BAA8B,EAC9B,6BAA6B,GAC9B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EACL,0BAA0B,GAE3B,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AAGrC,MAAM,CAAC,MAAM,6CAA6C,GAAG,KAAK,EAChE,SAAoB,EACpB,kBAA+C,EAC/C,WAAmD,EACnD,WAAwB,EACT,EAAE;IACjB,MAAM,gBAAgB,GAAG,0CAA0C,CACjE,SAAS,EACT,kBAAkB,CACnB,CAAC;IACF,MAAM,OAAO,GAAG,gBAAgB;QAC9B,CAAC,CAAC,8BAA8B,CAAC,gBAAgB,CAAC;QAClD,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,CAAC,gBAAgB,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,WAAW,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,aAAa,CAC5D,8IAA8I,CAC/I,CAAC;QACF,OAAO;IACT,CAAC;IACD,MAAM,yBAAyB,GAAG,WAAW,CAAC,yBAAyB,CAAC;IACxE,MAAM,UAAU,CACd,yBAAyB,CAAC,oCAAoC,CAAC;QAC7D,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACjC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAC9B,EAAE,EACF,WAAW,CAAC,UAAU,CAAC,aAAa,EAAE,EACtC,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE,CAC9B,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,0BAA0B,CACtD,WAAW,CAAC,gBAAgB,EAC5B,WAAW,CAAC,iBAAiB,EAC7B,iCAAiC,CAAC,QAAQ,EAC1C,wBAAwB,CAAC,QAAQ,EACjC,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,KAAK,EAAE,aAAgD,EAAE,EAAE;gBACzD,iBAAiB,CAAC,SAAS,GAAG,aAAa,CACzC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAClD,aAAa,CAAC,IAAI,CACnB,EACD,SAAS,CACV,CAAC;gBACF,MAAM,aAAa,GACjB,iBAAiB,CAAC,SAAS,CAAC,uBAAuB,CAAC;gBACtD,IAAI,aAAa,EAAE,CAAC;oBAClB,iBAAiB,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;oBACrD,MAAM,iBAAiB,CAAC,+BAA+B,EAAE,CAAC;gBAC5D,CAAC;YACH,CAAC,EACD,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAC9D,UAAU,CACX,CAAC;YACF,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YACxD,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACzC,MAAM,kCAAkC,GACtC,iBAAiB,CAAC,uBAAuB,EAAE,8BAA8B,EAAE,GAAG,CAC5E,OAAO,CAAC,IAAI,CACb,CAAC;YACJ,IAAI,kCAAkC,EAAE,CAAC;gBACvC,iBAAiB,CAAC,aAAa,CAAC,kCAAkC;oBAChE,kCAAkC,CAAC;YACvC,CAAC;YACD,IAAI,gBAAgB,CAAC,cAAc,EAAE,CAAC;gBACpC,iBAAiB,CAAC,aAAa,CAC7B,IAAI,cAAc,CAAC,gBAAgB,CAAC,cAAc,CAAC,CACpD,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnD,iBAAiB,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,MAAM,iBAAiB,GAAG,6BAA6B,CACrD,SAAS,EACT,OAAO,EACP,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;gBACF,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC9C,IAAI,gBAAgB,EAAE,CAAC;oBACrB,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YACD,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,aAAa,EAAE;YACb;gBACE,GAAG,EAAE,sCAAsC;gBAC3C,QAAQ,EAAE,CAAC,iBAAiB,EAAmB,EAAE;oBAC/C,MAAM,IAAI,GAAG,WAAW,CAAC,gBAAgB,CAAC,mBAAmB,CAC3D,KAAK,IAAI,EAAE;wBACT,MAAM,SAAS,GAAG,iBAAiB,CAAC,wBAAwB,EAAE,CAAC;wBAC/D,kBAAkB,CAAC,KAAK,GAAG,SAAS,CAAC;wBACrC,yBAAyB,CAAC,oCAAoC,CAC5D,SAAS,CACV,CAAC;wBACF,MAAM,UAAU,CACd,WAAW,CAAC,kCAAkC,CAAC;4BAC7C,MAAM,EAAE,IAAI;yBACb,CAAC,CACH,CAAC;oBACJ,CAAC,CACF,CAAC;oBACF,OAAO,CACL,iBACE,SAAS,EAAC,8CAA8C,EACxD,QAAQ,EAAE,CAAC,CAAC,EACZ,OAAO,EAAE,IAAI,4BAGN,CACV,CAAC;gBACJ,CAAC;aACF;SACF;QACD,cAAc,EAAE,IAAI;KACrB,CAAC,CACH,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"DataSpaceExecutableQueryAction.js","sourceRoot":"","sources":["../../src/components/DataSpaceExecutableQueryAction.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryAction.d.ts","sourceRoot":"","sources":["../../src/components/DataSpaceQueryAction.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EACL,KAAK,WAAW,EAEjB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EACL,SAAS,EAGV,MAAM,8CAA8C,CAAC;AAWtD,eAAO,MAAM,cAAc,GACzB,WAAW,SAAS,EACpB,aAAa,WAAW,KACvB,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"DataSpaceQueryAction.d.ts","sourceRoot":"","sources":["../../src/components/DataSpaceQueryAction.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EACL,KAAK,WAAW,EAEjB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EACL,SAAS,EAGV,MAAM,8CAA8C,CAAC;AAWtD,eAAO,MAAM,cAAc,GACzB,WAAW,SAAS,EACpB,aAAa,WAAW,KACvB,OAAO,CAAC,IAAI,CAsGd,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE;;CAUjC,CAAC"}
|
|
@@ -18,29 +18,43 @@ import { MenuContentItem } from '@finos/legend-art';
|
|
|
18
18
|
import { observer } from 'mobx-react-lite';
|
|
19
19
|
import { useEditorStore, } from '@finos/legend-application-studio';
|
|
20
20
|
import { flowResult } from 'mobx';
|
|
21
|
-
import {
|
|
21
|
+
import { guaranteeType } from '@finos/legend-shared';
|
|
22
22
|
import { DataSpace, resolveExecutionContextMapping, resolveUsableDataSpaceClasses, } from '@finos/legend-extension-dsl-data-space/graph';
|
|
23
23
|
import { DataSpaceQueryBuilderState, } from '@finos/legend-extension-dsl-data-space/application';
|
|
24
24
|
import { QueryBuilderActionConfig, QueryBuilderAdvancedWorkflowState, } from '@finos/legend-query-builder';
|
|
25
25
|
import { RuntimePointer } from '@finos/legend-graph';
|
|
26
26
|
export const queryDataSpace = async (dataSpace, editorStore) => {
|
|
27
27
|
const embeddedQueryBuilderState = editorStore.embeddedQueryBuilderState;
|
|
28
|
-
const
|
|
28
|
+
const initialExecutionContext = dataSpace.defaultExecutionContext ?? dataSpace.executionContexts?.[0];
|
|
29
|
+
if (!initialExecutionContext) {
|
|
30
|
+
editorStore.applicationStore.notificationService.notifyWarning(`Can't query data space '${dataSpace.path}': no execution context defined`);
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
const initialMapping = resolveExecutionContextMapping(initialExecutionContext);
|
|
34
|
+
if (!initialMapping) {
|
|
35
|
+
editorStore.applicationStore.notificationService.notifyWarning(`Can't query execution context '${initialExecutionContext.name}' of data space '${dataSpace.path}': no resolvable mapping configured`);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
29
38
|
await flowResult(embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
|
|
30
39
|
setupQueryBuilderState: async () => {
|
|
31
40
|
const sourceInfo = Object.assign({}, editorStore.editorMode.getSourceInfo(), {
|
|
32
41
|
dataSpace: dataSpace.path,
|
|
33
42
|
});
|
|
34
|
-
const queryBuilderState = new DataSpaceQueryBuilderState(editorStore.applicationStore, editorStore.graphManagerState, QueryBuilderAdvancedWorkflowState.INSTANCE, QueryBuilderActionConfig.INSTANCE, dataSpace,
|
|
43
|
+
const queryBuilderState = new DataSpaceQueryBuilderState(editorStore.applicationStore, editorStore.graphManagerState, QueryBuilderAdvancedWorkflowState.INSTANCE, QueryBuilderActionConfig.INSTANCE, dataSpace, initialExecutionContext, false, undefined, async (dataSpaceInfo) => {
|
|
35
44
|
queryBuilderState.dataSpace = guaranteeType(queryBuilderState.graphManagerState.graph.getElement(dataSpaceInfo.path), DataSpace);
|
|
36
|
-
const targetDefault =
|
|
45
|
+
const targetDefault = queryBuilderState.dataSpace.defaultExecutionContext ??
|
|
46
|
+
queryBuilderState.dataSpace.executionContexts?.[0];
|
|
47
|
+
if (!targetDefault) {
|
|
48
|
+
editorStore.applicationStore.notificationService.notifyWarning(`Can't query data space '${queryBuilderState.dataSpace.path}': no execution context defined`);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
37
51
|
queryBuilderState.setExecutionContext(targetDefault);
|
|
38
52
|
await queryBuilderState.propagateExecutionContextChange();
|
|
39
53
|
}, undefined, undefined, undefined, undefined, editorStore.applicationStore.config.options.queryBuilderConfig, sourceInfo);
|
|
40
|
-
queryBuilderState.setExecutionContext(
|
|
41
|
-
|
|
42
|
-
queryBuilderState.changeMapping(
|
|
43
|
-
const mappingModelCoverageAnalysisResult = queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
|
|
54
|
+
queryBuilderState.setExecutionContext(initialExecutionContext);
|
|
55
|
+
queryBuilderState.setShowRuntimeSelector(initialExecutionContext.defaultRuntime === undefined);
|
|
56
|
+
queryBuilderState.changeMapping(initialMapping);
|
|
57
|
+
const mappingModelCoverageAnalysisResult = queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(initialMapping.path);
|
|
44
58
|
if (mappingModelCoverageAnalysisResult) {
|
|
45
59
|
queryBuilderState.explorerState.mappingModelCoverageAnalysisResult =
|
|
46
60
|
mappingModelCoverageAnalysisResult;
|
|
@@ -49,7 +63,7 @@ export const queryDataSpace = async (dataSpace, editorStore) => {
|
|
|
49
63
|
if (defaultRuntime) {
|
|
50
64
|
queryBuilderState.changeRuntime(new RuntimePointer(defaultRuntime));
|
|
51
65
|
}
|
|
52
|
-
const compatibleClasses = resolveUsableDataSpaceClasses(queryBuilderState.dataSpace,
|
|
66
|
+
const compatibleClasses = resolveUsableDataSpaceClasses(queryBuilderState.dataSpace, initialMapping, queryBuilderState.graphManagerState);
|
|
53
67
|
if (!queryBuilderState.sourceClass ||
|
|
54
68
|
!compatibleClasses.includes(queryBuilderState.sourceClass)) {
|
|
55
69
|
const possibleNewClass = compatibleClasses[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryAction.js","sourceRoot":"","sources":["../../src/components/DataSpaceQueryAction.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAEL,cAAc,GACf,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DataSpaceQueryAction.js","sourceRoot":"","sources":["../../src/components/DataSpaceQueryAction.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-extension-dsl-data-space-studio",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.354",
|
|
4
4
|
"description": "Legend extension for Data Space DSL - Studio",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -43,10 +43,10 @@
|
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@finos/legend-application": "16.0.125",
|
|
46
|
-
"@finos/legend-application-studio": "28.21.
|
|
46
|
+
"@finos/legend-application-studio": "28.21.45",
|
|
47
47
|
"@finos/legend-art": "7.1.165",
|
|
48
48
|
"@finos/legend-code-editor": "2.0.205",
|
|
49
|
-
"@finos/legend-extension-dsl-data-space": "10.4.
|
|
49
|
+
"@finos/legend-extension-dsl-data-space": "10.4.258",
|
|
50
50
|
"@finos/legend-graph": "32.7.1",
|
|
51
51
|
"@finos/legend-query-builder": "4.19.14",
|
|
52
52
|
"@finos/legend-server-depot": "6.1.22",
|
|
@@ -94,6 +94,10 @@ export const editDataSpaceExecutableTemplateInQueryBuilder = async (
|
|
|
94
94
|
sourceInfo,
|
|
95
95
|
);
|
|
96
96
|
queryBuilderState.setExecutionContext(executionContext);
|
|
97
|
+
queryBuilderState.setRestrictToCurrentDataSpace(true);
|
|
98
|
+
queryBuilderState.setShowRuntimeSelector(
|
|
99
|
+
executionContext.defaultRuntime === undefined,
|
|
100
|
+
);
|
|
97
101
|
queryBuilderState.changeMapping(mapping);
|
|
98
102
|
const mappingModelCoverageAnalysisResult =
|
|
99
103
|
queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
|
|
@@ -21,7 +21,7 @@ import {
|
|
|
21
21
|
useEditorStore,
|
|
22
22
|
} from '@finos/legend-application-studio';
|
|
23
23
|
import { flowResult } from 'mobx';
|
|
24
|
-
import {
|
|
24
|
+
import { guaranteeType } from '@finos/legend-shared';
|
|
25
25
|
import {
|
|
26
26
|
DataSpace,
|
|
27
27
|
resolveExecutionContextMapping,
|
|
@@ -42,10 +42,23 @@ export const queryDataSpace = async (
|
|
|
42
42
|
editorStore: EditorStore,
|
|
43
43
|
): Promise<void> => {
|
|
44
44
|
const embeddedQueryBuilderState = editorStore.embeddedQueryBuilderState;
|
|
45
|
-
const
|
|
46
|
-
dataSpace.defaultExecutionContext
|
|
47
|
-
|
|
45
|
+
const initialExecutionContext =
|
|
46
|
+
dataSpace.defaultExecutionContext ?? dataSpace.executionContexts?.[0];
|
|
47
|
+
if (!initialExecutionContext) {
|
|
48
|
+
editorStore.applicationStore.notificationService.notifyWarning(
|
|
49
|
+
`Can't query data space '${dataSpace.path}': no execution context defined`,
|
|
50
|
+
);
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const initialMapping = resolveExecutionContextMapping(
|
|
54
|
+
initialExecutionContext,
|
|
48
55
|
);
|
|
56
|
+
if (!initialMapping) {
|
|
57
|
+
editorStore.applicationStore.notificationService.notifyWarning(
|
|
58
|
+
`Can't query execution context '${initialExecutionContext.name}' of data space '${dataSpace.path}': no resolvable mapping configured`,
|
|
59
|
+
);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
49
62
|
await flowResult(
|
|
50
63
|
embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
|
|
51
64
|
setupQueryBuilderState: async () => {
|
|
@@ -62,7 +75,7 @@ export const queryDataSpace = async (
|
|
|
62
75
|
QueryBuilderAdvancedWorkflowState.INSTANCE,
|
|
63
76
|
QueryBuilderActionConfig.INSTANCE,
|
|
64
77
|
dataSpace,
|
|
65
|
-
|
|
78
|
+
initialExecutionContext,
|
|
66
79
|
false,
|
|
67
80
|
undefined,
|
|
68
81
|
async (dataSpaceInfo: ResolvedDataSpaceEntityWithOrigin) => {
|
|
@@ -72,10 +85,15 @@ export const queryDataSpace = async (
|
|
|
72
85
|
),
|
|
73
86
|
DataSpace,
|
|
74
87
|
);
|
|
75
|
-
const targetDefault =
|
|
76
|
-
queryBuilderState.dataSpace.defaultExecutionContext
|
|
77
|
-
|
|
78
|
-
)
|
|
88
|
+
const targetDefault =
|
|
89
|
+
queryBuilderState.dataSpace.defaultExecutionContext ??
|
|
90
|
+
queryBuilderState.dataSpace.executionContexts?.[0];
|
|
91
|
+
if (!targetDefault) {
|
|
92
|
+
editorStore.applicationStore.notificationService.notifyWarning(
|
|
93
|
+
`Can't query data space '${queryBuilderState.dataSpace.path}': no execution context defined`,
|
|
94
|
+
);
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
79
97
|
queryBuilderState.setExecutionContext(targetDefault);
|
|
80
98
|
await queryBuilderState.propagateExecutionContextChange();
|
|
81
99
|
},
|
|
@@ -86,15 +104,14 @@ export const queryDataSpace = async (
|
|
|
86
104
|
editorStore.applicationStore.config.options.queryBuilderConfig,
|
|
87
105
|
sourceInfo,
|
|
88
106
|
);
|
|
89
|
-
queryBuilderState.setExecutionContext(
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
`Can't query execution context '${queryBuilderState.executionContext.name}': no resolvable mapping configured`,
|
|
107
|
+
queryBuilderState.setExecutionContext(initialExecutionContext);
|
|
108
|
+
queryBuilderState.setShowRuntimeSelector(
|
|
109
|
+
initialExecutionContext.defaultRuntime === undefined,
|
|
93
110
|
);
|
|
94
|
-
queryBuilderState.changeMapping(
|
|
111
|
+
queryBuilderState.changeMapping(initialMapping);
|
|
95
112
|
const mappingModelCoverageAnalysisResult =
|
|
96
113
|
queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
|
|
97
|
-
|
|
114
|
+
initialMapping.path,
|
|
98
115
|
);
|
|
99
116
|
if (mappingModelCoverageAnalysisResult) {
|
|
100
117
|
queryBuilderState.explorerState.mappingModelCoverageAnalysisResult =
|
|
@@ -107,7 +124,7 @@ export const queryDataSpace = async (
|
|
|
107
124
|
}
|
|
108
125
|
const compatibleClasses = resolveUsableDataSpaceClasses(
|
|
109
126
|
queryBuilderState.dataSpace,
|
|
110
|
-
|
|
127
|
+
initialMapping,
|
|
111
128
|
queryBuilderState.graphManagerState,
|
|
112
129
|
);
|
|
113
130
|
if (
|