@finos/legend-extension-dsl-data-space 6.1.11 → 6.1.12

package/lib/stores/query/DataSpaceQueryCreatorStore.js

@@ -0,0 +1,113 @@
+/**
+ * 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.
+ */
+import { extractElementNameFromPath, QueryTaggedValue, RuntimePointer, PackageableElementExplicitReference, } from '@finos/legend-graph';
+import { QueryEditorStore, } from '@finos/legend-application-query';
+import { guaranteeNonNullable, guaranteeType, uuid, } from '@finos/legend-shared';
+import { QUERY_PROFILE_PATH, QUERY_PROFILE_TAG_DATA_SPACE, } from '../../DSLDataSpace_Const.js';
+import { getDataSpace } from '../../graphManager/DSLDataSpace_GraphManagerHelper.js';
+import { DataSpaceQueryBuilderState } from './DataSpaceQueryBuilderState.js';
+import { generateDataSpaceQueryCreatorRoute } from './DSLDataSpace_LegendQueryRouter.js';
+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;
+};
+export class DataSpaceQueryCreatorStore extends QueryEditorStore {
+    groupId;
+    artifactId;
+    versionId;
+    dataSpacePath;
+    executionContext;
+    runtimePath;
+    classPath;
+    constructor(applicationStore, depotServerClient, pluginManager, groupId, artifactId, versionId, dataSpacePath, executionContext, runtimePath, executionKey) {
+        super(applicationStore, depotServerClient, pluginManager);
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.versionId = versionId;
+        this.dataSpacePath = dataSpacePath;
+        this.executionContext = executionContext;
+        this.runtimePath = runtimePath;
+        this.classPath = executionKey;
+    }
+    getProjectInfo() {
+        return {
+            groupId: this.groupId,
+            artifactId: this.artifactId,
+            versionId: this.versionId,
+        };
+    }
+    async initializeQueryBuilderState() {
+        const dataSpace = getDataSpace(this.dataSpacePath, this.graphManagerState.graph);
+        const executionContext = guaranteeNonNullable(dataSpace.executionContexts.find((context) => context.name === this.executionContext), `Can't find execution context '${this.executionContext}'`);
+        const queryBuilderState = new DataSpaceQueryBuilderState(this.applicationStore, this.graphManagerState, this.depotServerClient, dataSpace, executionContext, this.groupId, this.artifactId, this.versionId, (dataSpaceInfo) => {
+            if (dataSpaceInfo.defaultExecutionContext) {
+                this.applicationStore.navigator.jumpTo(generateDataSpaceQueryCreatorRoute(dataSpaceInfo.groupId, dataSpaceInfo.artifactId, dataSpaceInfo.versionId, dataSpaceInfo.path, dataSpaceInfo.defaultExecutionContext, undefined, undefined));
+            }
+            else {
+                this.applicationStore.notifyWarning(`Can't switch data space: default execution context not specified`);
+            }
+        }, (ec) => {
+            // runtime should already be set
+            const runtimePointer = guaranteeType(queryBuilderState.runtimeValue, RuntimePointer);
+            this.applicationStore.navigator.goTo(generateDataSpaceQueryCreatorRoute(this.groupId, this.artifactId, this.versionId, dataSpace.path, ec.name, runtimePointer.packageableRuntime.value ===
+                queryBuilderState.executionContext.defaultRuntime.value
+                ? undefined
+                : runtimePointer.packageableRuntime.value.path, queryBuilderState.class?.path));
+        }, (runtimeValue) => {
+            const runtimePointer = guaranteeType(runtimeValue, RuntimePointer);
+            queryBuilderState.applicationStore.navigator.goTo(generateDataSpaceQueryCreatorRoute(queryBuilderState.groupId, queryBuilderState.artifactId, queryBuilderState.versionId, queryBuilderState.dataSpace.path, queryBuilderState.executionContext.name, runtimePointer.packageableRuntime.value ===
+                queryBuilderState.executionContext.defaultRuntime.value
+                ? undefined
+                : runtimePointer.packageableRuntime.value.path, queryBuilderState.class?.path));
+        }, (_class) => {
+            // runtime should already be set
+            const runtimePointer = guaranteeType(queryBuilderState.runtimeValue, RuntimePointer);
+            queryBuilderState.applicationStore.navigator.goTo(generateDataSpaceQueryCreatorRoute(queryBuilderState.groupId, queryBuilderState.artifactId, queryBuilderState.versionId, queryBuilderState.dataSpace.path, queryBuilderState.executionContext.name, runtimePointer.packageableRuntime.value ===
+                queryBuilderState.executionContext.defaultRuntime.value
+                ? undefined
+                : runtimePointer.packageableRuntime.value.path, _class.path));
+        });
+        queryBuilderState.setExecutionContext(executionContext);
+        queryBuilderState.propagateExecutionContextChange(executionContext);
+        // set runtime if already chosen
+        if (this.runtimePath) {
+            queryBuilderState.changeRuntime(new RuntimePointer(PackageableElementExplicitReference.create(this.graphManagerState.graph.getRuntime(this.runtimePath))));
+        }
+        // set class if already chosen
+        if (this.classPath) {
+            queryBuilderState.changeClass(this.graphManagerState.graph.getClass(this.classPath));
+        }
+        return queryBuilderState;
+    }
+    async getExportConfiguration() {
+        return {
+            defaultName: `New Query for ${extractElementNameFromPath(this.dataSpacePath)}[${this.executionContext}]`,
+            decorator: (query) => {
+                query.id = uuid();
+                query.groupId = this.groupId;
+                query.artifactId = this.artifactId;
+                query.versionId = this.versionId;
+                query.taggedValues = [
+                    createQueryDataSpaceTaggedValue(this.dataSpacePath),
+                ];
+            },
+        };
+    }
+}
+//# sourceMappingURL=DataSpaceQueryCreatorStore.js.map

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

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

