@finos/legend-application-query 13.5.39 → 13.5.40

Sign up to get free protection for your applications and to get access to all the features.
package/lib/index.css CHANGED
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-application-query v13.5.39
1
+ /** @license @finos/legend-application-query v13.5.40
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-query",
3
- "version": "13.5.39",
3
+ "version": "13.5.40",
4
4
  "description": "Legend Query application core",
5
5
  "keywords": [
6
6
  "legend",
@@ -13,7 +13,7 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { type RawLambda, type QuerySearchSpecification } from '@finos/legend-graph';
16
+ import { type QuerySearchSpecification, type RawLambda } from '@finos/legend-graph';
17
17
  import { type DepotServerClient } from '@finos/legend-server-depot';
18
18
  import { type QueryBuilderState } from '@finos/legend-query-builder';
19
19
  import { type ProjectGAVCoordinates } from '@finos/legend-storage';
@@ -1 +1 @@
1
- {"version":3,"file":"DataSpaceTemplateQueryCreatorStore.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,gBAAgB,EAChB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAe9E,qBAAa,kCAAmC,SAAQ,gBAAgB;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;gBAG1B,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM;IAWzB,cAAc,IAAI,qBAAqB;IAQjC,2BAA2B,IAAI,OAAO,CAAC,iBAAiB,CAAC;IA4E/D,uBAAuB,CACrB,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE,GACzC,yBAAyB;IAqBnB,2BAA2B,CAClC,GAAG,EAAE,wBAAwB,GAC5B,wBAAwB;CAsB5B"}
1
+ {"version":3,"file":"DataSpaceTemplateQueryCreatorStore.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,SAAS,EAGf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,qBAAqB,EAE3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,gBAAgB,EAChB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAiB9E,qBAAa,kCAAmC,SAAQ,gBAAgB;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;gBAG1B,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM;IAWzB,cAAc,IAAI,qBAAqB;IAQjC,2BAA2B,IAAI,OAAO,CAAC,iBAAiB,CAAC;IA+F/D,uBAAuB,CACrB,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE,GACzC,yBAAyB;IAqBnB,2BAA2B,CAClC,GAAG,EAAE,wBAAwB,GAC5B,wBAAwB;CAsB5B"}
@@ -15,11 +15,11 @@
15
15
  */
16
16
  import { QueryProjectCoordinates, extractElementNameFromPath, } from '@finos/legend-graph';
17
17
  import { StoreProjectData, } from '@finos/legend-server-depot';
18
- import { filterByType, guaranteeNonNullable, uuid } from '@finos/legend-shared';
18
+ import { IllegalStateError, uuid } from '@finos/legend-shared';
19
19
  import { QueryBuilderDataBrowserWorkflow, } from '@finos/legend-query-builder';
20
20
  import { parseGACoordinates, } from '@finos/legend-storage';
21
21
  import { QueryBuilderActionConfig_QueryApplication, QueryEditorStore, } from '../QueryEditorStore.js';
22
- import { DSL_DataSpace_getGraphManagerExtension, DataSpaceExecutableTemplate, getDataSpace, retrieveAnalyticsResultCache, } from '@finos/legend-extension-dsl-data-space/graph';
22
+ import { DSL_DataSpace_getGraphManagerExtension, getDataSpace, retrieveAnalyticsResultCache, getExecutionContextFromDataspaceExecutable, getQueryFromDataspaceExecutable, DataSpacePackageableElementExecutable, } from '@finos/legend-extension-dsl-data-space/graph';
23
23
  import { DataSpaceQueryBuilderState, createQueryClassTaggedValue, createQueryDataSpaceTaggedValue, } from '@finos/legend-extension-dsl-data-space/application';
24
24
  import { createDataSpaceDepoRepo } from './DataSpaceQueryBuilderHelper.js';
25
25
  export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
@@ -46,13 +46,23 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
46
46
  }
