@finos/legend-extension-dsl-data-space 10.3.62 → 10.3.64
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/index.css +1 -1
- package/lib/package.json +2 -2
- package/lib/stores/query-builder/DataSpaceQueryBuilderState.d.ts +1 -1
- package/lib/stores/query-builder/DataSpaceQueryBuilderState.d.ts.map +1 -1
- package/lib/stores/query-builder/DataSpaceQueryBuilderState.js +25 -13
- package/lib/stores/query-builder/DataSpaceQueryBuilderState.js.map +1 -1
- package/package.json +8 -8
- package/src/stores/query-builder/DataSpaceQueryBuilderState.ts +36 -15
package/lib/index.css
CHANGED
package/lib/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-extension-dsl-data-space",
|
|
3
|
-
"version": "10.3.
|
|
3
|
+
"version": "10.3.64",
|
|
4
4
|
"description": "Legend extension for Data Space DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"@finos/legend-server-sdlc": "workspace:*",
|
|
54
54
|
"@finos/legend-shared": "workspace:*",
|
|
55
55
|
"@finos/legend-storage": "workspace:*",
|
|
56
|
-
"@types/react": "18.3.
|
|
56
|
+
"@types/react": "18.3.5",
|
|
57
57
|
"mobx": "6.13.1",
|
|
58
58
|
"mobx-react-lite": "4.0.7",
|
|
59
59
|
"react": "18.3.1",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { type GenericLegendApplicationStore } from '@finos/legend-application';
|
|
17
17
|
import { type QueryBuilderConfig, type QuerySDLC, type QueryBuilderWorkflowState, type QueryBuilderActionConfig, QueryBuilderState } from '@finos/legend-query-builder';
|
|
18
|
-
import { type GraphManagerState, type QueryExecutionContext, type Runtime, type Mapping
|
|
18
|
+
import { type Class, type GraphManagerState, type QueryExecutionContext, type Runtime, type Mapping } from '@finos/legend-graph';
|
|
19
19
|
import { type DepotServerClient } from '@finos/legend-server-depot';
|
|
20
20
|
import { type GeneratorFn, ActionState } from '@finos/legend-shared';
|
|
21
21
|
import { type DataSpaceExecutionContext, type DataSpaceExecutable, DataSpace } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../src/stores/query-builder/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,KAAK,iBAAiB,
|
|
1
|
+
{"version":3,"file":"DataSpaceQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../src/stores/query-builder/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,9 +15,9 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import {} from '@finos/legend-application';
|
|
17
17
|
import { QueryBuilderState, } from '@finos/legend-query-builder';
|
|
18
|
-
import { getMappingCompatibleClasses, RuntimePointer,
|
|
18
|
+
import { getMappingCompatibleClasses, RuntimePointer, Package, QueryDataSpaceExecutionContext, Service, elementBelongsToPackage, } from '@finos/legend-graph';
|
|
19
19
|
import { DepotScope, SNAPSHOT_VERSION_ALIAS, } from '@finos/legend-server-depot';
|
|
20
|
-
import { ActionState, assertErrorThrown, getNullableFirstEntry, filterByType,
|
|
20
|
+
import { ActionState, assertErrorThrown, getNullableFirstEntry, filterByType, } from '@finos/legend-shared';
|
|
21
21
|
import { action, flow, makeObservable, observable } from 'mobx';
|
|
22
22
|
import { renderDataSpaceQueryBuilderSetupPanelContent } from '../../components/query-builder/DataSpaceQueryBuilder.js';
|
|
23
23
|
import { DataSpace, DataSpacePackageableElementExecutable, } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
|
|
@@ -25,19 +25,31 @@ import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graph-manager/protocol
|
|
|
25
25
|
import { DataSpaceAdvancedSearchState } from '../query/DataSpaceAdvancedSearchState.js';
|
|
26
26
|
import { extractDataSpaceInfo, } from '../shared/DataSpaceInfo.js';
|
|
27
27
|
import { generateDataSpaceTemplateQueryCreatorRoute } from '../../__lib__/to-delete/DSL_DataSpace_LegendQueryNavigation_to_delete.js';
|
|
28
|
+
const matchesDataElement = (_class, element) => {
|
|
29
|
+
if (_class === element) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
if (element instanceof Package) {
|
|
33
|
+
return elementBelongsToPackage(_class, element);
|
|
34
|
+
}
|
|
35
|
+
return false;
|
|
36
|
+
};
|
|
28
37
|
export const resolveUsableDataSpaceClasses = (dataSpace, mapping, graphManagerState) => {
|
|
38
|
+
const compatibleClasses = getMappingCompatibleClasses(mapping, graphManagerState.usableClasses);
|
|
29
39
|
if (dataSpace.elements?.length) {
|
|
30
|
-
const
|
|
31
|
-
return
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
.
|
|
35
|
-
.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
40
|
+
const elements = dataSpace.elements;
|
|
41
|
+
return compatibleClasses.filter((_class) => {
|
|
42
|
+
const _classElements = elements
|
|
43
|
+
.filter((e) => matchesDataElement(_class, e.element.value))
|
|
44
|
+
// we sort because we respect the closest definition to the element.
|
|
45
|
+
.sort((a, b) => b.element.value.path.length - a.element.value.path.length);
|
|
46
|
+
if (!_classElements.length) {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
return !_classElements[0]?.exclude;
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
return compatibleClasses;
|
|
41
53
|
};
|
|
42
54
|
// could be abstracted for element
|
|
43
55
|
export class DataSpacesBuilderRepoistory {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/query-builder/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAsC,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAKL,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"DataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/query-builder/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-extension-dsl-data-space",
|
|
3
|
-
"version": "10.3.
|
|
3
|
+
"version": "10.3.64",
|
|
4
4
|
"description": "Legend extension for Data Space DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -43,17 +43,17 @@
|
|
|
43
43
|
"test:watch": "jest --watch"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@finos/legend-application": "15.1.
|
|
47
|
-
"@finos/legend-art": "7.1.
|
|
48
|
-
"@finos/legend-extension-dsl-diagram": "8.1.
|
|
49
|
-
"@finos/legend-graph": "31.10.
|
|
50
|
-
"@finos/legend-lego": "1.2.
|
|
51
|
-
"@finos/legend-query-builder": "4.14.
|
|
46
|
+
"@finos/legend-application": "15.1.27",
|
|
47
|
+
"@finos/legend-art": "7.1.54",
|
|
48
|
+
"@finos/legend-extension-dsl-diagram": "8.1.2",
|
|
49
|
+
"@finos/legend-graph": "31.10.26",
|
|
50
|
+
"@finos/legend-lego": "1.2.64",
|
|
51
|
+
"@finos/legend-query-builder": "4.14.84",
|
|
52
52
|
"@finos/legend-server-depot": "6.0.58",
|
|
53
53
|
"@finos/legend-server-sdlc": "5.3.29",
|
|
54
54
|
"@finos/legend-shared": "10.0.53",
|
|
55
55
|
"@finos/legend-storage": "3.0.103",
|
|
56
|
-
"@types/react": "18.3.
|
|
56
|
+
"@types/react": "18.3.5",
|
|
57
57
|
"mobx": "6.13.1",
|
|
58
58
|
"mobx-react-lite": "4.0.7",
|
|
59
59
|
"react": "18.3.1",
|
|
@@ -23,17 +23,17 @@ import {
|
|
|
23
23
|
QueryBuilderState,
|
|
24
24
|
} from '@finos/legend-query-builder';
|
|
25
25
|
import {
|
|
26
|
+
type Class,
|
|
26
27
|
type GraphManagerState,
|
|
28
|
+
getMappingCompatibleClasses,
|
|
29
|
+
RuntimePointer,
|
|
27
30
|
type QueryExecutionContext,
|
|
28
31
|
type Runtime,
|
|
29
32
|
type Mapping,
|
|
30
|
-
getMappingCompatibleClasses,
|
|
31
|
-
RuntimePointer,
|
|
32
|
-
Class,
|
|
33
|
-
getDescendantsOfPackage,
|
|
34
33
|
Package,
|
|
35
34
|
QueryDataSpaceExecutionContext,
|
|
36
35
|
Service,
|
|
36
|
+
elementBelongsToPackage,
|
|
37
37
|
} from '@finos/legend-graph';
|
|
38
38
|
import {
|
|
39
39
|
type DepotServerClient,
|
|
@@ -47,7 +47,6 @@ import {
|
|
|
47
47
|
assertErrorThrown,
|
|
48
48
|
getNullableFirstEntry,
|
|
49
49
|
filterByType,
|
|
50
|
-
uniq,
|
|
51
50
|
} from '@finos/legend-shared';
|
|
52
51
|
import { action, flow, makeObservable, observable } from 'mobx';
|
|
53
52
|
import { renderDataSpaceQueryBuilderSetupPanelContent } from '../../components/query-builder/DataSpaceQueryBuilder.js';
|
|
@@ -56,6 +55,7 @@ import {
|
|
|
56
55
|
type DataSpaceExecutable,
|
|
57
56
|
DataSpace,
|
|
58
57
|
DataSpacePackageableElementExecutable,
|
|
58
|
+
type DataSpaceElement,
|
|
59
59
|
} from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
|
|
60
60
|
import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
|
|
61
61
|
import { DataSpaceAdvancedSearchState } from '../query/DataSpaceAdvancedSearchState.js';
|
|
@@ -67,23 +67,44 @@ import {
|
|
|
67
67
|
import type { ProjectGAVCoordinates } from '@finos/legend-storage';
|
|
68
68
|
import { generateDataSpaceTemplateQueryCreatorRoute } from '../../__lib__/to-delete/DSL_DataSpace_LegendQueryNavigation_to_delete.js';
|
|
69
69
|
|
|
70
|
+
const matchesDataElement = (
|
|
71
|
+
_class: Class,
|
|
72
|
+
element: DataSpaceElement,
|
|
73
|
+
): boolean => {
|
|
74
|
+
if (_class === element) {
|
|
75
|
+
return true;
|
|
76
|
+
}
|
|
77
|
+
if (element instanceof Package) {
|
|
78
|
+
return elementBelongsToPackage(_class, element);
|
|
79
|
+
}
|
|
80
|
+
return false;
|
|
81
|
+
};
|
|
82
|
+
|
|
70
83
|
export const resolveUsableDataSpaceClasses = (
|
|
71
84
|
dataSpace: DataSpace,
|
|
72
85
|
mapping: Mapping,
|
|
73
86
|
graphManagerState: GraphManagerState,
|
|
74
87
|
): Class[] => {
|
|
88
|
+
const compatibleClasses = getMappingCompatibleClasses(
|
|
89
|
+
mapping,
|
|
90
|
+
graphManagerState.usableClasses,
|
|
91
|
+
);
|
|
75
92
|
if (dataSpace.elements?.length) {
|
|
76
|
-
const
|
|
77
|
-
return
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
.
|
|
81
|
-
.
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
93
|
+
const elements = dataSpace.elements;
|
|
94
|
+
return compatibleClasses.filter((_class) => {
|
|
95
|
+
const _classElements = elements
|
|
96
|
+
.filter((e) => matchesDataElement(_class, e.element.value))
|
|
97
|
+
// we sort because we respect the closest definition to the element.
|
|
98
|
+
.sort(
|
|
99
|
+
(a, b) => b.element.value.path.length - a.element.value.path.length,
|
|
100
|
+
);
|
|
101
|
+
if (!_classElements.length) {
|
|
102
|
+
return false;
|
|
103
|
+
}
|
|
104
|
+
return !_classElements[0]?.exclude;
|
|
105
|
+
});
|
|
85
106
|
}
|
|
86
|
-
return
|
|
107
|
+
return compatibleClasses;
|
|
87
108
|
};
|
|
88
109
|
export interface DataSpaceQuerySDLC extends QuerySDLC {
|
|
89
110
|
groupId: string;
|