@finos/legend-extension-dsl-data-space-studio 0.1.109 → 0.1.111

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":"DataSpaceQueryAction.d.ts","sourceRoot":"","sources":["../../src/components/DataSpaceQueryAction.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EACL,KAAK,WAAW,EAEjB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,8CAA8C,CAAC;AAUzE,eAAO,MAAM,cAAc,cACd,SAAS,eACP,WAAW,KACvB,OAAO,CAAC,IAAI,CAkDd,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE;;CAUjC,CAAC"}
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,EAEV,MAAM,8CAA8C,CAAC;AAWtD,eAAO,MAAM,cAAc,cACd,SAAS,eACP,WAAW,KACvB,OAAO,CAAC,IAAI,CA8Ed,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE;;CAUjC,CAAC"}
@@ -18,10 +18,11 @@ 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 { guaranteeType } from '@finos/legend-shared';
22
- import { DataSpace } from '@finos/legend-extension-dsl-data-space/graph';
21
+ import { getNullableFirstEntry, guaranteeType } from '@finos/legend-shared';
22
+ import { DataSpace, 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
+ import { RuntimePointer } from '@finos/legend-graph';
25
26
  export const queryDataSpace = async (dataSpace, editorStore) => {
26
27
  const embeddedQueryBuilderState = editorStore.embeddedQueryBuilderState;
27
28
  await flowResult(embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
@@ -35,7 +36,24 @@ export const queryDataSpace = async (dataSpace, editorStore) => {
35
36
  await queryBuilderState.propagateExecutionContextChange();
36
37
  }, undefined, undefined, undefined, undefined, editorStore.applicationStore.config.options.queryBuilderConfig, sourceInfo);
37
38
  queryBuilderState.setExecutionContext(dataSpace.defaultExecutionContext);
38
- await queryBuilderState.propagateExecutionContextChange();
39
+ const mapping = queryBuilderState.executionContext.mapping.value;
40
+ queryBuilderState.changeMapping(mapping);
41
+ const mappingModelCoverageAnalysisResult = queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(mapping.path);
42
+ if (mappingModelCoverageAnalysisResult) {
43
+ queryBuilderState.explorerState.mappingModelCoverageAnalysisResult =
44
+ mappingModelCoverageAnalysisResult;
45
+ }
46
+ queryBuilderState.changeRuntime(new RuntimePointer(queryBuilderState.executionContext.defaultRuntime));
47
+ const compatibleClasses = resolveUsableDataSpaceClasses(queryBuilderState.dataSpace, mapping, queryBuilderState.graphManagerState);
48
+ // if there is no chosen class or the chosen one is not compatible
49
+ // with the mapping then pick a compatible class if possible
50
+ if (!queryBuilderState.class ||
51
+ !compatibleClasses.includes(queryBuilderState.class)) {
52
+ const possibleNewClass = getNullableFirstEntry(compatibleClasses);
53
+ if (possibleNewClass) {
54
+ queryBuilderState.changeClass(possibleNewClass);
55
+ }
56
+ }
39
57
  return queryBuilderState;
40
58
  },
41
59
  actionConfigs: [],
@@ -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,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,8CAA8C,CAAC;AACzE,OAAO,EACL,0BAA0B,GAE3B,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AAErC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,SAAoB,EACpB,WAAwB,EACT,EAAE;IACjB,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;gBACE,SAAS,EAAE,SAAS,CAAC,IAAI;aAC1B,CACF,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,SAAS,CAAC,uBAAuB,EACjC,KAAK,EACL,SAAS,EACT,KAAK,EAAE,aAA4B,EAAE,EAAE;gBACrC,iBAAiB,CAAC,SAAS,GAAG,aAAa,CACzC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAClD,aAAa,CAAC,IAAI,CACnB,EACD,SAAS,CACV,CAAC;gBACF,iBAAiB,CAAC,mBAAmB,CACnC,iBAAiB,CAAC,SAAS,CAAC,uBAAuB,CACpD,CAAC;gBACF,MAAM,iBAAiB,CAAC,+BAA+B,EAAE,CAAC;YAC5D,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,CACnC,SAAS,CAAC,uBAAuB,CAClC,CAAC;YACF,MAAM,iBAAiB,CAAC,+BAA+B,EAAE,CAAC;YAC1D,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,IAAI;KACrB,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAC1C,CAAC,KAA+B,EAAE,EAAE;IAClC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,WAAW,CAAC,gBAAgB,CAAC,mBAAmB,CACjE,KAAK,IAAI,EAAE;QACT,MAAM,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC/C,CAAC,CACF,CAAC;IACF,OAAO,KAAC,eAAe,IAAC,OAAO,EAAE,UAAU,yBAA4B,CAAC;AAC1E,CAAC,CACF,CAAC"}
1
+ {"version":3,"file":"DataSpaceQueryAction.js","sourceRoot":"","sources":["../../src/components/DataSpaceQueryAction.tsx"],"names":[],"mappings":"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"}
package/lib/index.css CHANGED
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-extension-dsl-data-space-studio v0.1.109
1
+ /** @license @finos/legend-extension-dsl-data-space-studio v0.1.111
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-extension-dsl-data-space-studio",
3
- "version": "0.1.109",
3
+ "version": "0.1.111",
4
4
  "description": "Legend extension for Data Space DSL - Studio",
5
5
  "keywords": [
6
6
  "legend",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-extension-dsl-data-space-studio",
3
- "version": "0.1.109",
3
+ "version": "0.1.111",
4
4
  "description": "Legend extension for Data Space DSL - Studio",
5
5
  "keywords": [
6
6
  "legend",
@@ -43,12 +43,12 @@
43
43
  },
44
44
  "dependencies": {
45
45
  "@finos/legend-application": "16.0.13",
46
- "@finos/legend-application-studio": "28.18.70",
46
+ "@finos/legend-application-studio": "28.18.71",
47
47
  "@finos/legend-art": "7.1.70",
48
- "@finos/legend-code-editor": "2.0.27",
49
- "@finos/legend-extension-dsl-data-space": "10.4.22",
50
- "@finos/legend-graph": "31.10.61",
51
- "@finos/legend-query-builder": "4.15.30",
48
+ "@finos/legend-code-editor": "2.0.28",
49
+ "@finos/legend-extension-dsl-data-space": "10.4.23",
50
+ "@finos/legend-graph": "31.10.62",
51
+ "@finos/legend-query-builder": "4.15.31",
52
52
  "@finos/legend-server-depot": "6.0.72",
53
53
  "@finos/legend-server-sdlc": "5.3.40",
54
54
  "@finos/legend-shared": "10.0.63",
@@ -21,8 +21,11 @@ import {
21
21
  useEditorStore,
22
22
  } from '@finos/legend-application-studio';
23
23
  import { flowResult } from 'mobx';
24
- import { guaranteeType } from '@finos/legend-shared';
25
- import { DataSpace } from '@finos/legend-extension-dsl-data-space/graph';
24
+ import { getNullableFirstEntry, guaranteeType } from '@finos/legend-shared';
25
+ import {
26
+ DataSpace,
27
+ resolveUsableDataSpaceClasses,
28
+ } from '@finos/legend-extension-dsl-data-space/graph';
26
29
  import {
27
30
  DataSpaceQueryBuilderState,
28
31
  type DataSpaceInfo,
@@ -31,6 +34,7 @@ import {
31
34
  QueryBuilderActionConfig,
32
35
  QueryBuilderAdvancedWorkflowState,
33
36
  } from '@finos/legend-query-builder';
37
+ import { RuntimePointer } from '@finos/legend-graph';
34
38
 
35
39
  export const queryDataSpace = async (
36
40
  dataSpace: DataSpace,
@@ -78,7 +82,35 @@ export const queryDataSpace = async (
78
82
  queryBuilderState.setExecutionContext(
79
83
  dataSpace.defaultExecutionContext,
80
84
  );
81
- await queryBuilderState.propagateExecutionContextChange();
85
+ const mapping = queryBuilderState.executionContext.mapping.value;
86
+ queryBuilderState.changeMapping(mapping);
87
+ const mappingModelCoverageAnalysisResult =
88
+ queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
89
+ mapping.path,
90
+ );
91
+ if (mappingModelCoverageAnalysisResult) {
92
+ queryBuilderState.explorerState.mappingModelCoverageAnalysisResult =
93
+ mappingModelCoverageAnalysisResult;
94
+ }
95
+ queryBuilderState.changeRuntime(
96
+ new RuntimePointer(queryBuilderState.executionContext.defaultRuntime),
97
+ );
98
+ const compatibleClasses = resolveUsableDataSpaceClasses(
99
+ queryBuilderState.dataSpace,
100
+ mapping,
101
+ queryBuilderState.graphManagerState,
102
+ );
103
+ // if there is no chosen class or the chosen one is not compatible
104
+ // with the mapping then pick a compatible class if possible
105
+ if (
106
+ !queryBuilderState.class ||
107
+ !compatibleClasses.includes(queryBuilderState.class)
108
+ ) {
109
+ const possibleNewClass = getNullableFirstEntry(compatibleClasses);
110
+ if (possibleNewClass) {
111
+ queryBuilderState.changeClass(possibleNewClass);
112
+ }
113
+ }
82
114
  return queryBuilderState;
83
115
  },
84
116
  actionConfigs: [],