47
47
  async initializeQueryBuilderState() {
48
48
  const dataSpace = getDataSpace(this.dataSpacePath, this.graphManagerState.graph);
49
- const dataSpaceExecutableTemplate = guaranteeNonNullable(dataSpace.executables
50
- ?.filter(filterByType(DataSpaceExecutableTemplate))
51
- .find((executable) => executable.id === this.templateQueryId), `Can't find template query with id '${this.templateQueryId}'`);
52
- const executionContext = guaranteeNonNullable(dataSpaceExecutableTemplate.executionContextKey
53
- ? dataSpace.executionContexts.filter((ec) => ec.name === dataSpaceExecutableTemplate.executionContextKey)[0]
54
- : dataSpace.defaultExecutionContext, `Can't find execution context '${dataSpaceExecutableTemplate.executionContextKey}'`);
55
- this.templateQueryTitle = dataSpaceExecutableTemplate.title;
49
+ let template = dataSpace.executables?.find((executable) => executable.id === this.templateQueryId);
50
+ if (!template) {
51
+ template = dataSpace.executables?.find((executable) => executable instanceof DataSpacePackageableElementExecutable &&
52
+ executable.executable.value.path === this.templateQueryId);
53
+ }
54
+ if (!template) {
55
+ throw new IllegalStateError(`Can't find template query with id '${this.templateQueryId}'`);
56
+ }
57
+ const executionContext = getExecutionContextFromDataspaceExecutable(dataSpace, template);
58
+ if (!executionContext) {
59
+ throw new IllegalStateError(`Can't find a correpsonding execution context`);
60
+ }
61
+ const query = getQueryFromDataspaceExecutable(template, this.graphManagerState);
62
+ if (!query) {
63
+ throw new IllegalStateError(`Can't fetch query from dataspace executable`);
64
+ }
65
+ this.templateQueryTitle = template.title;
56
66
  let dataSpaceAnalysisResult;
57
67
  try {
58
68
  const project = StoreProjectData.serialization.fromJson(await this.depotServerClient.getProject(this.groupId, this.artifactId));
@@ -72,7 +82,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
72
82
  }, dataSpaceAnalysisResult, undefined, undefined, undefined, this.applicationStore.config.options.queryBuilderConfig, sourceInfo);
73
83
  queryBuilderState.setExecutionContext(executionContext);
74
84
  queryBuilderState.propagateExecutionContextChange(executionContext);
75
- queryBuilderState.initializeWithQuery(dataSpaceExecutableTemplate.query);
85
+ queryBuilderState.initializeWithQuery(query);
76
86
  return queryBuilderState;
77
87
  }