package/lib/stores/query/DataSpaceQuerySetupState.d.ts

@@ -17,27 +17,20 @@ import type { Class } from '@finos/legend-graph';
 import { type QuerySetupStore, QuerySetupState } from '@finos/legend-application-query';
 import { type GeneratorFn, ActionState } from '@finos/legend-shared';
 import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
-export interface DataSpaceContext {
-    groupId: string;
-    artifactId: string;
-    versionId: string;
-    title: string | undefined;
-    name: string;
-    path: string;
-}
+import { type DataSpaceInfo } from './DataSpaceInfo.js';
 export declare class DataSpaceQuerySetupState extends QuerySetupState {
-    dataSpaces: DataSpaceContext[];
+    dataSpaces: DataSpaceInfo[];
     loadDataSpacesState: ActionState;
     loadDataSpaceState: ActionState;
-    currentDataSpace?: DataSpaceContext | undefined;
+    currentDataSpace?: DataSpaceInfo | undefined;
     dataSpaceViewerState?: DataSpaceViewerState | undefined;
     toGetSnapShot: boolean;
     constructor(setupStore: QuerySetupStore);
-    setCurrentDataSpace(val: DataSpaceContext | undefined): void;
+    setCurrentDataSpace(val: DataSpaceInfo | undefined): void;
     setDataSpaceViewerState(val: DataSpaceViewerState | undefined): void;
     setToGetSnapShot(val: boolean): void;
     loadDataSpaces(searchText: string): GeneratorFn<void>;
-    loadDataSpace(dataSpace: DataSpaceContext): GeneratorFn<void>;
+    loadDataSpace(dataSpace: DataSpaceInfo): GeneratorFn<void>;
     proceedToCreateQuery(_class?: Class): GeneratorFn<void>;
 }
 //# sourceMappingURL=DataSpaceQuerySetupState.d.ts.map

