@finos/legend-extension-dsl-data-space 4.0.5 → 6.1.0

package/lib/stores/query/DataSpaceQuerySetupState.js

@@ -13,27 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QueryTaggedValue } from '@finos/legend-graph';
-import { CreateQueryInfoState, QuerySetupState, generateCreateQueryRoute, } from '@finos/legend-query';
+import { extractEntityNameFromPath } from '@finos/legend-storage';
+import { QuerySetupState, generateStudioProjectViewUrl, } from '@finos/legend-application-query';
 import { DepotScope, ProjectData, SNAPSHOT_VERSION_ALIAS, } from '@finos/legend-server-depot';
-import { ActionState, assertErrorThrown, } from '@finos/legend-shared';
+import { ActionState, assertErrorThrown, isString, } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import { getDataSpace } from '../../graphManager/DSLDataSpace_GraphManagerHelper.js';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
+import { getDSLDataSpaceGraphManagerExtension } from '../../graphManager/protocol/pure/DSLDataSpace_PureGraphManagerExtension.js';
+import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graphManager/protocol/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
 import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
-const QUERY_PROFILE_PATH = 'meta::pure::profiles::query';
-const QUERY_PROFILE_TAG_DATA_SPACE = 'dataSpace';
-export const createQueryDataSpaceTaggedValue = (dataSpacePath) => {
-    const taggedValue = new QueryTaggedValue();
-    taggedValue.profile = QUERY_PROFILE_PATH;
-    taggedValue.tag = QUERY_PROFILE_TAG_DATA_SPACE;
-    taggedValue.value = dataSpacePath;
-    return taggedValue;
-};
+import { generateDataSpaceQueryEditorRoute } from './DSLDataSpace_LegendQueryRouter.js';
 export class DataSpaceQuerySetupState extends QuerySetupState {
     dataSpaces = [];
     loadDataSpacesState = ActionState.create();
-    setUpDataSpaceState = ActionState.create();
+    loadDataSpaceState = ActionState.create();
     currentDataSpace;
     dataSpaceViewerState;
     toGetSnapShot = false;
@@ -48,7 +40,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
             setDataSpaceViewerState: action,
             setToGetSnapShot: action,
             loadDataSpaces: flow,
-            setUpDataSpace: flow,
+            loadDataSpace: flow,
             proceedToCreateQuery: flow,
         });
     }