78
88
  getPersistConfiguration(lambda, options) {
@@ -1 +1 @@
1
- {"version":3,"file":"DataSpaceTemplateQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataSpaceTemplateQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-application-query",
3
- "version": "13.5.39",
3
+ "version": "13.5.40",
4
4
  "description": "Legend Query application core",
5
5
  "keywords": [
6
6
  "legend",
@@ -45,7 +45,7 @@
45
45
  "dependencies": {
46
46
  "@finos/legend-application": "15.1.25",
47
47
  "@finos/legend-art": "7.1.52",
48
- "@finos/legend-extension-dsl-data-space": "10.3.60",
48
+ "@finos/legend-extension-dsl-data-space": "10.3.61",
49
49
  "@finos/legend-graph": "31.10.25",
50
50
  "@finos/legend-lego": "1.2.62",
51
51
  "@finos/legend-query-builder": "4.14.82",
@@ -15,24 +15,24 @@
15
15
  */
16
16
 
17
17
  import {
18
- QueryProjectCoordinates,
19
- extractElementNameFromPath,
20
18
  type Query,
21
- type RawLambda,
22
19
  type QuerySearchSpecification,
20
+ type RawLambda,
21
+ QueryProjectCoordinates,
22
+ extractElementNameFromPath,
23
23
  } from '@finos/legend-graph';
24
24
  import {
25
25
  type DepotServerClient,
26
26
  StoreProjectData,
27
27
  } from '@finos/legend-server-depot';
28
- import { filterByType, guaranteeNonNullable, uuid } from '@finos/legend-shared';
28
+ import { IllegalStateError, uuid } from '@finos/legend-shared';
29
29
  import {
30
30
  type QueryBuilderState,
31
31
  QueryBuilderDataBrowserWorkflow,
32
32
  } from '@finos/legend-query-builder';
33
33
  import {
34
- parseGACoordinates,
35
34
  type ProjectGAVCoordinates,
35
+ parseGACoordinates,
36
36
  } from '@finos/legend-storage';
37
37
  import {
38
38
  QueryBuilderActionConfig_QueryApplication,
@@ -42,15 +42,17 @@ import {
42
42
  import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
43
43
  import {
44
44
  DSL_DataSpace_getGraphManagerExtension,
45
- DataSpaceExecutableTemplate,
46
45
  getDataSpace,
47
46
  retrieveAnalyticsResultCache,
47
+ getExecutionContextFromDataspaceExecutable,
48
+ getQueryFromDataspaceExecutable,
49
+ DataSpacePackageableElementExecutable,
48
50
  } from '@finos/legend-extension-dsl-data-space/graph';
49
51
  import {
52
+ type DataSpaceInfo,
50
53
  DataSpaceQueryBuilderState,
51
54
  createQueryClassTaggedValue,
52
55
  createQueryDataSpaceTaggedValue,
53
- type DataSpaceInfo,
54
56
  } from '@finos/legend-extension-dsl-data-space/application';
55
57
  import { createDataSpaceDepoRepo } from './DataSpaceQueryBuilderHelper.js';
56
58
 
@@ -93,21 +95,40 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
93
95
  this.dataSpacePath,
94
96
  this.graphManagerState.graph,
95
97
  );
96
- const dataSpaceExecutableTemplate = guaranteeNonNullable(
97
- dataSpace.executables
98
- ?.filter(filterByType(DataSpaceExecutableTemplate))
99
- .find((executable) => executable.id === this.templateQueryId),
100
- `Can't find template query with id '${this.templateQueryId}'`,
98
+ let template = dataSpace.executables?.find(
99
+ (executable) => executable.id === this.templateQueryId,
101
100
  );
102
- const executionContext = guaranteeNonNullable(
103
- dataSpaceExecutableTemplate.executionContextKey
104
- ? dataSpace.executionContexts.filter(
105
- (ec) => ec.name === dataSpaceExecutableTemplate.executionContextKey,
106
- )[0]
107
- : dataSpace.defaultExecutionContext,
108
- `Can't find execution context '${dataSpaceExecutableTemplate.executionContextKey}'`,
101
+ if (!template) {
102
+ template = dataSpace.executables?.find(
103
+ (executable) =>
104
+ executable instanceof DataSpacePackageableElementExecutable &&
105
+ executable.executable.value.path === this.templateQueryId,
106
+ );
107
+ }
108
+ if (!template) {
109
+ throw new IllegalStateError(
110
+ `Can't find template query with id '${this.templateQueryId}'`,
111
+ );
112
+ }
113
+ const executionContext = getExecutionContextFromDataspaceExecutable(
114
+ dataSpace,
115
+ template,
116
+ );
117
+ if (!executionContext) {
118
+ throw new IllegalStateError(
119
+ `Can't find a correpsonding execution context`,
120
+ );
121
+ }
122
+ const query = getQueryFromDataspaceExecutable(
123
+ template,
124
+ this.graphManagerState,
109
125
  );
110
- this.templateQueryTitle = dataSpaceExecutableTemplate.title;
126
+ if (!query) {
127
+ throw new IllegalStateError(
128
+ `Can't fetch query from dataspace executable`,
129
+ );
130
+ }
131
+ this.templateQueryTitle = template.title;
111
132
  let dataSpaceAnalysisResult;
112
133
  try {
113
134
  const project = StoreProjectData.serialization.fromJson(
@@ -160,7 +181,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
160
181
  );
161
182
  queryBuilderState.setExecutionContext(executionContext);
162
183
  queryBuilderState.propagateExecutionContextChange(executionContext);
163
- queryBuilderState.initializeWithQuery(dataSpaceExecutableTemplate.query);
184
+ queryBuilderState.initializeWithQuery(query);
164
185
  return queryBuilderState;
165
186
  }
166
187