@finos/legend-extension-dsl-data-space 10.1.16 → 10.1.18
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.map +1 -1
- package/lib/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.js +4 -3
- package/lib/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.js.map +1 -1
- package/lib/components/query/DataSpaceAdvancedSearchModal.d.ts.map +1 -1
- package/lib/components/query/DataSpaceAdvancedSearchModal.js +7 -2
- package/lib/components/query/DataSpaceAdvancedSearchModal.js.map +1 -1
- package/lib/components/query/DataSpaceQueryBuilder.d.ts +4 -1
- package/lib/components/query/DataSpaceQueryBuilder.d.ts.map +1 -1
- package/lib/components/query/DataSpaceQueryBuilder.js +31 -22
- package/lib/components/query/DataSpaceQueryBuilder.js.map +1 -1
- package/lib/components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.d.ts.map +1 -1
- package/lib/components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.js +10 -0
- package/lib/components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.js.map +1 -1
- package/lib/components/studio/DataSpaceQueryAction.d.ts +22 -0
- package/lib/components/studio/DataSpaceQueryAction.d.ts.map +1 -0
- package/lib/components/studio/DataSpaceQueryAction.js +29 -0
- package/lib/components/studio/DataSpaceQueryAction.js.map +1 -0
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/lib/stores/query/DataSpaceAdvancedSearchState.d.ts.map +1 -1
- package/lib/stores/query/DataSpaceAdvancedSearchState.js +12 -9
- package/lib/stores/query/DataSpaceAdvancedSearchState.js.map +1 -1
- package/lib/stores/query/DataSpaceInfo.d.ts +3 -3
- package/lib/stores/query/DataSpaceInfo.d.ts.map +1 -1
- package/lib/stores/query/DataSpaceQueryBuilderState.d.ts +11 -6
- package/lib/stores/query/DataSpaceQueryBuilderState.d.ts.map +1 -1
- package/lib/stores/query/DataSpaceQueryBuilderState.js +77 -41
- package/lib/stores/query/DataSpaceQueryBuilderState.js.map +1 -1
- package/lib/stores/query/DataSpaceQueryCreatorStore.d.ts.map +1 -1
- package/lib/stores/query/DataSpaceQueryCreatorStore.js +8 -7
- package/lib/stores/query/DataSpaceQueryCreatorStore.js.map +1 -1
- package/lib/stores/query/DataSpaceQuerySetupStore.d.ts.map +1 -1
- package/lib/stores/query/DataSpaceQuerySetupStore.js +2 -2
- package/lib/stores/query/DataSpaceQuerySetupStore.js.map +1 -1
- package/package.json +8 -8
- package/src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx +17 -7
- package/src/components/query/DataSpaceAdvancedSearchModal.tsx +23 -26
- package/src/components/query/DataSpaceQueryBuilder.tsx +76 -48
- package/src/components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.tsx +10 -0
- package/src/components/studio/DataSpaceQueryAction.tsx +34 -0
- package/src/stores/query/DataSpaceAdvancedSearchState.ts +19 -28
- package/src/stores/query/DataSpaceInfo.ts +3 -3
- package/src/stores/query/DataSpaceQueryBuilderState.ts +125 -71
- package/src/stores/query/DataSpaceQueryCreatorStore.ts +23 -16
- package/src/stores/query/DataSpaceQuerySetupStore.ts +4 -3
- package/tsconfig.json +1 -0
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,6BAA6B,EAGnC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,OAAO,EACZ,KAAK,KAAK,
|
1
|
+
{"version":3,"file":"DataSpaceQueryBuilderState.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}
|
@@ -15,22 +15,45 @@
|
|
15
15
|
*/
|
16
16
|
import { DEFAULT_TYPEAHEAD_SEARCH_LIMIT, DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH, } from '@finos/legend-application';
|
17
17
|
import { QueryBuilderState } from '@finos/legend-query-builder';
|
18
|
-
import { getMappingCompatibleClasses, RuntimePointer, } from '@finos/legend-graph';
|
18
|
+
import { getMappingCompatibleClasses, RuntimePointer, Class, getDescendantsOfPackage, Package, } from '@finos/legend-graph';
|
19
19
|
import { DepotScope, SNAPSHOT_VERSION_ALIAS, } from '@finos/legend-server-depot';
|
20
|
-
import { ActionState, assertErrorThrown, getNullableFirstEntry, } from '@finos/legend-shared';
|
20
|
+
import { ActionState, assertErrorThrown, getNullableFirstEntry, filterByType, uniq, } from '@finos/legend-shared';
|
21
21
|
import { action, flow, makeObservable, observable } from 'mobx';
|
22
22
|
import { renderDataSpaceQueryBuilderSetupPanelContent } from '../../components/query/DataSpaceQueryBuilder.js';
|
23
|
+
import { DataSpace, } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
|
23
24
|
import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
|
24
25
|
import { extractDataSpaceInfo } from './DataSpaceInfo.js';
|
25
26
|
import { DataSpaceAdvancedSearchState } from './DataSpaceAdvancedSearchState.js';
|
26
|
-
export
|
27
|
-
|
28
|
-
|
27
|
+
export const resolveUsableDataSpaceClasses = (dataSpace, mapping, graphManagerState) => {
|
28
|
+
if (dataSpace.elements?.length) {
|
29
|
+
const dataSpaceElements = dataSpace.elements.map((ep) => ep.element.value);
|
30
|
+
return uniq([
|
31
|
+
...dataSpaceElements.filter(filterByType(Class)),
|
32
|
+
...dataSpaceElements
|
33
|
+
.filter(filterByType(Package))
|
34
|
+
.map((_package) => Array.from(getDescendantsOfPackage(_package)))
|
35
|
+
.flat()
|
36
|
+
.filter(filterByType(Class)),
|
37
|
+
]);
|
38
|
+
}
|
39
|
+
return getMappingCompatibleClasses(mapping, graphManagerState.usableClasses);
|
40
|
+
};
|
41
|
+
export class DataSpaceProjectInfo {
|
29
42
|
groupId;
|
30
43
|
artifactId;
|
31
44
|
versionId;
|
32
45
|
viewProject;
|
33
46
|
viewSDLCProject;
|
47
|
+
constructor(groupId, artifactId, versionId, viewProject, viewSDLCProject) {
|
48
|
+
this.groupId = groupId;
|
49
|
+
this.artifactId = artifactId;
|
50
|
+
this.versionId = versionId;
|
51
|
+
this.viewProject = viewProject;
|
52
|
+
this.viewSDLCProject = viewSDLCProject;
|
53
|
+
}
|
54
|
+
}
|
55
|
+
export class DataSpaceQueryBuilderState extends QueryBuilderState {
|
56
|
+
depotServerClient;
|
34
57
|
isAdvancedDataSpaceSearchEnabled;
|
35
58
|
loadDataSpacesState = ActionState.create();
|
36
59
|
onDataSpaceChange;
|
@@ -38,12 +61,14 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
|
|
38
61
|
onRuntimeChange;
|
39
62
|
onClassChange;
|
40
63
|
dataSpaceAnalysisResult;
|
64
|
+
projectInfo;
|
41
65
|
TEMPORARY__setupPanelContentRenderer = () => renderDataSpaceQueryBuilderSetupPanelContent(this);
|
66
|
+
dataSpace;
|
42
67
|
executionContext;
|
43
68
|
dataSpaces = [];
|
44
69
|
showRuntimeSelector = false;
|
45
70
|
advancedSearchState;
|
46
|
-
constructor(applicationStore, graphManagerState, depotServerClient, dataSpace, executionContext,
|
71
|
+
constructor(applicationStore, graphManagerState, depotServerClient, dataSpace, executionContext, onDataSpaceChange, isAdvancedDataSpaceSearchEnabled, dataSpaceAnalysisResult, onExecutionContextChange, onRuntimeChange, onClassChange, projectInfo) {
|
47
72
|
super(applicationStore, graphManagerState);
|
48
73
|
makeObservable(this, {
|
49
74
|
dataSpaces: observable,
|
@@ -59,18 +84,12 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
|
|
59
84
|
this.depotServerClient = depotServerClient;
|
60
85
|
this.dataSpace = dataSpace;
|
61
86
|
this.executionContext = executionContext;
|
62
|
-
this.
|
63
|
-
this.artifactId = artifactId;
|
64
|
-
this.versionId = versionId;
|
65
|
-
this.viewProject = viewProject;
|
66
|
-
this.viewSDLCProject = viewSDLCProject;
|
87
|
+
this.projectInfo = projectInfo;
|
67
88
|
this.onDataSpaceChange = onDataSpaceChange;
|
68
89
|
this.onExecutionContextChange = onExecutionContextChange;
|
69
90
|
this.onRuntimeChange = onRuntimeChange;
|
70
91
|
this.onClassChange = onClassChange;
|
71
|
-
|
72
|
-
// to turn this flag off
|
73
|
-
this.isAdvancedDataSpaceSearchEnabled = true;
|
92
|
+
this.isAdvancedDataSpaceSearchEnabled = isAdvancedDataSpaceSearchEnabled;
|
74
93
|
this.dataSpaceAnalysisResult = dataSpaceAnalysisResult;
|
75
94
|
}
|
76
95
|
get sideBarClassName() {
|
@@ -79,18 +98,20 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
|
|
79
98
|
: 'query-builder__setup__data-space';
|
80
99
|
}
|
81
100
|
showAdvancedSearchPanel() {
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
101
|
+
if (this.projectInfo && this.isAdvancedDataSpaceSearchEnabled) {
|
102
|
+
this.advancedSearchState = new DataSpaceAdvancedSearchState(this.applicationStore, this.graphManagerState, this.depotServerClient, {
|
103
|
+
viewProject: this.projectInfo.viewProject,
|
104
|
+
viewSDLCProject: this.projectInfo.viewSDLCProject,
|
105
|
+
}, {
|
106
|
+
groupId: this.projectInfo.groupId,
|
107
|
+
artifactId: this.projectInfo.artifactId,
|
108
|
+
versionId: this.projectInfo.versionId,
|
109
|
+
title: this.dataSpace.title,
|
110
|
+
name: this.dataSpace.name,
|
111
|
+
path: this.dataSpace.path,
|
112
|
+
defaultExecutionContext: this.dataSpace.defaultExecutionContext.name,
|
113
|
+
}, this.projectInfo.versionId === SNAPSHOT_VERSION_ALIAS);
|
114
|
+
}
|
94
115
|
}
|
95
116
|
hideAdvancedSearchPanel() {
|
96
117
|
this.advancedSearchState = undefined;
|
@@ -102,21 +123,36 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
|
|
102
123
|
this.showRuntimeSelector = val;
|
103
124
|
}
|
104
125
|
*loadDataSpaces(searchText) {
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
126
|
+
if (this.projectInfo) {
|
127
|
+
const isValidSearchString = searchText.length >= DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH;
|
128
|
+
this.loadDataSpacesState.inProgress();
|
129
|
+
const toGetSnapShot = this.projectInfo.versionId === SNAPSHOT_VERSION_ALIAS;
|
130
|
+
try {
|
131
|
+
this.dataSpaces = (yield this.depotServerClient.getEntitiesByClassifierPath(DATA_SPACE_ELEMENT_CLASSIFIER_PATH, {
|
132
|
+
search: isValidSearchString ? searchText : undefined,
|
133
|
+
scope: toGetSnapShot ? DepotScope.SNAPSHOT : DepotScope.RELEASES,
|
134
|
+
limit: DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
|
135
|
+
})).map((storedEntity) => extractDataSpaceInfo(storedEntity, toGetSnapShot));
|
136
|
+
this.loadDataSpacesState.pass();
|
137
|
+
}
|
138
|
+
catch (error) {
|
139
|
+
assertErrorThrown(error);
|
140
|
+
this.loadDataSpacesState.fail();
|
141
|
+
this.applicationStore.notificationService.notifyError(error);
|
142
|
+
}
|
115
143
|
}
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
144
|
+
else {
|
145
|
+
this.dataSpaces = this.graphManagerState.graph.allOwnElements
|
146
|
+
.filter(filterByType(DataSpace))
|
147
|
+
.map((e) => ({
|
148
|
+
groupId: undefined,
|
149
|
+
artifactId: undefined,
|
150
|
+
versionId: undefined,
|
151
|
+
path: e.path,
|
152
|
+
name: e.name,
|
153
|
+
title: e.title,
|
154
|
+
defaultExecutionContext: e.defaultExecutionContext.title,
|
155
|
+
}));
|
120
156
|
}
|
121
157
|
}
|
122
158
|
/**
|
@@ -135,7 +171,7 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
|
|
135
171
|
mappingModelCoverageAnalysisResult;
|
136
172
|
}
|
137
173
|
this.changeRuntime(new RuntimePointer(executionContext.defaultRuntime));
|
138
|
-
const compatibleClasses =
|
174
|
+
const compatibleClasses = resolveUsableDataSpaceClasses(this.dataSpace, mapping, this.graphManagerState);
|
139
175
|
// if there is no chosen class or the chosen one is not compatible
|
140
176
|
// with the mapping then pick a compatible class if possible
|
141
177
|
if (!this.class || !compatibleClasses.includes(this.class)) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,8BAA8B,EAC9B,8CAA8C,GAC/C,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAEL,2BAA2B,EAC3B,cAAc,
|
1
|
+
{"version":3,"file":"DataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryCreatorStore.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryCreatorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,gBAAgB,EAKhB,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,gBAAgB,EAChB,KAAK,yBAAyB,EAC9B,KAAK,2BAA2B,EAGjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;
|
1
|
+
{"version":3,"file":"DataSpaceQueryCreatorStore.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryCreatorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,gBAAgB,EAKhB,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,gBAAgB,EAChB,KAAK,yBAAyB,EAC9B,KAAK,2BAA2B,EAGjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AAmBpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAInE,eAAO,MAAM,+BAA+B,kBAC3B,MAAM,KACpB,gBAMF,CAAC;AAEF,eAAO,MAAM,2BAA2B,cAC3B,MAAM,KAChB,gBAMF,CAAC;AAEF,qBAAa,0BAA2B,SAAQ,gBAAgB;IAC9D,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,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGrC,gBAAgB,EAAE,2BAA2B,EAC7C,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,YAAY,EAAE,MAAM,GAAG,SAAS;IAalC,cAAc,IAAI,qBAAqB;IAQjC,2BAA2B,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAuJ/D,uBAAuB,CACrB,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE,GACzC,yBAAyB;CAqB7B"}
|
@@ -19,7 +19,7 @@ import { StoreProjectData, } from '@finos/legend-server-depot';
|
|
19
19
|
import { guaranteeNonNullable, guaranteeType, uuid, } from '@finos/legend-shared';
|
20
20
|
import { QUERY_PROFILE_PATH, QUERY_PROFILE_TAG_CLASS, QUERY_PROFILE_TAG_DATA_SPACE, } from '../../graph/DSL_DataSpace_MetaModelConst.js';
|
21
21
|
import { getDataSpace } from '../../graph-manager/DSL_DataSpace_GraphManagerHelper.js';
|
22
|
-
import { DataSpaceQueryBuilderState } from './DataSpaceQueryBuilderState.js';
|
22
|
+
import { DataSpaceQueryBuilderState, DataSpaceProjectInfo, } from './DataSpaceQueryBuilderState.js';
|
23
23
|
import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
|
24
24
|
import { DSL_DataSpace_getGraphManagerExtension } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
|
25
25
|
import { retrieveAnalyticsResultCache } from '../../graph-manager/action/analytics/DataSpaceAnalysisHelper.js';
|
@@ -73,14 +73,15 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
|
|
73
73
|
catch {
|
74
74
|
// do nothing
|
75
75
|
}
|
76
|
-
const
|
76
|
+
const projectInfo = new DataSpaceProjectInfo(this.groupId, this.artifactId, this.versionId, createViewProjectHandler(this.applicationStore), createViewSDLCProjectHandler(this.applicationStore, this.depotServerClient));
|
77
|
+
const queryBuilderState = new DataSpaceQueryBuilderState(this.applicationStore, this.graphManagerState, this.depotServerClient, dataSpace, executionContext, (dataSpaceInfo) => {
|
77
78
|
if (dataSpaceInfo.defaultExecutionContext) {
|
78
|
-
this.applicationStore.navigationService.navigator.goToLocation(generateDataSpaceQueryCreatorRoute(dataSpaceInfo.groupId, dataSpaceInfo.artifactId, dataSpaceInfo.versionId, dataSpaceInfo.path, dataSpaceInfo.defaultExecutionContext, undefined, undefined));
|
79
|
+
this.applicationStore.navigationService.navigator.goToLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(dataSpaceInfo.groupId), guaranteeNonNullable(dataSpaceInfo.artifactId), guaranteeNonNullable(dataSpaceInfo.versionId), dataSpaceInfo.path, dataSpaceInfo.defaultExecutionContext, undefined, undefined));
|
79
80
|
}
|
80
81
|
else {
|
81
82
|
this.applicationStore.notificationService.notifyWarning(`Can't switch data space: default execution context not specified`);
|
82
83
|
}
|
83
|
-
}, dataSpaceAnalysisResult, (ec) => {
|
84
|
+
}, true, dataSpaceAnalysisResult, (ec) => {
|
84
85
|
// runtime should already be set
|
85
86
|
const runtimePointer = guaranteeType(queryBuilderState.executionContextState.runtimeValue, RuntimePointer);
|
86
87
|
this.applicationStore.navigationService.navigator.updateCurrentLocation(generateDataSpaceQueryCreatorRoute(this.groupId, this.artifactId, this.versionId, dataSpace.path, ec.name, runtimePointer.packageableRuntime.value ===
|
@@ -89,18 +90,18 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
|
|
89
90
|
: runtimePointer.packageableRuntime.value.path, queryBuilderState.class?.path));
|
90
91
|
}, (runtimeValue) => {
|
91
92
|
const runtimePointer = guaranteeType(runtimeValue, RuntimePointer);
|
92
|
-
queryBuilderState.applicationStore.navigationService.navigator.updateCurrentLocation(generateDataSpaceQueryCreatorRoute(queryBuilderState.groupId, queryBuilderState.artifactId, queryBuilderState.versionId, queryBuilderState.dataSpace.path, queryBuilderState.executionContext.name, runtimePointer.packageableRuntime.value ===
|
93
|
+
queryBuilderState.applicationStore.navigationService.navigator.updateCurrentLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(queryBuilderState.projectInfo).groupId, guaranteeNonNullable(queryBuilderState.projectInfo).artifactId, guaranteeNonNullable(queryBuilderState.projectInfo).versionId, queryBuilderState.dataSpace.path, queryBuilderState.executionContext.name, runtimePointer.packageableRuntime.value ===
|
93
94
|
queryBuilderState.executionContext.defaultRuntime.value
|
94
95
|
? undefined
|
95
96
|
: runtimePointer.packageableRuntime.value.path, queryBuilderState.class?.path));
|
96
97
|
}, (_class) => {
|
97
98
|
// runtime should already be set
|
98
99
|
const runtimePointer = guaranteeType(queryBuilderState.executionContextState.runtimeValue, RuntimePointer);
|
99
|
-
queryBuilderState.applicationStore.navigationService.navigator.updateCurrentLocation(generateDataSpaceQueryCreatorRoute(queryBuilderState.groupId, queryBuilderState.artifactId, queryBuilderState.versionId, queryBuilderState.dataSpace.path, queryBuilderState.executionContext.name, runtimePointer.packageableRuntime.value ===
|
100
|
+
queryBuilderState.applicationStore.navigationService.navigator.updateCurrentLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(queryBuilderState.projectInfo).groupId, guaranteeNonNullable(queryBuilderState.projectInfo).artifactId, guaranteeNonNullable(queryBuilderState.projectInfo).versionId, queryBuilderState.dataSpace.path, queryBuilderState.executionContext.name, runtimePointer.packageableRuntime.value ===
|
100
101
|
queryBuilderState.executionContext.defaultRuntime.value
|
101
102
|
? undefined
|
102
103
|
: runtimePointer.packageableRuntime.value.path, _class.path));
|
103
|
-
});
|
104
|
+
}, projectInfo);
|
104
105
|
queryBuilderState.setExecutionContext(executionContext);
|
105
106
|
queryBuilderState.propagateExecutionContextChange(executionContext);
|
106
107
|
// set runtime if already chosen
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryCreatorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,0BAA0B,EAC1B,gBAAgB,EAChB,cAAc,EACd,mCAAmC,GAIpC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,gBAAgB,EAGhB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,IAAI,GACL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yDAAyD,CAAC;AACvF,OAAO,
|
1
|
+
{"version":3,"file":"DataSpaceQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQueryCreatorStore.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQuerySetupStore.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,gBAAgB,EAChB,KAAK,yBAAyB,EAC/B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EACL,WAAW,
|
1
|
+
{"version":3,"file":"DataSpaceQuerySetupStore.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,gBAAgB,EAChB,KAAK,yBAAyB,EAC/B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EACL,WAAW,EAIX,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AAI9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,qBAAa,wBAAyB,SAAQ,iBAAiB;IAC7D,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,mBAAmB,cAAwB;IACpD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IACzD,QAAQ,CAAC,WAAW,EAAE,CACpB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,CAAC;IACV,QAAQ,CAAC,eAAe,EAAE,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEV,oCAAoC,QAAO,MAAM,SAAS,CAChB;IAEnD,UAAU,EAAE,aAAa,EAAE,CAAM;IACjC,mBAAmB,UAAS;IAC5B,mBAAmB,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;gBAG7D,gBAAgB,EAAE,6BAA6B,EAC/C,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,EAC/C,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,EACT,eAAe,EAAE,CACf,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,OAAO,CAAC,IAAI,CAAC;IAkBpB,IAAa,mBAAmB,IAAI,OAAO,CAE1C;IAED,IAAa,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAElD;IAED,uBAAuB,IAAI,IAAI;IAY/B,uBAAuB,IAAI,IAAI;IAI9B,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;CAsBvD;AAED,qBAAa,wBAAyB,SAAQ,gBAAgB;IAC5D,IAAa,2BAA2B,IAAI,OAAO,CAElD;IAED,cAAc,IAAI,qBAAqB;IAIvC,uBAAuB,CACrB,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE,GACzC,yBAAyB;IAItB,2BAA2B,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAkCrD,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC;CAG1C"}
|
@@ -18,7 +18,7 @@ import { DepotScope, } from '@finos/legend-server-depot';
|
|
18
18
|
import { DEFAULT_TYPEAHEAD_SEARCH_LIMIT, DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH, } from '@finos/legend-application';
|
19
19
|
import { action, flow, makeObservable, observable } from 'mobx';
|
20
20
|
import { QueryBuilderState } from '@finos/legend-query-builder';
|
21
|
-
import { ActionState, assertErrorThrown, UnsupportedOperationError, } from '@finos/legend-shared';
|
21
|
+
import { ActionState, assertErrorThrown, guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
|
22
22
|
import { extractDataSpaceInfo } from './DataSpaceInfo.js';
|
23
23
|
import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
|
24
24
|
import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
|
@@ -94,7 +94,7 @@ export class DataSpaceQuerySetupStore extends QueryEditorStore {
|
|
94
94
|
async initializeQueryBuilderState() {
|
95
95
|
const queryBuilderState = new DataSpaceQuerySetupState(this.applicationStore, this.graphManagerState, this.depotServerClient, (dataSpaceInfo) => {
|
96
96
|
if (dataSpaceInfo.defaultExecutionContext) {
|
97
|
-
this.applicationStore.navigationService.navigator.goToLocation(generateDataSpaceQueryCreatorRoute(dataSpaceInfo.groupId, dataSpaceInfo.artifactId, dataSpaceInfo.versionId, dataSpaceInfo.path, dataSpaceInfo.defaultExecutionContext, undefined, undefined));
|
97
|
+
this.applicationStore.navigationService.navigator.goToLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(dataSpaceInfo.groupId), guaranteeNonNullable(dataSpaceInfo.artifactId), guaranteeNonNullable(dataSpaceInfo.versionId), dataSpaceInfo.path, dataSpaceInfo.defaultExecutionContext, undefined, undefined));
|
98
98
|
}
|
99
99
|
else {
|
100
100
|
this.applicationStore.notificationService.notifyWarning(`Can't switch data space: default execution context not specified`);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DataSpaceQuerySetupStore.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupStore.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"DataSpaceQuerySetupStore.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,GAEjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,UAAU,GAGX,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,8BAA8B,EAC9B,8CAA8C,GAE/C,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,yBAAyB,GAE1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAsB,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,gFAAgF,CAAC;AACpI,OAAO,EAAE,kCAAkC,EAAE,MAAM,4DAA4D,CAAC;AAChH,OAAO,EAAE,0CAA0C,EAAE,MAAM,+CAA+C,CAAC;AAC3G,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,MAAM,OAAO,wBAAyB,SAAQ,iBAAiB;IACpD,iBAAiB,CAAoB;IACrC,mBAAmB,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IAC3C,iBAAiB,CAA+B;IAChD,WAAW,CAKV;IACD,eAAe,CAIL;IAEV,oCAAoC,GAAG,GAAoB,EAAE,CACpE,0CAA0C,CAAC,IAAI,CAAC,CAAC;IAEnD,UAAU,GAAoB,EAAE,CAAC;IACjC,mBAAmB,GAAG,KAAK,CAAC;IAC5B,mBAAmB,CAA4C;IAE/D,YACE,gBAA+C,EAC/C,iBAAoC,EACpC,iBAAoC,EACpC,iBAA+C,EAC/C,WAKS,EACT,eAIkB;QAElB,KAAK,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAE3C,cAAc,CAAC,IAAI,EAAE;YACnB,UAAU,EAAE,UAAU;YACtB,mBAAmB,EAAE,UAAU;YAC/B,uBAAuB,EAAE,MAAM;YAC/B,uBAAuB,EAAE,MAAM;YAC/B,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED,IAAa,mBAAmB;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAa,gBAAgB;QAC3B,OAAO,wCAAwC,CAAC;IAClD,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,mBAAmB,GAAG,IAAI,4BAA4B,CACzD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,EACtB;YACE,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CACF,CAAC;IACJ,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;IACvC,CAAC;IAED,CAAC,cAAc,CAAC,UAAkB;QAChC,MAAM,mBAAmB,GACvB,UAAU,CAAC,MAAM,IAAI,8CAA8C,CAAC;QACtE,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI;YACF,IAAI,CAAC,UAAU,GACb,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,CACvD,kCAAkC,EAClC;gBACE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;gBACpD,KAAK,EAAE,UAAU,CAAC,QAAQ;gBAC1B,KAAK,EAAE,8BAA8B;aACtC,CACF,CACF,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,oBAAoB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;YACnE,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;SACjC;QAAC,OAAO,KAAK,EAAE;YACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YAChC,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC9D;IACH,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,gBAAgB;IAC5D,IAAa,2BAA2B;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,MAAM,IAAI,yBAAyB,EAAE,CAAC;IACxC,CAAC;IAED,uBAAuB,CACrB,MAAiB,EACjB,OAA0C;QAE1C,MAAM,IAAI,yBAAyB,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,2BAA2B;QAC/B,MAAM,iBAAiB,GAAG,IAAI,wBAAwB,CACpD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,EACtB,CAAC,aAA4B,EAAE,EAAE;YAC/B,IAAI,aAAa,CAAC,uBAAuB,EAAE;gBACzC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,YAAY,CAC5D,kCAAkC,CAChC,oBAAoB,CAAC,aAAa,CAAC,OAAO,CAAC,EAC3C,oBAAoB,CAAC,aAAa,CAAC,UAAU,CAAC,EAC9C,oBAAoB,CAAC,aAAa,CAAC,SAAS,CAAC,EAC7C,aAAa,CAAC,IAAI,EAClB,aAAa,CAAC,uBAAuB,EACrC,SAAS,EACT,SAAS,CACV,CACF,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,aAAa,CACrD,kEAAkE,CACnE,CAAC;aACH;QACH,CAAC,EACD,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAC/C,4BAA4B,CAC1B,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,CACvB,CACF,CAAC;QAEF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEQ,CAAC,UAAU;QAClB,aAAa;IACf,CAAC;CACF"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@finos/legend-extension-dsl-data-space",
|
3
|
-
"version": "10.1.
|
3
|
+
"version": "10.1.18",
|
4
4
|
"description": "Legend extension for Data Space DSL",
|
5
5
|
"keywords": [
|
6
6
|
"legend",
|
@@ -45,14 +45,14 @@
|
|
45
45
|
},
|
46
46
|
"dependencies": {
|
47
47
|
"@finos/legend-application": "15.0.38",
|
48
|
-
"@finos/legend-application-query": "13.0.
|
49
|
-
"@finos/legend-application-studio": "28.3.
|
48
|
+
"@finos/legend-application-query": "13.0.57",
|
49
|
+
"@finos/legend-application-studio": "28.3.5",
|
50
50
|
"@finos/legend-art": "7.0.38",
|
51
|
-
"@finos/legend-extension-dsl-diagram": "8.0.
|
52
|
-
"@finos/legend-graph": "31.1.
|
53
|
-
"@finos/legend-lego": "1.1.
|
54
|
-
"@finos/legend-query-builder": "4.3.
|
55
|
-
"@finos/legend-server-depot": "6.0.
|
51
|
+
"@finos/legend-extension-dsl-diagram": "8.0.74",
|
52
|
+
"@finos/legend-graph": "31.1.9",
|
53
|
+
"@finos/legend-lego": "1.1.25",
|
54
|
+
"@finos/legend-query-builder": "4.3.9",
|
55
|
+
"@finos/legend-server-depot": "6.0.28",
|
56
56
|
"@finos/legend-shared": "10.0.24",
|
57
57
|
"@finos/legend-storage": "3.0.74",
|
58
58
|
"@types/react": "18.2.20",
|
@@ -43,7 +43,10 @@ import {
|
|
43
43
|
QUERY_PROFILE_PATH,
|
44
44
|
QUERY_PROFILE_TAG_DATA_SPACE,
|
45
45
|
} from '../../graph/DSL_DataSpace_MetaModelConst.js';
|
46
|
-
import {
|
46
|
+
import {
|
47
|
+
DataSpaceQueryBuilderState,
|
48
|
+
DataSpaceProjectInfo,
|
49
|
+
} from '../../stores/query/DataSpaceQueryBuilderState.js';
|
47
50
|
import type { DataSpaceInfo } from '../../stores/query/DataSpaceInfo.js';
|
48
51
|
import { getOwnDataSpace } from '../../graph-manager/DSL_DataSpace_GraphManagerHelper.js';
|
49
52
|
import { assertErrorThrown, LogEvent, uuid } from '@finos/legend-shared';
|
@@ -145,12 +148,7 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
145
148
|
} catch {
|
146
149
|
// do nothing
|
147
150
|
}
|
148
|
-
const
|
149
|
-
editorStore.applicationStore,
|
150
|
-
editorStore.graphManagerState,
|
151
|
-
editorStore.depotServerClient,
|
152
|
-
dataSpace,
|
153
|
-
matchingExecutionContext,
|
151
|
+
const projectInfo = new DataSpaceProjectInfo(
|
154
152
|
query.groupId,
|
155
153
|
query.artifactId,
|
156
154
|
query.versionId,
|
@@ -159,6 +157,13 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
159
157
|
editorStore.applicationStore,
|
160
158
|
editorStore.depotServerClient,
|
161
159
|
),
|
160
|
+
);
|
161
|
+
const dataSpaceQueryBuilderState = new DataSpaceQueryBuilderState(
|
162
|
+
editorStore.applicationStore,
|
163
|
+
editorStore.graphManagerState,
|
164
|
+
editorStore.depotServerClient,
|
165
|
+
dataSpace,
|
166
|
+
matchingExecutionContext,
|
162
167
|
(dataSpaceInfo: DataSpaceInfo) => {
|
163
168
|
if (dataSpaceInfo.defaultExecutionContext) {
|
164
169
|
const createQuery = async (): Promise<void> => {
|
@@ -255,7 +260,12 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
|
|
255
260
|
);
|
256
261
|
}
|
257
262
|
},
|
263
|
+
true,
|
258
264
|
dataSpaceAnalysisResult,
|
265
|
+
undefined,
|
266
|
+
undefined,
|
267
|
+
undefined,
|
268
|
+
projectInfo,
|
259
269
|
);
|
260
270
|
const mappingModelCoverageAnalysisResult =
|
261
271
|
dataSpaceAnalysisResult?.executionContextsIndex.get(
|
@@ -33,7 +33,7 @@ import {
|
|
33
33
|
ModalHeaderActions,
|
34
34
|
} from '@finos/legend-art';
|
35
35
|
import { generateGAVCoordinates } from '@finos/legend-storage';
|
36
|
-
import { debounce } from '@finos/legend-shared';
|
36
|
+
import { debounce, guaranteeNonNullable } from '@finos/legend-shared';
|
37
37
|
import { flowResult } from 'mobx';
|
38
38
|
import { observer } from 'mobx-react-lite';
|
39
39
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
@@ -81,32 +81,29 @@ export const DataSpaceAdvancedSearchModal = observer(
|
|
81
81
|
};
|
82
82
|
const formatDataSpaceOptionLabel = (
|
83
83
|
option: DataSpaceOption,
|
84
|
-
): React.ReactNode =>
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
option.
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
option.value.artifactId,
|
105
|
-
option.value.versionId,
|
106
|
-
)}
|
84
|
+
): React.ReactNode => {
|
85
|
+
const groupId = guaranteeNonNullable(option.value.groupId);
|
86
|
+
const artifactId = guaranteeNonNullable(option.value.artifactId);
|
87
|
+
const versionId = guaranteeNonNullable(option.value.versionId);
|
88
|
+
return (
|
89
|
+
<div
|
90
|
+
className="data-space-advanced-search__dialog__option"
|
91
|
+
title={`${option.label} - ${
|
92
|
+
option.value.path
|
93
|
+
} - ${generateGAVCoordinates(groupId, artifactId, versionId)}`}
|
94
|
+
>
|
95
|
+
<div className="data-space-advanced-search__dialog__option__label">
|
96
|
+
{option.label}
|
97
|
+
</div>
|
98
|
+
<div className="data-space-advanced-search__dialog__option__path">
|
99
|
+
{option.value.path}
|
100
|
+
</div>
|
101
|
+
<div className="data-space-advanced-search__dialog__option__gav">
|
102
|
+
{generateGAVCoordinates(groupId, artifactId, versionId)}
|
103
|
+
</div>
|
107
104
|
</div>
|
108
|
-
|
109
|
-
|
105
|
+
);
|
106
|
+
};
|
110
107
|
|
111
108
|
// search text
|
112
109
|
const debouncedLoadDataSpaces = useMemo(
|