@finos/legend-extension-dsl-data-space 10.0.55 → 10.1.0
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/DataSpaceQueryBuilder.d.ts.map +1 -1
- package/lib/components/query/DataSpaceQueryBuilder.js +17 -3
- package/lib/components/query/DataSpaceQueryBuilder.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/package.json +7 -7
- package/src/components/query/DataSpaceQueryBuilder.tsx +37 -4
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/components/query/DataSpaceQueryBuilder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAkBH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;
|
1
|
+
{"version":3,"file":"DataSpaceQueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/components/query/DataSpaceQueryBuilder.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAkBH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAkBnG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAiBzE,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AACF,eAAO,MAAM,oBAAoB,UACxB,aAAa,KACnB,eAGD,CAAC;AACH,eAAO,MAAM,0BAA0B,WAC7B,eAAe,KACtB,MAAM,SAuBR,CAAC;AAwSF,eAAO,MAAM,4CAA4C,sBACpC,0BAA0B,KAC5C,MAAM,SAIR,CAAC"}
|
@@ -18,10 +18,10 @@ import { CustomSelectorInput, createFilter, PURE_RuntimeIcon, PlayIcon, Dropdown
|
|
18
18
|
import { observer } from 'mobx-react-lite';
|
19
19
|
import { useApplicationStore } from '@finos/legend-application';
|
20
20
|
import { buildRuntimeValueOption, getRuntimeOptionFormatter, QueryBuilderClassSelector, } from '@finos/legend-query-builder';
|
21
|
-
import { getMappingCompatibleClasses, getMappingCompatibleRuntimes, PackageableElementExplicitReference, RuntimePointer, } from '@finos/legend-graph';
|
21
|
+
import { getMappingCompatibleClasses, getMappingCompatibleRuntimes, PackageableElementExplicitReference, RuntimePointer, Class, Package, getDescendantsOfPackage, } from '@finos/legend-graph';
|
22
22
|
import { generateGAVCoordinates } from '@finos/legend-storage';
|
23
23
|
import { useEffect, useMemo, useState } from 'react';
|
24
|
-
import { debounce, guaranteeType } from '@finos/legend-shared';
|
24
|
+
import { debounce, filterByType, guaranteeType, uniq, } from '@finos/legend-shared';
|
25
25
|
import { flowResult } from 'mobx';
|
26
26
|
import { DataSpaceIcon } from '../DSL_DataSpace_Icon.js';
|
27
27
|
import { DataSpaceAdvancedSearchModal } from './DataSpaceAdvancedSearchModal.js';
|
@@ -30,6 +30,20 @@ export const buildDataSpaceOption = (value) => ({
|
|
30
30
|
value,
|
31
31
|
});
|
32
32
|
export const formatDataSpaceOptionLabel = (option) => (_jsxs("div", { className: "query-builder__setup__data-space__option", title: `${option.label} - ${option.value.path} - ${generateGAVCoordinates(option.value.groupId, option.value.artifactId, option.value.versionId)}`, children: [_jsx("div", { className: "query-builder__setup__data-space__option__label", children: option.label }), _jsx("div", { className: "query-builder__setup__data-space__option__path", children: option.value.path }), _jsx("div", { className: "query-builder__setup__data-space__option__gav", children: generateGAVCoordinates(option.value.groupId, option.value.artifactId, option.value.versionId) })] }));
|
33
|
+
const resolveDataSpaceClasses = (dataSpace, mapping, graphManagerState) => {
|
34
|
+
if (dataSpace.elements?.length) {
|
35
|
+
const dataSpaceElements = dataSpace.elements.map((ep) => ep.element.value);
|
36
|
+
return uniq([
|
37
|
+
...dataSpaceElements.filter(filterByType(Class)),
|
38
|
+
...dataSpaceElements
|
39
|
+
.filter(filterByType(Package))
|
40
|
+
.map((_package) => Array.from(getDescendantsOfPackage(_package)))
|
41
|
+
.flat()
|
42
|
+
.filter(filterByType(Class)),
|
43
|
+
]);
|
44
|
+
}
|
45
|
+
return getMappingCompatibleClasses(mapping, graphManagerState.usableClasses);
|
46
|
+
};
|
33
47
|
const buildExecutionContextOption = (value) => ({
|
34
48
|
label: value.name,
|
35
49
|
value,
|
@@ -108,7 +122,7 @@ const DataSpaceQueryBuilderSetupPanelContent = observer((props) => {
|
|
108
122
|
.path,
|
109
123
|
});
|
110
124
|
// class
|
111
|
-
const classes =
|
125
|
+
const classes = resolveDataSpaceClasses(queryBuilderState.dataSpace, queryBuilderState.executionContext.mapping.value, queryBuilderState.graphManagerState);
|
112
126
|
useEffect(() => {
|
113
127
|
flowResult(queryBuilderState.loadDataSpaces('')).catch(applicationStore.alertUnhandledError);
|
114
128
|
}, [queryBuilderState, applicationStore]);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryBuilder.js","sourceRoot":"","sources":["../../../src/components/query/DataSpaceQueryBuilder.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,oBAAoB,EACpB,UAAU,GACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,6BAA6B,CAAC;AACrC,OAAO,
|
1
|
+
{"version":3,"file":"DataSpaceQueryBuilder.js","sourceRoot":"","sources":["../../../src/components/query/DataSpaceQueryBuilder.tsx"],"names":[],"mappings":"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"}
|
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.0
|
3
|
+
"version": "10.1.0",
|
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.36",
|
48
|
-
"@finos/legend-application-query": "13.0.
|
49
|
-
"@finos/legend-application-studio": "28.0
|
48
|
+
"@finos/legend-application-query": "13.0.44",
|
49
|
+
"@finos/legend-application-studio": "28.1.0",
|
50
50
|
"@finos/legend-art": "7.0.36",
|
51
|
-
"@finos/legend-extension-dsl-diagram": "8.0.
|
52
|
-
"@finos/legend-graph": "31.0
|
53
|
-
"@finos/legend-lego": "1.1.
|
54
|
-
"@finos/legend-query-builder": "4.2.
|
51
|
+
"@finos/legend-extension-dsl-diagram": "8.0.56",
|
52
|
+
"@finos/legend-graph": "31.1.0",
|
53
|
+
"@finos/legend-lego": "1.1.16",
|
54
|
+
"@finos/legend-query-builder": "4.2.1",
|
55
55
|
"@finos/legend-server-depot": "6.0.23",
|
56
56
|
"@finos/legend-shared": "10.0.22",
|
57
57
|
"@finos/legend-storage": "3.0.72",
|
@@ -38,17 +38,30 @@ import {
|
|
38
38
|
} from '@finos/legend-query-builder';
|
39
39
|
import {
|
40
40
|
type Runtime,
|
41
|
+
type GraphManagerState,
|
42
|
+
type Mapping,
|
41
43
|
getMappingCompatibleClasses,
|
42
44
|
getMappingCompatibleRuntimes,
|
43
45
|
PackageableElementExplicitReference,
|
44
46
|
RuntimePointer,
|
47
|
+
Class,
|
48
|
+
Package,
|
49
|
+
getDescendantsOfPackage,
|
45
50
|
} from '@finos/legend-graph';
|
46
51
|
import type { DataSpaceInfo } from '../../stores/query/DataSpaceInfo.js';
|
47
52
|
import { generateGAVCoordinates } from '@finos/legend-storage';
|
48
53
|
import { useEffect, useMemo, useState } from 'react';
|
49
|
-
import {
|
54
|
+
import {
|
55
|
+
debounce,
|
56
|
+
filterByType,
|
57
|
+
guaranteeType,
|
58
|
+
uniq,
|
59
|
+
} from '@finos/legend-shared';
|
50
60
|
import { flowResult } from 'mobx';
|
51
|
-
import type {
|
61
|
+
import type {
|
62
|
+
DataSpace,
|
63
|
+
DataSpaceExecutionContext,
|
64
|
+
} from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
|
52
65
|
import { DataSpaceIcon } from '../DSL_DataSpace_Icon.js';
|
53
66
|
import { DataSpaceAdvancedSearchModal } from './DataSpaceAdvancedSearchModal.js';
|
54
67
|
|
@@ -89,6 +102,25 @@ export const formatDataSpaceOptionLabel = (
|
|
89
102
|
</div>
|
90
103
|
);
|
91
104
|
|
105
|
+
const resolveDataSpaceClasses = (
|
106
|
+
dataSpace: DataSpace,
|
107
|
+
mapping: Mapping,
|
108
|
+
graphManagerState: GraphManagerState,
|
109
|
+
): Class[] => {
|
110
|
+
if (dataSpace.elements?.length) {
|
111
|
+
const dataSpaceElements = dataSpace.elements.map((ep) => ep.element.value);
|
112
|
+
return uniq([
|
113
|
+
...dataSpaceElements.filter(filterByType(Class)),
|
114
|
+
...dataSpaceElements
|
115
|
+
.filter(filterByType(Package))
|
116
|
+
.map((_package) => Array.from(getDescendantsOfPackage(_package)))
|
117
|
+
.flat()
|
118
|
+
.filter(filterByType(Class)),
|
119
|
+
]);
|
120
|
+
}
|
121
|
+
return getMappingCompatibleClasses(mapping, graphManagerState.usableClasses);
|
122
|
+
};
|
123
|
+
|
92
124
|
type ExecutionContextOption = {
|
93
125
|
label: string;
|
94
126
|
value: DataSpaceExecutionContext;
|
@@ -204,9 +236,10 @@ const DataSpaceQueryBuilderSetupPanelContent = observer(
|
|
204
236
|
});
|
205
237
|
|
206
238
|
// class
|
207
|
-
const classes =
|
239
|
+
const classes = resolveDataSpaceClasses(
|
240
|
+
queryBuilderState.dataSpace,
|
208
241
|
queryBuilderState.executionContext.mapping.value,
|
209
|
-
queryBuilderState.graphManagerState
|
242
|
+
queryBuilderState.graphManagerState,
|
210
243
|
);
|
211
244
|
|
212
245
|
useEffect(() => {
|