@finos/legend-application-query 13.4.16 → 13.4.17
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/__lib__/LegendQueryEvent.d.ts +2 -1
- package/lib/__lib__/LegendQueryEvent.d.ts.map +1 -1
- package/lib/__lib__/LegendQueryEvent.js +1 -0
- package/lib/__lib__/LegendQueryEvent.js.map +1 -1
- package/lib/__lib__/LegendQueryUserDataHelper.d.ts +23 -3
- package/lib/__lib__/LegendQueryUserDataHelper.d.ts.map +1 -1
- package/lib/__lib__/LegendQueryUserDataHelper.js +94 -14
- package/lib/__lib__/LegendQueryUserDataHelper.js.map +1 -1
- package/lib/__lib__/LegendQueryUserDataSpaceHelper.d.ts +31 -0
- package/lib/__lib__/LegendQueryUserDataSpaceHelper.d.ts.map +1 -0
- package/lib/__lib__/LegendQueryUserDataSpaceHelper.js +54 -0
- package/lib/__lib__/LegendQueryUserDataSpaceHelper.js.map +1 -0
- package/lib/components/Core_LegendQueryApplicationPlugin.d.ts.map +1 -1
- package/lib/components/Core_LegendQueryApplicationPlugin.js +29 -11
- package/lib/components/Core_LegendQueryApplicationPlugin.js.map +1 -1
- package/lib/components/LegendQueryAppInfo.d.ts +21 -0
- package/lib/components/LegendQueryAppInfo.d.ts.map +1 -0
- package/lib/components/LegendQueryAppInfo.js +46 -0
- package/lib/components/LegendQueryAppInfo.js.map +1 -0
- package/lib/components/QueryEditor.d.ts.map +1 -1
- package/lib/components/QueryEditor.js +7 -6
- package/lib/components/QueryEditor.js.map +1 -1
- package/lib/components/data-space/DataSpaceQuerySetup.js +1 -1
- package/lib/components/data-space/DataSpaceQuerySetup.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +3 -3
- package/lib/stores/QueryEditorStore.d.ts +3 -0
- package/lib/stores/QueryEditorStore.d.ts.map +1 -1
- package/lib/stores/QueryEditorStore.js +13 -1
- package/lib/stores/QueryEditorStore.js.map +1 -1
- package/lib/stores/data-space/DataSpaceQueryCreatorStore.d.ts +2 -0
- package/lib/stores/data-space/DataSpaceQueryCreatorStore.d.ts.map +1 -1
- package/lib/stores/data-space/DataSpaceQueryCreatorStore.js +21 -2
- package/lib/stores/data-space/DataSpaceQueryCreatorStore.js.map +1 -1
- package/lib/stores/data-space/DataSpaceQuerySetupState.d.ts +10 -2
- package/lib/stores/data-space/DataSpaceQuerySetupState.d.ts.map +1 -1
- package/lib/stores/data-space/DataSpaceQuerySetupState.js +53 -3
- package/lib/stores/data-space/DataSpaceQuerySetupState.js.map +1 -1
- package/package.json +13 -13
- package/src/__lib__/LegendQueryEvent.ts +2 -0
- package/src/__lib__/LegendQueryUserDataHelper.ts +192 -18
- package/src/__lib__/LegendQueryUserDataSpaceHelper.ts +98 -0
- package/src/components/Core_LegendQueryApplicationPlugin.tsx +35 -20
- package/src/components/LegendQueryAppInfo.tsx +153 -0
- package/src/components/QueryEditor.tsx +13 -6
- package/src/components/data-space/DataSpaceQuerySetup.tsx +1 -1
- package/src/stores/QueryEditorStore.ts +19 -0
- package/src/stores/data-space/DataSpaceQueryCreatorStore.ts +59 -0
- package/src/stores/data-space/DataSpaceQuerySetupState.ts +92 -4
- package/tsconfig.json +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQueryCreatorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,0BAA0B,EAC1B,cAAc,EACd,mCAAmC,GAIpC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,IAAI,GACL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,+BAA+B,GAChC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAEL,sCAAsC,EACtC,YAAY,EACZ,4BAA4B,GAC7B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EACL,yCAAyC,EACzC,gBAAgB,EAChB,wBAAwB,EACxB,4BAA4B,GAE7B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,2BAA2B,GAE5B,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"DataSpaceQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQueryCreatorStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,11 +17,16 @@ import { type DepotServerClient } from '@finos/legend-server-depot';
|
|
|
17
17
|
import type { GraphManagerState, RawLambda } from '@finos/legend-graph';
|
|
18
18
|
import { type GenericLegendApplicationStore } from '@finos/legend-application';
|
|
19
19
|
import { type QueryBuilderConfig, QueryBuilderState } from '@finos/legend-query-builder';
|
|
20
|
-
import type { ProjectGAVCoordinates } from '@finos/legend-storage';
|
|
20
|
+
import type { Entity, ProjectGAVCoordinates } from '@finos/legend-storage';
|
|
21
21
|
import { ActionState, type GeneratorFn } from '@finos/legend-shared';
|
|
22
22
|
import { type DataSpaceInfo } from '@finos/legend-extension-dsl-data-space/application';
|
|
23
23
|
import { QueryEditorStore, type QueryPersistConfiguration } from '../QueryEditorStore.js';
|
|
24
24
|
import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
|
|
25
|
+
import type { VisitedDataspace } from '../../__lib__/LegendQueryUserDataSpaceHelper.js';
|
|
26
|
+
type DataSpaceVisitedEntity = {
|
|
27
|
+
visited: VisitedDataspace;
|
|
28
|
+
entity: Entity;
|
|
29
|
+
};
|
|
25
30
|
export declare class DataSpaceQuerySetupState extends QueryBuilderState {
|
|
26
31
|
editorStore: QueryEditorStore;
|
|
27
32
|
readonly depotServerClient: DepotServerClient;
|
|
@@ -38,7 +43,9 @@ export declare class DataSpaceQuerySetupState extends QueryBuilderState {
|
|
|
38
43
|
get sideBarClassName(): string | undefined;
|
|
39
44
|
showAdvancedSearchPanel(): void;
|
|
40
45
|
hideAdvancedSearchPanel(): void;
|
|
41
|
-
|
|
46
|
+
initializeDataSpaceSetup(): GeneratorFn<void>;
|
|
47
|
+
redirectIfPossible(): GeneratorFn<DataSpaceVisitedEntity | undefined>;
|
|
48
|
+
hyrdateVisitedDataSpace(visited: VisitedDataspace): GeneratorFn<DataSpaceVisitedEntity | undefined>;
|
|
42
49
|
}
|
|
43
50
|
export declare class DataSpaceQuerySetupStore extends QueryEditorStore {
|
|
44
51
|
get isViewProjectActionDisabled(): boolean;
|
|
@@ -49,4 +56,5 @@ export declare class DataSpaceQuerySetupStore extends QueryEditorStore {
|
|
|
49
56
|
initializeQueryBuilderState(): Promise<QueryBuilderState>;
|
|
50
57
|
buildGraph(): GeneratorFn<void>;
|
|
51
58
|
}
|
|
59
|
+
export {};
|
|
52
60
|
//# sourceMappingURL=DataSpaceQuerySetupState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EACL,KAAK,kBAAkB,EACvB,iBAAiB,EAElB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EACL,KAAK,kBAAkB,EACvB,iBAAiB,EAElB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EACL,WAAW,EAIX,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,oDAAoD,CAAC;AAE5D,OAAO,EAEL,gBAAgB,EAGhB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AACxG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AAGxF,KAAK,sBAAsB,GAAG;IAC5B,OAAO,EAAE,gBAAgB,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,qBAAa,wBAAyB,SAAQ,iBAAiB;IAC7D,WAAW,EAAE,gBAAgB,CAAC;IAC9B,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,WAAW,EAAE,gBAAgB,EAC7B,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,EAClB,MAAM,EAAE,kBAAkB,GAAG,SAAS;IA6BxC,IAAa,mBAAmB,IAAI,OAAO,CAE1C;IAED,IAAa,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAElD;IAED,uBAAuB,IAAI,IAAI;IAY/B,uBAAuB,IAAI,IAAI;IAI9B,wBAAwB,IAAI,WAAW,CAAC,IAAI,CAAC;IAuC7C,kBAAkB,IAAI,WAAW,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAqBrE,uBAAuB,CACtB,OAAO,EAAE,gBAAgB,GACxB,WAAW,CAAC,sBAAsB,GAAG,SAAS,CAAC;CAoCnD;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;IAoCrD,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC;CAG1C"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { DepotScope, LATEST_VERSION_ALIAS, } from '@finos/legend-server-depot';
|
|
17
17
|
import {} from '@finos/legend-application';
|
|
18
|
-
import { action, flow, makeObservable, observable } from 'mobx';
|
|
18
|
+
import { action, flow, flowResult, makeObservable, observable } from 'mobx';
|
|
19
19
|
import { QueryBuilderState, QueryBuilderDataBrowserWorkflow, } from '@finos/legend-query-builder';
|
|
20
20
|
import { ActionState, assertErrorThrown, guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
|
|
21
21
|
import { extractDataSpaceInfo, } from '@finos/legend-extension-dsl-data-space/application';
|
|
@@ -24,6 +24,7 @@ import { QueryBuilderActionConfig_QueryApplication, QueryEditorStore, createView
|
|
|
24
24
|
import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
|
|
25
25
|
import { renderDataSpaceQuerySetupSetupPanelContent } from '../../components/data-space/DataSpaceQuerySetup.js';
|
|
26
26
|
import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
|
|
27
|
+
import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
|
|
27
28
|
export class DataSpaceQuerySetupState extends QueryBuilderState {
|
|
28
29
|
editorStore;
|
|
29
30
|
depotServerClient;
|
|
@@ -42,7 +43,9 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
|
|
|
42
43
|
advancedSearchState: observable,
|
|
43
44
|
showAdvancedSearchPanel: action,
|
|
44
45
|
hideAdvancedSearchPanel: action,
|
|
45
|
-
|
|
46
|
+
initializeDataSpaceSetup: flow,
|
|
47
|
+
redirectIfPossible: flow,
|
|
48
|
+
hyrdateVisitedDataSpace: flow,
|
|
46
49
|
});
|
|
47
50
|
this.editorStore = editorStore;
|
|
48
51
|
this.workflowState.updateActionConfig(new QueryBuilderActionConfig_QueryApplication(editorStore));
|
|
@@ -66,9 +69,16 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
|
|
|
66
69
|
hideAdvancedSearchPanel() {
|
|
67
70
|
this.advancedSearchState = undefined;
|
|
68
71
|
}
|
|
69
|
-
*
|
|
72
|
+
*initializeDataSpaceSetup() {
|
|
70
73
|
this.loadDataSpacesState.inProgress();
|
|
71
74
|
try {
|
|
75
|
+
const hydrated = (yield flowResult(this.redirectIfPossible()));
|
|
76
|
+
if (hydrated) {
|
|
77
|
+
this.applicationStore.navigationService.navigator.goToLocation(generateDataSpaceQueryCreatorRoute(guaranteeNonNullable(hydrated.visited.groupId), guaranteeNonNullable(hydrated.visited.artifactId), hydrated.visited.versionId ?? LATEST_VERSION_ALIAS, hydrated.visited.path, hydrated.visited.execContext ??
|
|
78
|
+
hydrated.entity.content.defaultExecutionContext, undefined, undefined));
|
|
79
|
+
this.loadDataSpacesState.complete();
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
72
82
|
this.dataSpaces = (yield this.depotServerClient.getEntitiesByClassifier(DATA_SPACE_ELEMENT_CLASSIFIER_PATH, {
|
|
73
83
|
scope: DepotScope.RELEASES,
|
|
74
84
|
})).map((storedEntity) => extractDataSpaceInfo(storedEntity, false));
|
|
@@ -80,6 +90,46 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
|
|
|
80
90
|
this.applicationStore.notificationService.notifyError(error);
|
|
81
91
|
}
|
|
82
92
|
}
|
|
93
|
+
*redirectIfPossible() {
|
|
94
|
+
const visitedQueries = LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(this.applicationStore.userDataService);
|
|
95
|
+
let redirect = undefined;
|
|
96
|
+
for (let i = 0; i < visitedQueries.length; i++) {
|
|
97
|
+
const visited = visitedQueries[i];
|
|
98
|
+
if (visited) {
|
|
99
|
+
const hydrated = (yield flowResult(this.hyrdateVisitedDataSpace(visited)));
|
|
100
|
+
if (hydrated) {
|
|
101
|
+
redirect = hydrated;
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return redirect;
|
|
107
|
+
}
|
|
108
|
+
*hyrdateVisitedDataSpace(visited) {
|
|
109
|
+
try {
|
|
110
|
+
const entity = (yield this.depotServerClient.getVersionEntity(visited.groupId, visited.artifactId, visited.versionId ?? LATEST_VERSION_ALIAS, visited.path));
|
|
111
|
+
const content = entity.content;
|
|
112
|
+
if (visited.execContext) {
|
|
113
|
+
const found = content.executionContexts.find((e) => e.name === visited.execContext);
|
|
114
|
+
if (!found) {
|
|
115
|
+
visited.execContext = undefined;
|
|
116
|
+
return {
|
|
117
|
+
visited,
|
|
118
|
+
entity,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return {
|
|
123
|
+
visited,
|
|
124
|
+
entity,
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
catch (error) {
|
|
128
|
+
assertErrorThrown(error);
|
|
129
|
+
LegendQueryUserDataHelper.removeRecentlyViewedDataSpace(this.applicationStore.userDataService, visited.id);
|
|
130
|
+
}
|
|
131
|
+
return undefined;
|
|
132
|
+
}
|
|
83
133
|
}
|
|
84
134
|
export class DataSpaceQuerySetupStore extends QueryEditorStore {
|
|
85
135
|
get isViewProjectActionDisabled() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSpaceQuerySetupState.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,UAAU,EACV,oBAAoB,GAGrB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAsC,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"DataSpaceQuerySetupState.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceQuerySetupState.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.4.
|
|
3
|
+
"version": "13.4.17",
|
|
4
4
|
"description": "Legend Query application core",
|
|
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-data-space": "10.3.
|
|
49
|
-
"@finos/legend-graph": "31.10.
|
|
50
|
-
"@finos/legend-lego": "1.2.
|
|
51
|
-
"@finos/legend-query-builder": "4.14.
|
|
52
|
-
"@finos/legend-server-depot": "6.0.
|
|
53
|
-
"@finos/legend-shared": "10.0.
|
|
54
|
-
"@finos/legend-storage": "3.0.
|
|
46
|
+
"@finos/legend-application": "15.1.4",
|
|
47
|
+
"@finos/legend-art": "7.1.33",
|
|
48
|
+
"@finos/legend-extension-dsl-data-space": "10.3.16",
|
|
49
|
+
"@finos/legend-graph": "31.10.1",
|
|
50
|
+
"@finos/legend-lego": "1.2.34",
|
|
51
|
+
"@finos/legend-query-builder": "4.14.40",
|
|
52
|
+
"@finos/legend-server-depot": "6.0.42",
|
|
53
|
+
"@finos/legend-shared": "10.0.37",
|
|
54
|
+
"@finos/legend-storage": "3.0.87",
|
|
55
55
|
"@testing-library/react": "15.0.7",
|
|
56
|
-
"@types/react": "18.3.
|
|
56
|
+
"@types/react": "18.3.3",
|
|
57
57
|
"@types/react-dom": "18.3.0",
|
|
58
58
|
"mobx": "6.12.3",
|
|
59
59
|
"mobx-react-lite": "4.0.7",
|
|
@@ -62,14 +62,14 @@
|
|
|
62
62
|
"serializr": "3.0.2"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@finos/legend-dev-utils": "2.1.
|
|
65
|
+
"@finos/legend-dev-utils": "2.1.6",
|
|
66
66
|
"@jest/globals": "29.7.0",
|
|
67
67
|
"cross-env": "7.0.3",
|
|
68
68
|
"eslint": "8.57.0",
|
|
69
69
|
"jest": "29.7.0",
|
|
70
70
|
"npm-run-all": "4.1.5",
|
|
71
71
|
"rimraf": "5.0.7",
|
|
72
|
-
"sass": "1.77.
|
|
72
|
+
"sass": "1.77.3",
|
|
73
73
|
"typescript": "5.4.5"
|
|
74
74
|
},
|
|
75
75
|
"peerDependencies": {
|
|
@@ -16,22 +16,38 @@
|
|
|
16
16
|
|
|
17
17
|
import type { UserDataService } from '@finos/legend-application';
|
|
18
18
|
import { returnUndefOnError } from '@finos/legend-shared';
|
|
19
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
createSimpleSchema,
|
|
21
|
+
deserialize,
|
|
22
|
+
list,
|
|
23
|
+
primitive,
|
|
24
|
+
raw,
|
|
25
|
+
} from 'serializr';
|
|
26
|
+
import {
|
|
27
|
+
createVisitedDataspaceFromInfo,
|
|
28
|
+
createIdFromDataSpaceInfo,
|
|
29
|
+
createVisitedDataSpaceId,
|
|
30
|
+
type SavedVisitedDataSpaces,
|
|
31
|
+
type VisitedDataspace,
|
|
32
|
+
} from './LegendQueryUserDataSpaceHelper.js';
|
|
33
|
+
import type { DataSpaceInfo } from '@finos/legend-extension-dsl-data-space/application';
|
|
20
34
|
|
|
21
35
|
export enum LEGEND_QUERY_USER_DATA_KEY {
|
|
22
36
|
RECENTLY_VIEWED_QUERIES = 'query-editor.recent-queries',
|
|
37
|
+
RECENTLY_VIEWED_DATASPACES = 'query-editor.recent-dataSpaces',
|
|
23
38
|
}
|
|
24
39
|
|
|
25
|
-
const USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT = 10;
|
|
26
|
-
|
|
40
|
+
export const USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT = 10;
|
|
41
|
+
export const USER_DATA_QUERY_DATASPACE_LIMIT = 10;
|
|
42
|
+
|
|
43
|
+
type SavedData = string[];
|
|
27
44
|
|
|
28
45
|
export class LegendQueryUserDataHelper {
|
|
29
|
-
static
|
|
46
|
+
static getPersistedData(
|
|
30
47
|
service: UserDataService,
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
);
|
|
48
|
+
key: LEGEND_QUERY_USER_DATA_KEY,
|
|
49
|
+
): SavedData {
|
|
50
|
+
const data = service.getObjectValue(key);
|
|
35
51
|
return (
|
|
36
52
|
// TODO: think of a better way to deserialize this data, maybe like settings, use JSON schema
|
|
37
53
|
// See https://github.com/finos/legend-studio/issues/407
|
|
@@ -45,12 +61,41 @@ export class LegendQueryUserDataHelper {
|
|
|
45
61
|
{
|
|
46
62
|
data,
|
|
47
63
|
},
|
|
48
|
-
) as { data:
|
|
64
|
+
) as { data: SavedData }
|
|
49
65
|
).data,
|
|
50
66
|
) ?? []
|
|
51
67
|
);
|
|
52
68
|
}
|
|
53
69
|
|
|
70
|
+
static persistValue(
|
|
71
|
+
service: UserDataService,
|
|
72
|
+
value: string,
|
|
73
|
+
persistedData: SavedData,
|
|
74
|
+
opts: {
|
|
75
|
+
key: LEGEND_QUERY_USER_DATA_KEY;
|
|
76
|
+
limit: number;
|
|
77
|
+
},
|
|
78
|
+
): void {
|
|
79
|
+
const idx = persistedData.findIndex((data) => data === value);
|
|
80
|
+
if (idx === -1) {
|
|
81
|
+
if (persistedData.length >= opts.limit) {
|
|
82
|
+
persistedData.pop();
|
|
83
|
+
}
|
|
84
|
+
persistedData.unshift(value);
|
|
85
|
+
} else {
|
|
86
|
+
persistedData.splice(idx, 1);
|
|
87
|
+
persistedData.unshift(value);
|
|
88
|
+
}
|
|
89
|
+
service.persistValue(opts.key, persistedData);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
static getRecentlyViewedQueries(service: UserDataService): SavedData {
|
|
93
|
+
return LegendQueryUserDataHelper.getPersistedData(
|
|
94
|
+
service,
|
|
95
|
+
LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
|
|
54
99
|
static removeRecentlyViewedQueries(service: UserDataService): void {
|
|
55
100
|
service.persistValue(
|
|
56
101
|
LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
|
|
@@ -79,21 +124,150 @@ export class LegendQueryUserDataHelper {
|
|
|
79
124
|
queryId: string,
|
|
80
125
|
): void {
|
|
81
126
|
const queries = LegendQueryUserDataHelper.getRecentlyViewedQueries(service);
|
|
82
|
-
|
|
127
|
+
LegendQueryUserDataHelper.persistValue(service, queryId, queries, {
|
|
128
|
+
limit: USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT,
|
|
129
|
+
key: LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
// DataSpaces
|
|
133
|
+
static getRecentlyVisitedDataSpaces(
|
|
134
|
+
service: UserDataService,
|
|
135
|
+
): SavedVisitedDataSpaces {
|
|
136
|
+
const data = service.getObjectValue(
|
|
137
|
+
LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES,
|
|
138
|
+
);
|
|
139
|
+
return (
|
|
140
|
+
// TODO: think of a better way to deserialize this data, maybe like settings, use JSON schema
|
|
141
|
+
// See https://github.com/finos/legend-studio/issues/407
|
|
142
|
+
returnUndefOnError(
|
|
143
|
+
() =>
|
|
144
|
+
(
|
|
145
|
+
deserialize(
|
|
146
|
+
createSimpleSchema({
|
|
147
|
+
data: raw(),
|
|
148
|
+
}),
|
|
149
|
+
{
|
|
150
|
+
data,
|
|
151
|
+
},
|
|
152
|
+
) as { data: SavedVisitedDataSpaces }
|
|
153
|
+
).data,
|
|
154
|
+
) ?? []
|
|
155
|
+
);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
static findRecentlyVisitedDataSpace(
|
|
159
|
+
service: UserDataService,
|
|
160
|
+
id: string,
|
|
161
|
+
): VisitedDataspace | undefined {
|
|
162
|
+
return LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service).find(
|
|
163
|
+
(v) => v.id === id,
|
|
164
|
+
);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
static getRecentlyVisitedDataSpace(
|
|
168
|
+
service: UserDataService,
|
|
169
|
+
): VisitedDataspace | undefined {
|
|
170
|
+
return LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service)[0];
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
static persistVisitedDataspace(
|
|
174
|
+
service: UserDataService,
|
|
175
|
+
value: VisitedDataspace,
|
|
176
|
+
persistedData: SavedVisitedDataSpaces,
|
|
177
|
+
limit = USER_DATA_QUERY_DATASPACE_LIMIT,
|
|
178
|
+
): void {
|
|
179
|
+
const key = LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES;
|
|
180
|
+
const idx = persistedData.findIndex((data) => data.id === value.id);
|
|
83
181
|
if (idx === -1) {
|
|
84
|
-
if (
|
|
85
|
-
|
|
86
|
-
} else {
|
|
87
|
-
queries.pop();
|
|
88
|
-
queries.unshift(queryId);
|
|
182
|
+
if (persistedData.length >= limit) {
|
|
183
|
+
persistedData.pop();
|
|
89
184
|
}
|
|
185
|
+
persistedData.unshift(value);
|
|
90
186
|
} else {
|
|
91
|
-
|
|
92
|
-
|
|
187
|
+
persistedData.splice(idx, 1);
|
|
188
|
+
persistedData.unshift(value);
|
|
93
189
|
}
|
|
190
|
+
service.persistValue(key, persistedData);
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
static removeRecentlyViewedDataSpaces(service: UserDataService): void {
|
|
194
|
+
service.persistValue(
|
|
195
|
+
LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_DATASPACES,
|
|
196
|
+
[],
|
|
197
|
+
);
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
static removeRecentlyViewedDataSpace(
|
|
201
|
+
service: UserDataService,
|
|
202
|
+
id: string,
|
|
203
|
+
): void {
|
|
204
|
+
const dataSpaces =
|
|
205
|
+
LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service);
|
|
206
|
+
const idx = dataSpaces.findIndex(
|
|
207
|
+
(visitedDataspace) => visitedDataspace.id === id,
|
|
208
|
+
);
|
|
209
|
+
if (idx === -1) {
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
212
|
+
dataSpaces.splice(idx, 1);
|
|
94
213
|
service.persistValue(
|
|
95
214
|
LEGEND_QUERY_USER_DATA_KEY.RECENTLY_VIEWED_QUERIES,
|
|
96
|
-
|
|
215
|
+
dataSpaces,
|
|
97
216
|
);
|
|
98
217
|
}
|
|
218
|
+
|
|
219
|
+
static removeDataSpace(service: UserDataService, info: DataSpaceInfo): void {
|
|
220
|
+
const id = createIdFromDataSpaceInfo(info);
|
|
221
|
+
if (id) {
|
|
222
|
+
LegendQueryUserDataHelper.removeRecentlyViewedDataSpace(service, id);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
static addRecentlyVistedDatspace(
|
|
227
|
+
service: UserDataService,
|
|
228
|
+
info: DataSpaceInfo,
|
|
229
|
+
execContext: string | undefined,
|
|
230
|
+
): void {
|
|
231
|
+
const visited = createVisitedDataspaceFromInfo(info, execContext);
|
|
232
|
+
if (visited) {
|
|
233
|
+
const dataspaces =
|
|
234
|
+
LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service);
|
|
235
|
+
LegendQueryUserDataHelper.persistVisitedDataspace(
|
|
236
|
+
service,
|
|
237
|
+
visited,
|
|
238
|
+
dataspaces,
|
|
239
|
+
);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
static addVisitedDatspace(
|
|
243
|
+
service: UserDataService,
|
|
244
|
+
visited: VisitedDataspace,
|
|
245
|
+
): void {
|
|
246
|
+
const dataspaces =
|
|
247
|
+
LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(service);
|
|
248
|
+
LegendQueryUserDataHelper.persistVisitedDataspace(
|
|
249
|
+
service,
|
|
250
|
+
visited,
|
|
251
|
+
dataspaces,
|
|
252
|
+
);
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
static updateVisitedDataSpaceExecContext(
|
|
256
|
+
service: UserDataService,
|
|
257
|
+
groupId: string,
|
|
258
|
+
artifactId: string,
|
|
259
|
+
dataspace: string,
|
|
260
|
+
exec: string,
|
|
261
|
+
): boolean {
|
|
262
|
+
const visited = LegendQueryUserDataHelper.findRecentlyVisitedDataSpace(
|
|
263
|
+
service,
|
|
264
|
+
createVisitedDataSpaceId(groupId, artifactId, dataspace),
|
|
265
|
+
);
|
|
266
|
+
if (visited) {
|
|
267
|
+
visited.execContext = exec;
|
|
268
|
+
LegendQueryUserDataHelper.addVisitedDatspace(service, visited);
|
|
269
|
+
return true;
|
|
270
|
+
}
|
|
271
|
+
return false;
|
|
272
|
+
}
|
|
99
273
|
}
|
|
@@ -0,0 +1,98 @@
|
|
|
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 type { DataSpaceInfo } from '@finos/legend-extension-dsl-data-space/application';
|
|
18
|
+
import { GAV_DELIMITER, generateGAVCoordinates } from '@finos/legend-storage';
|
|
19
|
+
|
|
20
|
+
export interface VisitedDataspace {
|
|
21
|
+
id: string;
|
|
22
|
+
groupId: string;
|
|
23
|
+
artifactId: string;
|
|
24
|
+
path: string;
|
|
25
|
+
versionId: string | undefined;
|
|
26
|
+
execContext?: string | undefined;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export type SavedVisitedDataSpaces = VisitedDataspace[];
|
|
30
|
+
|
|
31
|
+
export const createVisitedDataSpaceId = (
|
|
32
|
+
groupId: string,
|
|
33
|
+
artifactId: string,
|
|
34
|
+
dataSpace: string,
|
|
35
|
+
): string =>
|
|
36
|
+
// we will consider unique dataSpace if it belongs to the same project. i.e we will not save 2 dataspaces visited for 2 different versionss
|
|
37
|
+
generateGAVCoordinates(groupId, artifactId, undefined) +
|
|
38
|
+
GAV_DELIMITER +
|
|
39
|
+
dataSpace;
|
|
40
|
+
|
|
41
|
+
export const createIdFromDataSpaceInfo = (
|
|
42
|
+
info: DataSpaceInfo,
|
|
43
|
+
): string | undefined => {
|
|
44
|
+
const groupId = info.groupId;
|
|
45
|
+
const artifactId = info.artifactId;
|
|
46
|
+
if (groupId && artifactId) {
|
|
47
|
+
return createVisitedDataSpaceId(groupId, artifactId, info.path);
|
|
48
|
+
}
|
|
49
|
+
return undefined;
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
export const createSimpleVisitedDataspace = (
|
|
53
|
+
groupId: string,
|
|
54
|
+
artifactId: string,
|
|
55
|
+
versionId: string | undefined,
|
|
56
|
+
path: string,
|
|
57
|
+
exec: string | undefined,
|
|
58
|
+
): VisitedDataspace => ({
|
|
59
|
+
id: createVisitedDataSpaceId(groupId, artifactId, path),
|
|
60
|
+
groupId,
|
|
61
|
+
artifactId,
|
|
62
|
+
versionId,
|
|
63
|
+
path,
|
|
64
|
+
execContext: exec,
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
export const createVisitedDataspaceFromInfo = (
|
|
68
|
+
info: DataSpaceInfo,
|
|
69
|
+
execContext: string | undefined,
|
|
70
|
+
): VisitedDataspace | undefined => {
|
|
71
|
+
const groupId = info.groupId;
|
|
72
|
+
const artifactId = info.artifactId;
|
|
73
|
+
const versionId = info.versionId;
|
|
74
|
+
const path = info.path;
|
|
75
|
+
if (groupId && artifactId) {
|
|
76
|
+
return createSimpleVisitedDataspace(
|
|
77
|
+
groupId,
|
|
78
|
+
artifactId,
|
|
79
|
+
versionId,
|
|
80
|
+
path,
|
|
81
|
+
execContext,
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
return undefined;
|
|
85
|
+
};
|
|
86
|
+
|
|
87
|
+
export const hasDataSpaceInfoBeenVisited = (
|
|
88
|
+
val: DataSpaceInfo,
|
|
89
|
+
visited: SavedVisitedDataSpaces,
|
|
90
|
+
): boolean =>
|
|
91
|
+
Boolean(
|
|
92
|
+
visited.find((_visit) => {
|
|
93
|
+
if (_visit.id === createIdFromDataSpaceInfo(val)) {
|
|
94
|
+
return true;
|
|
95
|
+
}
|
|
96
|
+
return false;
|
|
97
|
+
}),
|
|
98
|
+
);
|