package/lib/stores/query/DataSpaceQuerySetupState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EACL,KAAK,eAAe,EACpB,eAAe,EAEhB,MAAM,iCAAiC,CAAC;AAOzC,OAAO,EACL,KAAK,WAAW,EAEhB,WAAW,EAGZ,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGlE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,wBAAyB,SAAQ,eAAe;IAC3D,UAAU,EAAE,gBAAgB,EAAE,CAAM;IACpC,mBAAmB,cAAwB;IAC3C,kBAAkB,cAAwB;IAC1C,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAChD,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,aAAa,UAAS;gBAEV,UAAU,EAAE,eAAe;IAiBvC,mBAAmB,CAAC,GAAG,EAAE,gBAAgB,GAAG,SAAS,GAAG,IAAI;IAI5D,uBAAuB,CAAC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAIpE,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAInC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;IAmCrD,aAAa,CAAC,SAAS,EAAE,gBAAgB,GAAG,WAAW,CAAC,IAAI,CAAC;IA8E7D,oBAAoB,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;CAmBzD"}
+{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EACL,KAAK,eAAe,EACpB,eAAe,EAEhB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,EACL,KAAK,WAAW,EAEhB,WAAW,EAEZ,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,oBAAoB,CAAC;AAM9E,qBAAa,wBAAyB,SAAQ,eAAe;IAC3D,UAAU,EAAE,aAAa,EAAE,CAAM;IACjC,mBAAmB,cAAwB;IAC3C,kBAAkB,cAAwB;IAC1C,gBAAgB,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7C,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,aAAa,UAAS;gBAEV,UAAU,EAAE,eAAe;IAiBvC,mBAAmB,CAAC,GAAG,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAIzD,uBAAuB,CAAC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAIpE,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAInC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;IA2BrD,aAAa,CAAC,SAAS,EAAE,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC;IA8E1D,oBAAoB,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;CAmBzD"}

package/lib/stores/query/DataSpaceQuerySetupState.js

@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-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, isString, } from '@finos/legend-shared';
+import { DepotScope, ProjectData, } from '@finos/legend-server-depot';
+import { ActionState, assertErrorThrown, } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
 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';
