@finos/legend-extension-dsl-data-space 10.1.72 → 10.1.74

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":"DSL_DataSpace_LegendQueryApplicationPlugin.d.ts","sourceRoot":"","sources":["../../../src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,+BAA+B,EAEpC,4BAA4B,EAI7B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AAiCnC,qBAAa,0CAA2C,SAAQ,4BAA4B;;IAKjF,8BAA8B,IAAI,oBAAoB,EAAE;IAiBxD,sCAAsC,IAAI,6BAA6B,EAAE;IAoBzE,wCAAwC,IAAI,+BAA+B,EAAE;CAmKvF"}
1
+ {"version":3,"file":"DSL_DataSpace_LegendQueryApplicationPlugin.d.ts","sourceRoot":"","sources":["../../../src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,+BAA+B,EAEpC,4BAA4B,EAI7B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AA6DnC,qBAAa,0CAA2C,SAAQ,4BAA4B;;IAKjF,8BAA8B,IAAI,oBAAoB,EAAE;IAiBxD,sCAAsC,IAAI,6BAA6B,EAAE;IAoBzE,wCAAwC,IAAI,+BAA+B,EAAE;CAqKvF"}
@@ -20,7 +20,7 @@ import { SquareIcon } from '@finos/legend-art';
20
20
  import { ActionAlertActionType, ActionAlertType, } from '@finos/legend-application';
21
21
  import { DATA_SPACE_QUERY_ROUTE_PATTERN, generateDataSpaceQueryCreatorRoute, generateDataSpaceQuerySetupRoute, } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
22
22
  import { DataSpaceQueryCreator } from './DataSpaceQueryCreator.js';
23
- import { isValidFullPath } from '@finos/legend-graph';
23
+ import { isValidFullPath, } from '@finos/legend-graph';
24
24
  import { QUERY_PROFILE_PATH, QUERY_PROFILE_TAG_DATA_SPACE, } from '../../graph/DSL_DataSpace_MetaModelConst.js';
25
25
  import { DataSpaceQueryBuilderState, DataSpaceProjectInfo, } from '../../stores/query/DataSpaceQueryBuilderState.js';
26
26
  import { getOwnDataSpace } from '../../graph-manager/DSL_DataSpace_GraphManagerHelper.js';
@@ -30,6 +30,16 @@ import { DSL_DataSpace_getGraphManagerExtension } from '../../graph-manager/prot
30
30
  import { LATEST_VERSION_ALIAS, StoreProjectData, } from '@finos/legend-server-depot';
31
31
  import { retrieveAnalyticsResultCache } from '../../graph-manager/action/analytics/DataSpaceAnalysisHelper.js';
32
32
  import { flowResult } from 'mobx';
33
+ const resolveExecutionContext = (dataSpace, queryMapping, queryRuntime) => {
34
+ const matchingExecContexts = dataSpace.executionContexts.filter((ec) => ec.mapping.value === queryMapping);
35
+ if (matchingExecContexts.length > 1) {
36
+ const matchRuntime = matchingExecContexts.find((exec) => exec.defaultRuntime.value.path === queryRuntime.path);
37
+ // TODO: we will safely do this for now. Long term we should save exec context key into query store
38
+ // we should make runtime/mapping optional
39
+ return matchRuntime ?? matchingExecContexts[0];
40
+ }
41
+ return matchingExecContexts[0];
42
+ };
33
43
  export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryApplicationPlugin {
34
44
  constructor() {
35
45
  super(packageJson.extensions.applicationQueryPlugin, packageJson.version);
@@ -75,7 +85,7 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
75
85
  const dataSpacePath = dataSpaceTaggedValue.value;
76
86
  const dataSpace = getOwnDataSpace(dataSpacePath, editorStore.graphManagerState.graph);
77
87
  const mapping = query.mapping.value;
78
- const matchingExecutionContext = dataSpace.executionContexts.find((ec) => ec.mapping.value === mapping);
88
+ const matchingExecutionContext = resolveExecutionContext(dataSpace, mapping, query.runtime.value);
79
89
  if (!matchingExecutionContext) {
80
90
  // if a matching execution context is not found, it means this query is not
81
91
  // properly created from a data space, therefore, we cannot support this case
@@ -1 +1 @@
1
- {"version":3,"file":"DSL_DataSpace_LegendQueryApplicationPlugin.js","sourceRoot":"","sources":["../../../src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DSL_DataSpace_LegendQueryApplicationPlugin.js","sourceRoot":"","sources":["../../../src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx"],"names":[],"mappings":"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"}
package/lib/index.css CHANGED
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-extension-dsl-data-space v10.1.72
1
+ /** @license @finos/legend-extension-dsl-data-space v10.1.74
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",
3
- "version": "10.1.72",
3
+ "version": "10.1.74",
4
4
  "description": "Legend extension for Data Space DSL",
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",
3
- "version": "10.1.72",
3
+ "version": "10.1.74",
4
4
  "description": "Legend extension for Data Space DSL",
5
5
  "keywords": [
6
6
  "legend",
@@ -45,13 +45,13 @@
45
45
  },
46
46
  "dependencies": {
47
47
  "@finos/legend-application": "15.0.63",
48
- "@finos/legend-application-query": "13.1.50",
49
- "@finos/legend-application-studio": "28.14.7",
48
+ "@finos/legend-application-query": "13.1.51",
49
+ "@finos/legend-application-studio": "28.14.9",
50
50
  "@finos/legend-art": "7.1.16",
51
- "@finos/legend-extension-dsl-diagram": "8.0.128",
52
- "@finos/legend-graph": "31.6.6",
53
- "@finos/legend-lego": "1.1.69",
54
- "@finos/legend-query-builder": "4.13.13",
51
+ "@finos/legend-extension-dsl-diagram": "8.0.130",
52
+ "@finos/legend-graph": "31.6.7",
53
+ "@finos/legend-lego": "1.1.70",
54
+ "@finos/legend-query-builder": "4.13.14",
55
55
  "@finos/legend-server-depot": "6.0.34",
56
56
  "@finos/legend-shared": "10.0.30",
57
57
  "@finos/legend-storage": "3.0.80",
@@ -36,7 +36,12 @@ import {
36
36
  generateDataSpaceQuerySetupRoute,
37
37
  } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
38
38
  import { DataSpaceQueryCreator } from './DataSpaceQueryCreator.js';
39
- import { type Query, isValidFullPath } from '@finos/legend-graph';
39
+ import {
40
+ type Query,
41
+ type Mapping,
42
+ type PackageableRuntime,
43
+ isValidFullPath,
44
+ } from '@finos/legend-graph';
40
45
  import {
41
46
  QUERY_PROFILE_PATH,
42
47
  QUERY_PROFILE_TAG_DATA_SPACE,
@@ -61,6 +66,29 @@ import {
61
66
  } from '@finos/legend-server-depot';
62
67
  import { retrieveAnalyticsResultCache } from '../../graph-manager/action/analytics/DataSpaceAnalysisHelper.js';
63
68
  import { flowResult } from 'mobx';
69
+ import type {
70
+ DataSpace,
71
+ DataSpaceExecutionContext,
72
+ } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
73
+
74
+ const resolveExecutionContext = (
75
+ dataSpace: DataSpace,
76
+ queryMapping: Mapping,
77
+ queryRuntime: PackageableRuntime,
78
+ ): DataSpaceExecutionContext | undefined => {
79
+ const matchingExecContexts = dataSpace.executionContexts.filter(
80
+ (ec) => ec.mapping.value === queryMapping,
81
+ );
82
+ if (matchingExecContexts.length > 1) {
83
+ const matchRuntime = matchingExecContexts.find(
84
+ (exec) => exec.defaultRuntime.value.path === queryRuntime.path,
85
+ );
86
+ // TODO: we will safely do this for now. Long term we should save exec context key into query store
87
+ // we should make runtime/mapping optional
88
+ return matchRuntime ?? matchingExecContexts[0];
89
+ }
90
+ return matchingExecContexts[0];
91
+ };
64
92
 
65
93
  export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryApplicationPlugin {
66
94
  constructor() {
@@ -124,8 +152,10 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
124
152
  editorStore.graphManagerState.graph,
125
153
  );
126
154
  const mapping = query.mapping.value;
127
- const matchingExecutionContext = dataSpace.executionContexts.find(
128
- (ec) => ec.mapping.value === mapping,
155
+ const matchingExecutionContext = resolveExecutionContext(
156
+ dataSpace,
157
+ mapping,
158
+ query.runtime.value,
129
159
  );
130
160
  if (!matchingExecutionContext) {
131
161
  // if a matching execution context is not found, it means this query is not