@@ -62,16 +54,10 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
         this.toGetSnapShot = val;
     }
     *loadDataSpaces(searchText) {
-        if (this.queryStore.initState.isInInitialState) {
-            yield flowResult(this.queryStore.initialize());
-        }
-        else if (this.queryStore.initState.isInProgress) {
-            return;
-        }
         const isValidSearchString = searchText.length >= 3;
         this.loadDataSpacesState.inProgress();
         try {
-            this.dataSpaces = (yield this.queryStore.depotServerClient.getEntitiesByClassifierPath(DATA_SPACE_ELEMENT_CLASSIFIER_PATH, {
+            this.dataSpaces = (yield this.setupStore.depotServerClient.getEntitiesByClassifierPath(DATA_SPACE_ELEMENT_CLASSIFIER_PATH, {
                 search: isValidSearchString ? searchText : undefined,
                 scope: this.toGetSnapShot
                     ? DepotScope.SNAPSHOT
@@ -84,49 +70,58 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
                     ? SNAPSHOT_VERSION_ALIAS
                     : storedEntity.versionId,
                 path: storedEntity.entity.path,
+                name: extractEntityNameFromPath(storedEntity.entity.path),
+                title: isString(storedEntity.entity.content.title)
+                    ? storedEntity.entity.content.title
+                    : undefined,
             }));
             this.loadDataSpacesState.pass();
         }
         catch (error) {
             assertErrorThrown(error);
             this.loadDataSpacesState.fail();
-            this.queryStore.applicationStore.notifyError(error);
+            this.setupStore.applicationStore.notifyError(error);
         }
     }
-    *setUpDataSpace(dataSpace) {
-        if (this.queryStore.initState.isInInitialState) {
-            yield flowResult(this.queryStore.initialize());
-        }
-        else if (this.queryStore.initState.isInProgress) {
-            return;
-        }
-        this.setUpDataSpaceState.inProgress();
+    *loadDataSpace(dataSpace) {
+        this.loadDataSpaceState.inProgress();
+        this.loadDataSpaceState.setMessage(`Initializing...`);
         try {
-            const projectData = ProjectData.serialization.fromJson((yield flowResult(this.queryStore.depotServerClient.getProject(dataSpace.groupId, dataSpace.artifactId))));
-            yield flowResult(this.queryStore.buildGraph(projectData, dataSpace.versionId));
-            this.dataSpaceViewerState = new DataSpaceViewerState(this.queryStore.graphManagerState, dataSpace.groupId, dataSpace.artifactId, dataSpace.versionId, getDataSpace(dataSpace.path, this.queryStore.graphManagerState.graph), {
-                viewProject: (groupId, artifactId, versionId, entityPath) => this.queryStore.viewStudioProject(groupId, artifactId, versionId, entityPath),
+            // fetch project
+            this.loadDataSpaceState.setMessage(`Fetching project...`);
+            const project = ProjectData.serialization.fromJson((yield flowResult(this.setupStore.depotServerClient.getProject(dataSpace.groupId, dataSpace.artifactId))));
+            // fetch entities
+            this.loadDataSpaceState.setMessage(`Fetching entities...`);
+            const entities = (yield this.setupStore.depotServerClient.getEntities(project, dataSpace.versionId));
+            // fetch dependencies
+            this.loadDataSpaceState.setMessage(`Fetching dependencies...`);
+            const dependencyEntitiesIndex = (yield flowResult(this.setupStore.depotServerClient.getIndexedDependencyEntities(project, dataSpace.versionId)));
+            // analyze data space
+            this.loadDataSpaceState.setMessage(`Analyzing data space...`);
+            const analysisResult = (yield getDSLDataSpaceGraphManagerExtension(this.setupStore.graphManagerState.graphManager).analyzeDataSpace(dataSpace.path, entities, dependencyEntitiesIndex));
+            this.dataSpaceViewerState = new DataSpaceViewerState(dataSpace.groupId, dataSpace.artifactId, dataSpace.versionId, analysisResult, {
+                viewProject: (groupId, artifactId, versionId, entityPath) => this.setupStore.applicationStore.navigator.openNewWindow(generateStudioProjectViewUrl(this.setupStore.applicationStore.config.studioUrl, groupId, artifactId, versionId, entityPath)),
                 onDiagramClassDoubleClick: (classView) => {
                     this.proceedToCreateQuery(classView.class.value);
                 },
             });
-            this.setUpDataSpaceState.pass();
+            this.loadDataSpaceState.pass();
         }
         catch (error) {
             assertErrorThrown(error);
-            this.setUpDataSpaceState.fail();
-            this.queryStore.applicationStore.notifyError(error);
+            this.loadDataSpaceState.fail();
+            this.setupStore.applicationStore.notifyError(error);
+        }
+        finally {
+            this.loadDataSpaceState.setMessage(undefined);
         }
     }
     *proceedToCreateQuery(_class) {
         if (this.dataSpaceViewerState) {
-            const projectData = ProjectData.serialization.fromJson((yield flowResult(this.queryStore.depotServerClient.getProject(this.dataSpaceViewerState.groupId, this.dataSpaceViewerState.artifactId))));
-            const queryInfoState = new CreateQueryInfoState(this.queryStore, projectData, this.dataSpaceViewerState.versionId, this.dataSpaceViewerState.currentExecutionContext.mapping.value, this.dataSpaceViewerState.currentRuntime);
-            queryInfoState.taggedValues = [
-                createQueryDataSpaceTaggedValue(this.dataSpaceViewerState.dataSpace.path),
-            ];
-            this.queryStore.setQueryInfoState(queryInfoState);
-            this.queryStore.applicationStore.navigator.goTo(generateCreateQueryRoute(this.dataSpaceViewerState.groupId, this.dataSpaceViewerState.artifactId, this.dataSpaceViewerState.versionId, this.dataSpaceViewerState.currentExecutionContext.mapping.value.path, this.dataSpaceViewerState.currentRuntime.path, _class?.path));
+            this.setupStore.applicationStore.navigator.goTo(generateDataSpaceQueryEditorRoute(this.dataSpaceViewerState.groupId, this.dataSpaceViewerState.artifactId, this.dataSpaceViewerState.versionId, this.dataSpaceViewerState.dataSpaceAnalysisResult.path, this.dataSpaceViewerState.currentExecutionContext.name, this.dataSpaceViewerState.currentRuntime ===
+                this.dataSpaceViewerState.currentExecutionContext.defaultRuntime
+                ? undefined
+                : this.dataSpaceViewerState.currentRuntime.path, _class?.path));
             this.setupStore.setSetupState(undefined);
         }
     }

package/lib/stores/query/DataSpaceQuerySetupState.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataSpaceQuerySetupState.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataSpaceQuerySetupState.js","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-extension-dsl-data-space",
-  "version": "4.0.5",
+  "version": "6.1.0",
   "description": "Legend extension for Data Space DSL",
   "keywords": [
     "legend",
@@ -43,32 +43,33 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "6.0.2",
-    "@finos/legend-art": "2.0.8",
-    "@finos/legend-extension-dsl-diagram": "4.1.6",
-    "@finos/legend-graph": "10.1.2",
-    "@finos/legend-model-storage": "2.0.6",
-    "@finos/legend-query": "3.2.3",
-    "@finos/legend-server-depot": "2.0.6",
-    "@finos/legend-shared": "4.0.3",
-    "@finos/legend-studio": "11.0.3",
+    "@finos/legend-application": "7.0.2",
+    "@finos/legend-application-query": "5.0.1",
+    "@finos/legend-application-studio": "13.0.1",
+    "@finos/legend-art": "2.0.11",
+    "@finos/legend-extension-dsl-diagram": "5.0.1",
+    "@finos/legend-graph": "13.0.0",
+    "@finos/legend-server-depot": "3.0.2",
+    "@finos/legend-shared": "5.0.1",
+    "@finos/legend-storage": "3.0.1",
     "@types/react": "18.0.15",
     "mobx": "6.6.1",
     "mobx-react-lite": "3.4.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-resize-detector": "7.1.2",
+    "react-router": "5.3.3",
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.5",
-    "@jest/globals": "28.1.2",
+    "@finos/legend-dev-utils": "2.0.7",
+    "@jest/globals": "28.1.3",
     "cross-env": "7.0.3",
-    "eslint": "8.19.0",
-    "jest": "28.1.2",
+    "eslint": "8.20.0",
+    "jest": "28.1.3",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.53.0",
+    "sass": "1.54.0",
     "typescript": "4.7.4"
   },
   "peerDependencies": {
@@ -78,11 +79,11 @@
     "directory": "build/publishContent"
   },
   "extensions": {
-    "graphPreset": "@finos/legend-graph-preset-dsl-data-space",
-    "pureProtocolProcessorPlugin": "@finos/legend-graph-plugin-dsl-data-space-pure-protocol-processor",
-    "pureGraphManagerPlugin": "@finos/legend-graph-plugin-dsl-data-space-pure-graph-manager",
-    "pureGraphPlugin": "@finos/legend-graph-plugin-dsl-data-space-pure-graph",
-    "studioPlugin": "@finos/legend-studio-plugin-dsl-data-space",
-    "queryPlugin": "@finos/legend-query-plugin-dsl-data-space"
+    "graphManagerPreset": "@finos/legend-graph-manager-preset-dsl-data-space",
+    "pureProtocolProcessorPlugin": "@finos/legend-pure-protocol-processor-plugin-dsl-data-space",
+    "pureGraphManagerPlugin": "@finos/legend-pure-graph-manager-plugin-dsl-data-space",
+    "pureGraphPlugin": "@finos/legend-pure-graph-plugin-dsl-data-space",
+    "applicationStudioPlugin": "@finos/legend-application-studio-plugin-dsl-data-space",
+    "queryApplicationPlugin": "@finos/legend-application-query-plugin-dsl-data-space"
   }
 }

package/src/DSLDataSpace_Const.ts

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// NOTE: these are non-compilable profile and tag that we come up with for query
+// so that it records the dataSpace it is created from
+export const QUERY_PROFILE_PATH = 'meta::pure::profiles::query';
+export const QUERY_PROFILE_TAG_DATA_SPACE = 'dataSpace';

package/src/DSLDataSpace_Extension.ts

@@ -17,12 +17,12 @@
 import packageJson from '../package.json';
 import { AbstractPreset } from '@finos/legend-shared';
 import { DSLDataSpace_PureGraphManagerPlugin } from './graphManager/DSLDataSpace_PureGraphManagerPlugin.js';
-import { DSLDataSpace_PureProtocolProcessorPlugin } from './models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
+import { DSLDataSpace_PureProtocolProcessorPlugin } from './graphManager/protocol/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
 import { DSLDataSpace_PureGraphPlugin } from './graph/DSLDataSpace_PureGraphPlugin.js';
 
-export class DSLDataSpace_GraphPreset extends AbstractPreset {
+export class DSLDataSpace_GraphManagerPreset extends AbstractPreset {
   constructor() {
-    super(packageJson.extensions.graphPreset, packageJson.version, [
+    super(packageJson.extensions.graphManagerPreset, packageJson.version, [
       new DSLDataSpace_PureGraphPlugin(),
       new DSLDataSpace_PureGraphManagerPlugin(),
       new DSLDataSpace_PureProtocolProcessorPlugin(),