-import { generateDataSpaceQueryEditorRoute } from './DSLDataSpace_LegendQueryRouter.js';
+import { generateDataSpaceQueryCreatorRoute } from './DSLDataSpace_LegendQueryRouter.js';
+import { extractDataSpaceInfo } from './DataSpaceInfo.js';
+import { DEFAULT_DATA_SPACE_LOADER_LIMIT, MINIMUM_DATA_SPACE_LOADER_SEARCH_LENGTH, } from '../../DSLDataSpace_Const.js';
 export class DataSpaceQuerySetupState extends QuerySetupState {
     dataSpaces = [];
     loadDataSpacesState = ActionState.create();
@@ -54,7 +55,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
         this.toGetSnapShot = val;
     }
     *loadDataSpaces(searchText) {
-        const isValidSearchString = searchText.length >= 3;
+        const isValidSearchString = searchText.length >= MINIMUM_DATA_SPACE_LOADER_SEARCH_LENGTH;
         this.loadDataSpacesState.inProgress();
         try {
             this.dataSpaces = (yield this.setupStore.depotServerClient.getEntitiesByClassifierPath(DATA_SPACE_ELEMENT_CLASSIFIER_PATH, {
@@ -62,19 +63,8 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
                 scope: this.toGetSnapShot
                     ? DepotScope.SNAPSHOT
                     : DepotScope.RELEASES,
-                limit: 10,
-            })).map((storedEntity) => ({
-                groupId: storedEntity.groupId,
-                artifactId: storedEntity.artifactId,
-                versionId: this.toGetSnapShot
-                    ? 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,
-            }));
+                limit: DEFAULT_DATA_SPACE_LOADER_LIMIT,
+            })).map((storedEntity) => extractDataSpaceInfo(storedEntity, this.toGetSnapShot));
             this.loadDataSpacesState.pass();
         }
         catch (error) {
@@ -118,7 +108,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
     }
     *proceedToCreateQuery(_class) {
         if (this.dataSpaceViewerState) {
-            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.setupStore.applicationStore.navigator.goTo(generateDataSpaceQueryCreatorRoute(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));

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": "6.1.11",
+  "version": "6.1.12",
   "description": "Legend extension for Data Space DSL",
   "keywords": [
     "legend",
@@ -43,16 +43,16 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "7.1.6",
-    "@finos/legend-application-query": "5.2.8",
-    "@finos/legend-application-studio": "15.1.0",
-    "@finos/legend-art": "3.0.4",
-    "@finos/legend-extension-dsl-diagram": "5.0.10",
-    "@finos/legend-graph": "14.0.6",
-    "@finos/legend-server-depot": "3.0.9",
-    "@finos/legend-shared": "6.0.4",
-    "@finos/legend-storage": "3.0.8",
-    "@types/react": "18.0.18",
+    "@finos/legend-application": "7.1.7",
+    "@finos/legend-application-query": "6.0.0",
+    "@finos/legend-application-studio": "15.2.0",
+    "@finos/legend-art": "3.1.0",
+    "@finos/legend-extension-dsl-diagram": "5.0.11",
+    "@finos/legend-graph": "14.1.0",
+    "@finos/legend-server-depot": "3.0.10",
+    "@finos/legend-shared": "6.1.0",
+    "@finos/legend-storage": "3.0.9",
+    "@types/react": "18.0.19",
     "mobx": "6.6.2",
     "mobx-react-lite": "3.4.0",
     "react": "18.2.0",
@@ -62,15 +62,15 @@
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.14",
-    "@jest/globals": "29.0.2",
+    "@finos/legend-dev-utils": "2.0.15",
+    "@jest/globals": "29.0.3",
     "cross-env": "7.0.3",
     "eslint": "8.23.0",
-    "jest": "29.0.2",
+    "jest": "29.0.3",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.54.8",
-    "typescript": "4.8.2"
+    "sass": "1.54.9",
+    "typescript": "4.8.3"
   },
   "peerDependencies": {
     "react": "^18.0.0"

package/src/DSLDataSpace_Const.ts

@@ -18,3 +18,6 @@
 // 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';
+
+export const DEFAULT_DATA_SPACE_LOADER_LIMIT = 10;
+export const MINIMUM_DATA_SPACE_LOADER_SEARCH_LENGTH = 3;

package/src/components/DSLDataSpace_Icon.tsx

@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+import { SquareIcon } from '@finos/legend-art';
+
+export const DataSpaceIcon: React.FC = () => (
+  <div className="icon icon--data-space">
+    <SquareIcon />
+  </div>
+);

package/src/components/query/DSLDataSpace_LegendQueryApplicationPlugin.tsx

@@ -22,16 +22,40 @@ import {
   type QuerySetupRenderer,
   type QuerySetupState,
   type QuerySetupStore,
+  type ExistingQueryEditorStateBuilder,
+  type QueryBuilderState,
   LegendQueryApplicationPlugin,
+  generateExistingQueryEditorRoute,
+  LegendQueryEventService,
+  LEGEND_QUERY_APP_EVENT,
 } from '@finos/legend-application-query';
 import { SquareIcon } from '@finos/legend-art';
 import { DataSpaceQuerySetupState } from '../../stores/query/DataSpaceQuerySetupState.js';
 import { DataspaceQuerySetup } from './DataSpaceQuerySetup.js';
-import type { ApplicationPageEntry } from '@finos/legend-application';
-import { DATA_SPACE_QUERY_EDITOR_ROUTE_PATTERN } from '../../stores/query/DSLDataSpace_LegendQueryRouter.js';
-import { DataSpaceQueryEditor } from './DataSpaceQueryEditor.js';
-import { DataSpaceQueryEditorStore } from '../../stores/query/DataSpaceQueryEditorStore.js';
-import { extractElementNameFromPath } from '@finos/legend-graph';
+import {
+  ActionAlertActionType,
+  ActionAlertType,
+  type ApplicationPageEntry,
+} from '@finos/legend-application';
+import { CREATE_QUERY_FROM_DATA_SPACE_ROUTE_PATTERN } from '../../stores/query/DSLDataSpace_LegendQueryRouter.js';
+import { DataSpaceQueryCreator } from './DataSpaceQueryCreator.js';
+import {
+  createQueryDataSpaceTaggedValue,
+  DataSpaceQueryCreatorStore,
+} from '../../stores/query/DataSpaceQueryCreatorStore.js';
+import {
+  Query,
+  extractElementNameFromPath,
+  isValidFullPath,
+} from '@finos/legend-graph';
+import {
+  QUERY_PROFILE_PATH,
+  QUERY_PROFILE_TAG_DATA_SPACE,
+} from '../../DSLDataSpace_Const.js';
+import { DataSpaceQueryBuilderState } from '../../stores/query/DataSpaceQueryBuilderState.js';
+import type { DataSpaceInfo } from '../../stores/query/DataSpaceInfo.js';
+import { getOwnDataSpace } from '../../graphManager/DSLDataSpace_GraphManagerHelper.js';
+import { assertErrorThrown, LogEvent, uuid } from '@finos/legend-shared';
 
 export class DSLDataSpace_LegendQueryApplicationPlugin extends LegendQueryApplicationPlugin {
   constructor() {
@@ -43,8 +67,8 @@ export class DSLDataSpace_LegendQueryApplicationPlugin extends LegendQueryApplic
       // data space query editor
       {
         key: 'data-space-query-editor-application-page',
-        urlPatterns: [DATA_SPACE_QUERY_EDITOR_ROUTE_PATTERN],
-        renderer: DataSpaceQueryEditor,
+        urlPatterns: [CREATE_QUERY_FROM_DATA_SPACE_ROUTE_PATTERN],
+        renderer: DataSpaceQueryCreator,
       },
     ];
   }
@@ -90,7 +114,7 @@ export class DSLDataSpace_LegendQueryApplicationPlugin extends LegendQueryApplic
   override getExtraQueryEditorHeaderLabelers(): QueryEditorHeaderLabeler[] {
     return [
       (editorStore: QueryEditorStore): React.ReactNode | undefined => {
-        if (editorStore instanceof DataSpaceQueryEditorStore) {
+        if (editorStore instanceof DataSpaceQueryCreatorStore) {
           return (
             <div className="query-editor__header__label">
               <SquareIcon className="query-editor__header__label__icon icon--data-space" />
@@ -105,4 +129,142 @@ export class DSLDataSpace_LegendQueryApplicationPlugin extends LegendQueryApplic
       },
     ];
   }
+
+  override getExtraExistingQueryEditorStateBuilders(): ExistingQueryEditorStateBuilder[] {
+    return [
+      (
+        query: Query,
+        editorStore: QueryEditorStore,
+      ): QueryBuilderState | undefined => {
+        const dataSpaceTaggedValue = query.taggedValues?.find(
+          (taggedValue) =>
+            taggedValue.profile === QUERY_PROFILE_PATH &&
+            taggedValue.tag === QUERY_PROFILE_TAG_DATA_SPACE &&
+            isValidFullPath(taggedValue.value),
+        );
+
+        if (dataSpaceTaggedValue) {
+          const dataSpacePath = dataSpaceTaggedValue.value;
+          const dataSpace = getOwnDataSpace(
+            dataSpacePath,
+            editorStore.graphManagerState.graph,
+          );
+          const mapping = query.mapping.value;
+          const matchingExecutionContext = dataSpace.executionContexts.find(
+            (ec) => ec.mapping.value === mapping,
+          );
+          if (!matchingExecutionContext) {
+            // if a matching execution context is not found, it means this query is not
+            // properly created from a data space, therefore, we cannot support this case
+            return undefined;
+          }
+          return new DataSpaceQueryBuilderState(
+            editorStore.applicationStore,
+            editorStore.graphManagerState,
+            editorStore.depotServerClient,
+            dataSpace,
+            matchingExecutionContext,
+            query.groupId,
+            query.artifactId,
+            query.versionId,
+            (dataSpaceInfo: DataSpaceInfo) => {
+              if (dataSpaceInfo.defaultExecutionContext) {
+                const persistQuery = async (): Promise<void> => {
+                  // prepare the new query to save
+                  const _query = new Query();
+                  _query.name = query.name;
+                  _query.id = query.id;
+                  _query.groupId = query.groupId;
+                  _query.artifactId = query.artifactId;
+                  _query.versionId = query.versionId;
+                  _query.mapping = query.mapping;
+                  _query.runtime = query.runtime;
+                  _query.taggedValues = [
+                    createQueryDataSpaceTaggedValue(dataSpaceInfo.path),
+                  ].concat(
+                    (query.taggedValues ?? []).filter(
+                      (taggedValue) => taggedValue !== dataSpaceTaggedValue,
+                    ),
+                  );
+                  _query.stereotypes = query.stereotypes;
+                  _query.content = query.content;
+                  _query.owner = query.owner;
+
+                  try {
+                    if (!query.isCurrentUserQuery) {
+                      _query.id = uuid();
+                      const newQuery =
+                        await editorStore.graphManagerState.graphManager.createQuery(
+                          _query,
+                          editorStore.graphManagerState.graph,
+                        );
+                      editorStore.applicationStore.notifySuccess(
+                        `Successfully created query!`,
+                      );
+                      LegendQueryEventService.create(
+                        editorStore.applicationStore.eventService,
+                      ).notify_QueryCreated({ queryId: newQuery.id });
+                      editorStore.applicationStore.navigator.jumpTo(
+                        editorStore.applicationStore.navigator.generateLocation(
+                          generateExistingQueryEditorRoute(newQuery.id),
+                        ),
+                      );
+                    } else {
+                      await editorStore.graphManagerState.graphManager.updateQuery(
+                        _query,
+                        editorStore.graphManagerState.graph,
+                      );
+                      editorStore.applicationStore.notifySuccess(
+                        `Successfully updated query!`,
+                      );
+                      editorStore.applicationStore.navigator.reload();
+                    }
+                  } catch (error) {
+                    assertErrorThrown(error);
+                    editorStore.applicationStore.log.error(
+                      LogEvent.create(LEGEND_QUERY_APP_EVENT.QUERY_PROBLEM),
+                      error,
+                    );
+                    editorStore.applicationStore.notifyError(error);
+                  }
+                };
+
+                editorStore.applicationStore.setActionAlertInfo({
+                  message: `To change the data space associated with this query, you need to ${
+                    query.isCurrentUserQuery
+                      ? 'update the query'
+                      : 'create a new query'
+                  } to proceed`,
+                  type: ActionAlertType.CAUTION,
+                  actions: [
+                    {
+                      label: query.isCurrentUserQuery
+                        ? 'Update query'
+                        : 'Create new query',
+                      type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+                      handler: () => {
+                        persistQuery().catch(
+                          editorStore.applicationStore.alertUnhandledError,
+                        );
+                      },
+                    },
+                    {
+                      label: 'Abort',
+                      type: ActionAlertActionType.PROCEED,
+                      default: true,
+                    },
+                  ],
+                });
+              } else {
+                editorStore.applicationStore.notifyWarning(
+                  `Can't switch data space: default execution context not specified`,
+                );
+              }
+            },
+          );
+        }
+        return undefined;
+      },
+    ];
+  }
 }