@finos/legend-extension-dsl-data-space 10.2.2 → 10.2.3
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/query/DSL_DataSpace_LegendQueryApplicationPlugin.d.ts +3 -1
- package/lib/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.d.ts.map +1 -1
- package/lib/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.js +23 -7
- package/lib/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.js.map +1 -1
- package/lib/components/query/QueryDataSpaceUtil.d.ts +19 -0
- package/lib/components/query/QueryDataSpaceUtil.d.ts.map +1 -0
- package/lib/components/query/QueryDataSpaceUtil.js +25 -0
- package/lib/components/query/QueryDataSpaceUtil.js.map +1 -0
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/package.json +2 -2
- package/src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx +37 -14
- package/src/components/query/QueryDataSpaceUtil.ts +34 -0
- package/tsconfig.json +1 -0
|
@@ -14,13 +14,15 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
/// <reference types="react" resolution-mode="require"/>
|
|
17
|
-
import { type ExistingQueryEditorStateBuilder, type QueryEditorStore, type QuerySetupActionConfiguration, LegendQueryApplicationPlugin, type QueryEditorActionConfiguration } from '@finos/legend-application-query';
|
|
17
|
+
import { type ExistingQueryEditorStateBuilder, type QueryEditorStore, type QuerySetupActionConfiguration, LegendQueryApplicationPlugin, type QueryEditorActionConfiguration, type NewQueryNavigationPath } from '@finos/legend-application-query';
|
|
18
18
|
import { type ApplicationPageEntry } from '@finos/legend-application';
|
|
19
19
|
export declare class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryApplicationPlugin {
|
|
20
20
|
constructor();
|
|
21
|
+
getExtraRootAppRedirectPath(): string | undefined;
|
|
21
22
|
getExtraApplicationPageEntries(): ApplicationPageEntry[];
|
|
22
23
|
getExtraQuerySetupActionConfigurations(): QuerySetupActionConfiguration[];
|
|
23
24
|
getExtraExistingQueryEditorStateBuilders(): ExistingQueryEditorStateBuilder[];
|
|
25
|
+
getExtraNewQueryNavigationPaths(): NewQueryNavigationPath[];
|
|
24
26
|
getExtraQueryHeaders(): ((editorStore: QueryEditorStore) => React.ReactNode | undefined)[];
|
|
25
27
|
getExtraQueryEditorActionConfigurations(): QueryEditorActionConfiguration[];
|
|
26
28
|
}
|
|
@@ -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,+BAA+B,EACpC,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAElC,4BAA4B,EAI5B,KAAK,8BAA8B,
|
|
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,+BAA+B,EACpC,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAElC,4BAA4B,EAI5B,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AA8DnC,qBAAa,0CAA2C,SAAQ,4BAA4B;;IAKjF,2BAA2B,IAAI,MAAM,GAAG,SAAS;IAIjD,8BAA8B,IAAI,oBAAoB,EAAE;IAwBxD,sCAAsC,IAAI,6BAA6B,EAAE;IAoBzE,wCAAwC,IAAI,+BAA+B,EAAE;IA+J7E,+BAA+B,IAAI,sBAAsB,EAAE;IA6B3D,oBAAoB,IAAI,CAAC,CAChC,WAAW,EAAE,gBAAgB,KAC1B,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC,EAAE;IAoB1B,uCAAuC,IAAI,8BAA8B,EAAE;CAqFrF"}
|
|
@@ -20,8 +20,7 @@ import { ArrowCircleUpIcon, SquareIcon } from '@finos/legend-art';
|
|
|
20
20
|
import { ActionAlertActionType, ActionAlertType, } from '@finos/legend-application';
|
|
21
21
|
import { DATA_SPACE_QUERY_ROUTE_PATTERN, generateDataSpaceQueryCreatorRoute, generateDataSpaceQuerySetupRoute, generateDataSpaceTemplateQueryPromotionRoute, } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
|
|
22
22
|
import { DataSpaceQueryCreator } from './DataSpaceQueryCreator.js';
|
|
23
|
-
import {
|
|
24
|
-
import { QUERY_PROFILE_PATH, QUERY_PROFILE_TAG_DATA_SPACE, } from '../../graph/DSL_DataSpace_MetaModelConst.js';
|
|
23
|
+
import {} from '@finos/legend-graph';
|
|
25
24
|
import { DataSpaceQueryBuilderState, DataSpaceProjectInfo, } from '../../stores/query/DataSpaceQueryBuilderState.js';
|
|
26
25
|
import { getOwnDataSpace } from '../../graph-manager/DSL_DataSpace_GraphManagerHelper.js';
|
|
27
26
|
import { assertErrorThrown, buildUrl, guaranteeNonNullable, LogEvent, } from '@finos/legend-shared';
|
|
@@ -33,6 +32,7 @@ import { flowResult } from 'mobx';
|
|
|
33
32
|
import { DataSpaceTemplateQueryCreator } from './DataSpaceTemplateQueryCreator.js';
|
|
34
33
|
import { DataSpaceTemplateQueryCreatorStore } from '../../stores/query/DataSpaceTemplateQueryCreatorStore.js';
|
|
35
34
|
import { parseProjectIdentifier } from '@finos/legend-storage';
|
|
35
|
+
import { getDataSpaceQueryInfo } from './QueryDataSpaceUtil.js';
|
|
36
36
|
const resolveExecutionContext = (dataSpace, queryMapping, queryRuntime) => {
|
|
37
37
|
const matchingExecContexts = dataSpace.executionContexts.filter((ec) => ec.mapping.value === queryMapping);
|
|
38
38
|
if (matchingExecContexts.length > 1) {
|
|
@@ -47,6 +47,9 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
|
47
47
|
constructor() {
|
|
48
48
|
super(packageJson.extensions.applicationQueryPlugin, packageJson.version);
|
|
49
49
|
}
|
|
50
|
+
getExtraRootAppRedirectPath() {
|
|
51
|
+
return DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP;
|
|
52
|
+
}
|
|
50
53
|
getExtraApplicationPageEntries() {
|
|
51
54
|
return [
|
|
52
55
|
// data space query editor setup
|
|
@@ -88,11 +91,8 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
|
88
91
|
getExtraExistingQueryEditorStateBuilders() {
|
|
89
92
|
return [
|
|
90
93
|
async (query, editorStore) => {
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
isValidFullPath(taggedValue.value));
|
|
94
|
-
if (dataSpaceTaggedValue) {
|
|
95
|
-
const dataSpacePath = dataSpaceTaggedValue.value;
|
|
94
|
+
const dataSpacePath = getDataSpaceQueryInfo(query);
|
|
95
|
+
if (dataSpacePath) {
|
|
96
96
|
const dataSpace = getOwnDataSpace(dataSpacePath, editorStore.graphManagerState.graph);
|
|
97
97
|
const mapping = query.mapping.value;
|
|
98
98
|
const matchingExecutionContext = resolveExecutionContext(dataSpace, mapping, query.runtime.value);
|
|
@@ -174,6 +174,22 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
|
174
174
|
},
|
|
175
175
|
];
|
|
176
176
|
}
|
|
177
|
+
getExtraNewQueryNavigationPaths() {
|
|
178
|
+
return [
|
|
179
|
+
(query, editorStore) => {
|
|
180
|
+
const dataSpacePath = getDataSpaceQueryInfo(query);
|
|
181
|
+
const queryBuilderState = editorStore.queryBuilderState;
|
|
182
|
+
if (dataSpacePath &&
|
|
183
|
+
queryBuilderState instanceof DataSpaceQueryBuilderState) {
|
|
184
|
+
queryBuilderState.executionContext.name;
|
|
185
|
+
return generateDataSpaceQueryCreatorRoute(query.groupId, query.artifactId, query.versionId, dataSpacePath,
|
|
186
|
+
// TODO: fix execution key once that is fixed
|
|
187
|
+
queryBuilderState.executionContext.name, undefined, undefined);
|
|
188
|
+
}
|
|
189
|
+
return undefined;
|
|
190
|
+
},
|
|
191
|
+
];
|
|
192
|
+
}
|
|
177
193
|
getExtraQueryHeaders() {
|
|
178
194
|
return [
|
|
179
195
|
(editorStore) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DSL_DataSpace_LegendQueryApplicationPlugin.js","sourceRoot":"","sources":["../../../src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,WAAW,MAAM,uBAAuB,CAAC,SAAS,IAAI,EAAE,MAAM,EAAE,CAAC;AACxE,OAAO,EAIL,wBAAwB,EACxB,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"DSL_DataSpace_LegendQueryApplicationPlugin.js","sourceRoot":"","sources":["../../../src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020-present, Goldman Sachs
|
|
3
|
+
*
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
import { type Query } from '@finos/legend-graph';
|
|
17
|
+
export declare const getDataSpaceQueryInfo: (query: Query) => string | undefined;
|
|
18
|
+
export declare const isDataSpaceQuery: (query: Query) => boolean;
|
|
19
|
+
//# sourceMappingURL=QueryDataSpaceUtil.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"QueryDataSpaceUtil.d.ts","sourceRoot":"","sources":["../../../src/components/query/QueryDataSpaceUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAmB,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAMlE,eAAO,MAAM,qBAAqB,UAAW,KAAK,KAAG,MAAM,GAAG,SAQ7D,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,KAAK,KAAG,OACT,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020-present, Goldman Sachs
|
|
3
|
+
*
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
import { isValidFullPath } from '@finos/legend-graph';
|
|
17
|
+
import { QUERY_PROFILE_PATH, QUERY_PROFILE_TAG_DATA_SPACE, } from '../../graph/DSL_DataSpace_MetaModelConst.js';
|
|
18
|
+
export const getDataSpaceQueryInfo = (query) => {
|
|
19
|
+
const dataSpaceTaggedValue = query.taggedValues?.find((taggedValue) => taggedValue.profile === QUERY_PROFILE_PATH &&
|
|
20
|
+
taggedValue.tag === QUERY_PROFILE_TAG_DATA_SPACE &&
|
|
21
|
+
isValidFullPath(taggedValue.value));
|
|
22
|
+
return dataSpaceTaggedValue?.value;
|
|
23
|
+
};
|
|
24
|
+
export const isDataSpaceQuery = (query) => Boolean(getDataSpaceQueryInfo(query));
|
|
25
|
+
//# sourceMappingURL=QueryDataSpaceUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"QueryDataSpaceUtil.js","sourceRoot":"","sources":["../../../src/components/query/QueryDataSpaceUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,eAAe,EAAc,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,kBAAkB,EAClB,4BAA4B,GAC7B,MAAM,6CAA6C,CAAC;AAErD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,KAAY,EAAsB,EAAE;IACxE,MAAM,oBAAoB,GAAG,KAAK,CAAC,YAAY,EAAE,IAAI,CACnD,CAAC,WAAW,EAAE,EAAE,CACd,WAAW,CAAC,OAAO,KAAK,kBAAkB;QAC1C,WAAW,CAAC,GAAG,KAAK,4BAA4B;QAChD,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CACrC,CAAC;IACF,OAAO,oBAAoB,EAAE,KAAK,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAW,EAAE,CACxD,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC"}
|
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",
|
|
3
|
-
"version": "10.2.
|
|
3
|
+
"version": "10.2.3",
|
|
4
4
|
"description": "Legend extension for Data Space DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@finos/legend-application": "15.0.74",
|
|
48
|
-
"@finos/legend-application-query": "13.
|
|
48
|
+
"@finos/legend-application-query": "13.4.0",
|
|
49
49
|
"@finos/legend-application-studio": "28.16.11",
|
|
50
50
|
"@finos/legend-art": "7.1.26",
|
|
51
51
|
"@finos/legend-extension-dsl-diagram": "8.0.155",
|
|
@@ -25,6 +25,7 @@ import {
|
|
|
25
25
|
createViewProjectHandler,
|
|
26
26
|
createViewSDLCProjectHandler,
|
|
27
27
|
type QueryEditorActionConfiguration,
|
|
28
|
+
type NewQueryNavigationPath,
|
|
28
29
|
} from '@finos/legend-application-query';
|
|
29
30
|
import { ArrowCircleUpIcon, SquareIcon } from '@finos/legend-art';
|
|
30
31
|
import {
|
|
@@ -43,12 +44,7 @@ import {
|
|
|
43
44
|
type Query,
|
|
44
45
|
type Mapping,
|
|
45
46
|
type PackageableRuntime,
|
|
46
|
-
isValidFullPath,
|
|
47
47
|
} from '@finos/legend-graph';
|
|
48
|
-
import {
|
|
49
|
-
QUERY_PROFILE_PATH,
|
|
50
|
-
QUERY_PROFILE_TAG_DATA_SPACE,
|
|
51
|
-
} from '../../graph/DSL_DataSpace_MetaModelConst.js';
|
|
52
48
|
import {
|
|
53
49
|
DataSpaceQueryBuilderState,
|
|
54
50
|
DataSpaceProjectInfo,
|
|
@@ -77,6 +73,7 @@ import type {
|
|
|
77
73
|
import { DataSpaceTemplateQueryCreator } from './DataSpaceTemplateQueryCreator.js';
|
|
78
74
|
import { DataSpaceTemplateQueryCreatorStore } from '../../stores/query/DataSpaceTemplateQueryCreatorStore.js';
|
|
79
75
|
import { parseProjectIdentifier } from '@finos/legend-storage';
|
|
76
|
+
import { getDataSpaceQueryInfo } from './QueryDataSpaceUtil.js';
|
|
80
77
|
|
|
81
78
|
const resolveExecutionContext = (
|
|
82
79
|
dataSpace: DataSpace,
|
|
@@ -102,6 +99,10 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
|
102
99
|
super(packageJson.extensions.applicationQueryPlugin, packageJson.version);
|
|
103
100
|
}
|
|
104
101
|
|
|
102
|
+
override getExtraRootAppRedirectPath(): string | undefined {
|
|
103
|
+
return DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP;
|
|
104
|
+
}
|
|
105
|
+
|
|
105
106
|
override getExtraApplicationPageEntries(): ApplicationPageEntry[] {
|
|
106
107
|
return [
|
|
107
108
|
// data space query editor setup
|
|
@@ -152,15 +153,8 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
|
152
153
|
query: Query,
|
|
153
154
|
editorStore: ExistingQueryEditorStore,
|
|
154
155
|
): Promise<QueryBuilderState | undefined> => {
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
taggedValue.profile === QUERY_PROFILE_PATH &&
|
|
158
|
-
taggedValue.tag === QUERY_PROFILE_TAG_DATA_SPACE &&
|
|
159
|
-
isValidFullPath(taggedValue.value),
|
|
160
|
-
);
|
|
161
|
-
|
|
162
|
-
if (dataSpaceTaggedValue) {
|
|
163
|
-
const dataSpacePath = dataSpaceTaggedValue.value;
|
|
156
|
+
const dataSpacePath = getDataSpaceQueryInfo(query);
|
|
157
|
+
if (dataSpacePath) {
|
|
164
158
|
const dataSpace = getOwnDataSpace(
|
|
165
159
|
dataSpacePath,
|
|
166
160
|
editorStore.graphManagerState.graph,
|
|
@@ -312,6 +306,35 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
|
312
306
|
];
|
|
313
307
|
}
|
|
314
308
|
|
|
309
|
+
override getExtraNewQueryNavigationPaths(): NewQueryNavigationPath[] {
|
|
310
|
+
return [
|
|
311
|
+
(
|
|
312
|
+
query: Query,
|
|
313
|
+
editorStore: ExistingQueryEditorStore,
|
|
314
|
+
): string | undefined => {
|
|
315
|
+
const dataSpacePath = getDataSpaceQueryInfo(query);
|
|
316
|
+
const queryBuilderState = editorStore.queryBuilderState;
|
|
317
|
+
if (
|
|
318
|
+
dataSpacePath &&
|
|
319
|
+
queryBuilderState instanceof DataSpaceQueryBuilderState
|
|
320
|
+
) {
|
|
321
|
+
queryBuilderState.executionContext.name;
|
|
322
|
+
return generateDataSpaceQueryCreatorRoute(
|
|
323
|
+
query.groupId,
|
|
324
|
+
query.artifactId,
|
|
325
|
+
query.versionId,
|
|
326
|
+
dataSpacePath,
|
|
327
|
+
// TODO: fix execution key once that is fixed
|
|
328
|
+
queryBuilderState.executionContext.name,
|
|
329
|
+
undefined,
|
|
330
|
+
undefined,
|
|
331
|
+
);
|
|
332
|
+
}
|
|
333
|
+
return undefined;
|
|
334
|
+
},
|
|
335
|
+
];
|
|
336
|
+
}
|
|
337
|
+
|
|
315
338
|
override getExtraQueryHeaders(): ((
|
|
316
339
|
editorStore: QueryEditorStore,
|
|
317
340
|
) => React.ReactNode | undefined)[] {
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020-present, Goldman Sachs
|
|
3
|
+
*
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import { isValidFullPath, type Query } from '@finos/legend-graph';
|
|
18
|
+
import {
|
|
19
|
+
QUERY_PROFILE_PATH,
|
|
20
|
+
QUERY_PROFILE_TAG_DATA_SPACE,
|
|
21
|
+
} from '../../graph/DSL_DataSpace_MetaModelConst.js';
|
|
22
|
+
|
|
23
|
+
export const getDataSpaceQueryInfo = (query: Query): string | undefined => {
|
|
24
|
+
const dataSpaceTaggedValue = query.taggedValues?.find(
|
|
25
|
+
(taggedValue) =>
|
|
26
|
+
taggedValue.profile === QUERY_PROFILE_PATH &&
|
|
27
|
+
taggedValue.tag === QUERY_PROFILE_TAG_DATA_SPACE &&
|
|
28
|
+
isValidFullPath(taggedValue.value),
|
|
29
|
+
);
|
|
30
|
+
return dataSpaceTaggedValue?.value;
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
export const isDataSpaceQuery = (query: Query): boolean =>
|
|
34
|
+
Boolean(getDataSpaceQueryInfo(query));
|
package/tsconfig.json
CHANGED
|
@@ -39,6 +39,7 @@
|
|
|
39
39
|
"./src/__lib__/studio/DSL_DataSpace_LegendStudioDocumentation.ts",
|
|
40
40
|
"./src/components/index.ts",
|
|
41
41
|
"./src/components/query/DSL_DataSpace_LegendQueryDocumentation.ts",
|
|
42
|
+
"./src/components/query/QueryDataSpaceUtil.ts",
|
|
42
43
|
"./src/components/query/index.ts",
|
|
43
44
|
"./src/components/studio/index.ts",
|
|
44
45
|
"./src/graph/DSL_DataSpace_HashUtils.ts",
|