@finos/legend-application-query 13.4.21 → 13.5.0

package/lib/stores/data-space/DataSpaceTemplateQueryCreatorStore.js

@@ -17,9 +17,10 @@ import { extractElementNameFromPath, } from '@finos/legend-graph';
 import { StoreProjectData, } from '@finos/legend-server-depot';
 import { filterByType, guaranteeNonNullable, uuid } from '@finos/legend-shared';
 import { QueryBuilderDataBrowserWorkflow, } from '@finos/legend-query-builder';
-import { QueryBuilderActionConfig_QueryApplication, QueryEditorStore, createViewProjectHandler, createViewSDLCProjectHandler, } from '../QueryEditorStore.js';
+import { QueryBuilderActionConfig_QueryApplication, QueryEditorStore, } from '../QueryEditorStore.js';
 import { DSL_DataSpace_getGraphManagerExtension, DataSpaceExecutableTemplate, getDataSpace, retrieveAnalyticsResultCache, } from '@finos/legend-extension-dsl-data-space/graph';
-import { DataSpaceProjectInfo, DataSpaceQueryBuilderState, createQueryClassTaggedValue, } from '@finos/legend-extension-dsl-data-space/application';
+import { DataSpaceQueryBuilderState, createQueryClassTaggedValue, } from '@finos/legend-extension-dsl-data-space/application';
+import { createDataSpaceDepoRepo } from './DataSpaceQueryBuilderHelper.js';
 export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
     groupId;
     artifactId;
@@ -59,16 +60,15 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
         catch {
             // do nothing
         }
-        const projectInfo = new DataSpaceProjectInfo(this.groupId, this.artifactId, this.versionId, createViewProjectHandler(this.applicationStore), createViewSDLCProjectHandler(this.applicationStore, this.depotServerClient));
         const sourceInfo = {
-            groupId: projectInfo.groupId,
-            artifactId: projectInfo.artifactId,
-            versionId: projectInfo.versionId,
+            groupId: this.groupId,
+            artifactId: this.artifactId,
+            versionId: this.versionId,
             dataSpace: dataSpace.path,
         };
-        const queryBuilderState = new DataSpaceQueryBuilderState(this.applicationStore, this.graphManagerState, this.depotServerClient, QueryBuilderDataBrowserWorkflow.INSTANCE, new QueryBuilderActionConfig_QueryApplication(this), dataSpace, executionContext, (dataSpaceInfo) => {
+        const queryBuilderState = new DataSpaceQueryBuilderState(this.applicationStore, this.graphManagerState, QueryBuilderDataBrowserWorkflow.INSTANCE, new QueryBuilderActionConfig_QueryApplication(this), dataSpace, executionContext, createDataSpaceDepoRepo(this, this.groupId, this.artifactId, this.versionId, undefined), (dataSpaceInfo) => {
             this.applicationStore.notificationService.notifyWarning(`Can't switch data space to visit current template query`);
-        }, true, dataSpaceAnalysisResult, undefined, undefined, undefined, projectInfo, this.applicationStore.config.options.queryBuilderConfig, sourceInfo);
+        }, dataSpaceAnalysisResult, undefined, undefined, undefined, this.applicationStore.config.options.queryBuilderConfig, sourceInfo);
         queryBuilderState.setExecutionContext(executionContext);
         queryBuilderState.propagateExecutionContextChange(executionContext);
         queryBuilderState.initializeWithQuery(dataSpaceExecutableTemplate.query);

package/lib/stores/data-space/DataSpaceTemplateQueryCreatorStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataSpaceTemplateQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataSpaceTemplateQueryCreatorStore.js","sourceRoot":"","sources":["../../../src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,GAG3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAEL,+BAA+B,GAChC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,yCAAyC,EACzC,gBAAgB,GAEjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,sCAAsC,EACtC,2BAA2B,EAC3B,YAAY,EACZ,4BAA4B,GAC7B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,GAE5B,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,MAAM,OAAO,kCAAmC,SAAQ,gBAAgB;IAC7D,OAAO,CAAS;IAChB,UAAU,CAAS;IACnB,SAAS,CAAS;IAClB,aAAa,CAAS;IACtB,eAAe,CAAS;IACjC,kBAAkB,CAAU;IAE5B,YACE,gBAA6C,EAC7C,iBAAoC,EACpC,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,aAAqB,EACrB,eAAuB;QAEvB,KAAK,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAE3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED,cAAc;QACZ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,2BAA2B;QAC/B,MAAM,SAAS,GAAG,YAAY,CAC5B,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC7B,CAAC;QACF,MAAM,2BAA2B,GAAG,oBAAoB,CACtD,SAAS,CAAC,WAAW;YACnB,EAAE,MAAM,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAC;aAClD,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,CAAC,eAAe,CAAC,EAC/D,sCAAsC,IAAI,CAAC,eAAe,GAAG,CAC9D,CAAC;QACF,MAAM,gBAAgB,GAAG,oBAAoB,CAC3C,2BAA2B,CAAC,mBAAmB;YAC7C,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAChC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,2BAA2B,CAAC,mBAAmB,CACpE,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,SAAS,CAAC,uBAAuB,EACrC,iCAAiC,2BAA2B,CAAC,mBAAmB,GAAG,CACpF,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,2BAA2B,CAAC,KAAK,CAAC;QAC5D,IAAI,uBAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,aAAa,CAAC,QAAQ,CACrD,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CACvE,CAAC;YACF,uBAAuB,GAAG,MAAM,sCAAsC,CACpE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACpC,CAAC,kCAAkC,CAAC,GAAG,EAAE,CACxC,4BAA4B,CAC1B,OAAO,EACP,IAAI,CAAC,SAAS,EACd,SAAS,CAAC,IAAI,EACd,IAAI,CAAC,iBAAiB,CACvB,CACF,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,aAAa;QACf,CAAC;QACD,MAAM,UAAU,GAAG;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,SAAS,CAAC,IAAI;SAC1B,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,0BAA0B,CACtD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,EACtB,+BAA+B,CAAC,QAAQ,EACxC,IAAI,yCAAyC,CAAC,IAAI,CAAC,EACnD,SAAS,EACT,gBAAgB,EAChB,uBAAuB,CACrB,IAAI,EACJ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,SAAS,EACd,SAAS,CACV,EACD,CAAC,aAA4B,EAAE,EAAE;YAC/B,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,aAAa,CACrD,yDAAyD,CAC1D,CAAC;QACJ,CAAC,EACD,uBAAuB,EACvB,SAAS,EACT,SAAS,EACT,SAAS,EACT,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,EACvD,UAAU,CACX,CAAC;QACF,iBAAiB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QACxD,iBAAiB,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;QACpE,iBAAiB,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzE,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,uBAAuB,CACrB,MAAiB,EACjB,OAA0C;QAE1C,OAAO;YACL,WAAW,EAAE,OAAO,EAAE,MAAM;gBAC1B,CAAC,CAAC,GAAG,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;gBACrD,CAAC,CAAC,iBAAiB,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,IAC7D,IAAI,CAAC,eACP,GAAG;YACP,SAAS,EAAE,CAAC,KAAY,EAAQ,EAAE;gBAChC,KAAK,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;gBAClB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC7B,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBACnC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBACjC,IAAI,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,CAAC;oBAClC,KAAK,CAAC,YAAY,GAAG;wBACnB,2BAA2B,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC;qBAC/D,CAAC;gBACJ,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "13.4.21",
+  "version": "13.5.0",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -43,16 +43,17 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "15.1.5",
-    "@finos/legend-art": "7.1.34",
-    "@finos/legend-extension-dsl-data-space": "10.3.20",
-    "@finos/legend-graph": "31.10.2",
-    "@finos/legend-lego": "1.2.35",
-    "@finos/legend-query-builder": "4.14.44",
-    "@finos/legend-server-depot": "6.0.43",
-    "@finos/legend-shared": "10.0.38",
-    "@finos/legend-storage": "3.0.88",
-    "@testing-library/react": "15.0.7",
+    "@finos/legend-application": "15.1.6",
+    "@finos/legend-art": "7.1.35",
+    "@finos/legend-extension-dsl-data-space": "10.3.21",
+    "@finos/legend-graph": "31.10.3",
+    "@finos/legend-lego": "1.2.36",
+    "@finos/legend-query-builder": "4.14.45",
+    "@finos/legend-server-depot": "6.0.44",
+    "@finos/legend-shared": "10.0.39",
+    "@finos/legend-storage": "3.0.89",
+    "@testing-library/dom": "10.1.0",
+    "@testing-library/react": "16.0.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "mobx": "6.12.3",
@@ -62,14 +63,14 @@
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.1.6",
+    "@finos/legend-dev-utils": "2.1.7",
     "@jest/globals": "29.7.0",
     "cross-env": "7.0.3",
     "eslint": "8.57.0",
     "jest": "29.7.0",
     "npm-run-all": "4.1.5",
     "rimraf": "5.0.7",
-    "sass": "1.77.3",
+    "sass": "1.77.4",
     "typescript": "5.4.5"
   },
   "peerDependencies": {

package/src/__lib__/DSL_DataSpace_LegendQueryNavigation.ts

@@ -59,7 +59,7 @@ export type DataSpaceQueryEditorQueryParams = {
   [DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN.CLASS_PATH]?: string | undefined;
 };
 
-export const DATA_SPACE_QUERY_ROUTE_PATTERN = Object.freeze({
+export const LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN = Object.freeze({
   SETUP: `/dataspace`,
   CREATE: `/dataspace/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH}/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT}/:${DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.RUNTIME_PATH}?`,
   TEMPLATE_QUERY: `/dataspace/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH}/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE}/:${DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.TEMPLATE_QUERY_ID}`,
@@ -67,7 +67,7 @@ export const DATA_SPACE_QUERY_ROUTE_PATTERN = Object.freeze({
 
 export const generateDataSpaceQuerySetupRoute = (): string =>
   generatePath(
-    generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP),
+    generateExtensionUrlPattern(LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP),
     {},
   );
 
@@ -82,7 +82,7 @@ export const generateDataSpaceQueryCreatorRoute = (
 ): string =>
   addQueryParametersToUrl(
     generatePath(
-      generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE),
+      generateExtensionUrlPattern(LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE),
       {
         [DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]:
           generateGAVCoordinates(groupId, artifactId, versionId),
@@ -109,7 +109,9 @@ export const generateDataSpaceTemplateQueryCreatorRoute = (
   templateQueryId: string,
 ): string =>
   generatePath(
-    generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.TEMPLATE_QUERY),
+    generateExtensionUrlPattern(
+      LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN.TEMPLATE_QUERY,
+    ),
     {
       [DATA_SPACE_TEMPLATE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]:
         generateGAVCoordinates(groupId, artifactId, versionId),

package/src/__lib__/LegendQueryNavigation.ts

@@ -33,6 +33,7 @@ export enum LEGEND_QUERY_ROUTE_PATTERN_TOKEN {
 }
 
 export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
+  DEFAULT: '/',
   SETUP: '/setup',
   EDIT_EXISTING_QUERY_SETUP: '/setup/existing-query',
   CREATE_MAPPING_QUERY_SETUP: '/setup/manual',

package/src/components/Core_LegendQueryApplicationPlugin.tsx

@@ -74,7 +74,6 @@ import {
 import {
   ExistingQueryEditorStore,
   QueryBuilderActionConfig_QueryApplication,
-  createViewSDLCProjectHandler,
 } from '../stores/QueryEditorStore.js';
 import {
   DataSpaceQueryBuilderState,
@@ -87,6 +86,7 @@ import { buildUrl } from '@finos/legend-shared';
 import { parseProjectIdentifier } from '@finos/legend-storage';
 import { QueryEditorExistingQueryHeader } from './QueryEditor.js';
 import { DataSpaceTemplateQueryCreatorStore } from '../stores/data-space/DataSpaceTemplateQueryCreatorStore.js';
+import { createViewSDLCProjectHandler } from '../stores/data-space/DataSpaceQueryBuilderHelper.js';
 
 export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlugin {
   static NAME = packageJson.extensions.applicationQueryPlugin;
@@ -371,13 +371,16 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
             LegendQueryTelemetryHelper.logEvent_QueryViewSdlcProjectLaunched(
               editorStore.applicationStore.telemetryService,
             );
-            const { groupId, artifactId } = editorStore.getProjectInfo();
-            createViewSDLCProjectHandler(
-              editorStore.applicationStore,
-              editorStore.depotServerClient,
-            )(groupId, artifactId, undefined).catch(
-              editorStore.applicationStore.alertUnhandledError,
-            );
+            const projectInfo = editorStore.getProjectInfo();
+            if (projectInfo) {
+              const { groupId, artifactId } = projectInfo;
+              createViewSDLCProjectHandler(
+                editorStore.applicationStore,
+                editorStore.depotServerClient,
+              )(groupId, artifactId, undefined).catch(
+                editorStore.applicationStore.alertUnhandledError,
+              );
+            }
           }
         },
         icon: <InfoCircleIcon />,
@@ -539,18 +542,22 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
             const editorStore =
               queryBuilderState.workflowState.actionConfig.editorStore;
             const openSaveQueryModal = (): void => {
-              if (editorStore instanceof ExistingQueryEditorStore) {
-                editorStore.updateState.showSaveModal();
-              } else {
-                editorStore.queryCreatorState.open(undefined);
+              if (editorStore.canPersistToSavedQuery) {
+                if (editorStore instanceof ExistingQueryEditorStore) {
+                  editorStore.updateState.showSaveModal();
+                } else {
+                  editorStore.queryCreatorState.open(undefined);
+                }
               }
             };
             const handleQuerySaveAs = (): void => {
-              editorStore.queryCreatorState.open(
-                editorStore instanceof ExistingQueryEditorStore
-                  ? editorStore.query
-                  : undefined,
-              );
+              if (editorStore.canPersistToSavedQuery) {
+                editorStore.queryCreatorState.open(
+                  editorStore instanceof ExistingQueryEditorStore
+                    ? editorStore.query
+                    : undefined,
+                );
+              }
             };
             return (
               <div className="query-editor__header__action-combo btn__dropdown-combo">
@@ -558,6 +565,7 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
                   className="query-editor__header__action query-editor__header__action-combo__main-btn btn--dak"
                   disabled={
                     editorStore.isPerformingBlockingAction ||
+                    !editorStore.canPersistToSavedQuery ||
                     !queryBuilderState.canBuildQuery
                   }
                   onClick={openSaveQueryModal}

package/src/components/LegendQueryWebApplication.tsx

@@ -24,7 +24,6 @@ import {
 } from './QueryEditor.js';
 import {
   BrowserEnvironmentProvider,
-  Redirect,
   Route,
   Switch,
   generateExtensionUrlPattern,
@@ -39,8 +38,7 @@ import { EditExistingQuerySetup } from './EditExistingQuerySetup.js';
 import { CreateMappingQuerySetup } from './CreateMappingQuerySetup.js';
 import { useEffect } from 'react';
 import { flowResult } from 'mobx';
-import { DATA_SPACE_QUERY_ROUTE_PATTERN } from '../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
-import { DataSpaceQuerySetup } from './data-space/DataSpaceQuerySetup.js';
+import { LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN } from '../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { DataSpaceTemplateQueryCreator } from './data-space/DataSpaceTemplateQueryCreator.js';
 import { DataSpaceQueryCreator } from './data-space/DataSpaceQueryCreator.js';
 
@@ -57,17 +55,16 @@ const LegendQueryWebApplicationRouter = observer(() => {
       applicationStore.alertUnhandledError,
     );
   }, [applicationStore, baseStore]);
-
   return (
     <div className="app">
       {baseStore.initState.hasCompleted && (
         <Switch>
           <Route
             exact={true}
-            path={LEGEND_QUERY_ROUTE_PATTERN.SETUP}
+            path={LEGEND_QUERY_ROUTE_PATTERN.DEFAULT}
             component={
               // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-              QuerySetupLandingPage as TEMPORARY__ReactRouterComponentType
+              DataSpaceQueryCreator as TEMPORARY__ReactRouterComponentType
             }
           />
           <Route
@@ -78,6 +75,29 @@ const LegendQueryWebApplicationRouter = observer(() => {
               EditExistingQuerySetup as TEMPORARY__ReactRouterComponentType
             }
           />
+
+          <Route
+            exact={true}
+            path={[
+              generateExtensionUrlPattern(
+                LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN.TEMPLATE_QUERY,
+              ),
+            ]}
+            component={
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+              DataSpaceTemplateQueryCreator as TEMPORARY__ReactRouterComponentType
+            }
+          />
+
+          <Route
+            exact={true}
+            path={LEGEND_QUERY_ROUTE_PATTERN.SETUP}
+            component={
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+              QuerySetupLandingPage as TEMPORARY__ReactRouterComponentType
+            }
+          />
+
           <Route
             exact={true}
             path={LEGEND_QUERY_ROUTE_PATTERN.CREATE_MAPPING_QUERY_SETUP}
@@ -110,28 +130,17 @@ const LegendQueryWebApplicationRouter = observer(() => {
               MappingQueryCreator as TEMPORARY__ReactRouterComponentType
             }
           />
-          {/* DATA SPACE */}
-          <Route
-            exact={true}
-            path={[
-              generateExtensionUrlPattern(DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP),
-            ]}
-            component={
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-              DataSpaceQuerySetup as TEMPORARY__ReactRouterComponentType
-            }
-          />
-
+          {/* LEGACY DATA SPACE */}
           <Route
             exact={true}
             path={[
               generateExtensionUrlPattern(
-                DATA_SPACE_QUERY_ROUTE_PATTERN.TEMPLATE_QUERY,
+                LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP,
               ),
             ]}
             component={
               // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-              DataSpaceTemplateQueryCreator as TEMPORARY__ReactRouterComponentType
+              DataSpaceQueryCreator as TEMPORARY__ReactRouterComponentType
             }
           />
 
@@ -139,7 +148,7 @@ const LegendQueryWebApplicationRouter = observer(() => {
             exact={true}
             path={[
               generateExtensionUrlPattern(
-                DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE,
+                LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE,
               ),
             ]}
             component={
@@ -159,12 +168,6 @@ const LegendQueryWebApplicationRouter = observer(() => {
               }
             />
           ))}
-          {/* Redirect to data space view */}
-          <Redirect
-            to={generateExtensionUrlPattern(
-              DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP,
-            )}
-          />
         </Switch>
       )}
     </div>

package/src/components/QueryEditor.tsx

@@ -721,7 +721,8 @@ export const QueryEditor = observer(() => {
           title="Load query"
         />
       )}
-      {editorStore.queryCreatorState.showCreateModal && <CreateQueryDialog />}
+      {editorStore.canPersistToSavedQuery &&
+        editorStore.queryCreatorState.showCreateModal && <CreateQueryDialog />}
       {editorStore.showAppInfo && (
         <LegendQueryInfo
           open={editorStore.showAppInfo}

package/src/components/data-space/DataSpaceQueryCreator.tsx

@@ -16,13 +16,16 @@
 
 import { observer, useLocalObservable } from 'mobx-react-lite';
 import { useApplicationStore } from '@finos/legend-application';
-import { useParams } from '@finos/legend-application/browser';
+import { generatePath, useParams } from '@finos/legend-application/browser';
 import { parseGAVCoordinates } from '@finos/legend-storage';
 import {
   useLegendQueryApplicationStore,
   useLegendQueryBaseStore,
 } from '../LegendQueryFrameworkProvider.js';
-import { DataSpaceQueryCreatorStore } from '../../stores/data-space/DataSpaceQueryCreatorStore.js';
+import {
+  DataSpaceQueryCreatorStore,
+  type QueryableDataSpace,
+} from '../../stores/data-space/DataSpaceQueryCreatorStore.js';
 import { QueryEditorStoreContext } from '../QueryEditorStoreProvider.js';
 import {
   DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN,
@@ -30,12 +33,14 @@ import {
   type DataSpaceQueryCreatorPathParams,
 } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { QueryEditor } from '../QueryEditor.js';
+import { LEGEND_QUERY_ROUTE_PATTERN } from '../../__lib__/LegendQueryNavigation.js';
+import { useEffect } from 'react';
 
 const DataSpaceQueryCreatorStoreProvider: React.FC<{
   children: React.ReactNode;
-  gav: string;
-  dataSpacePath: string;
-  executionContext: string;
+  gav: string | undefined;
+  dataSpacePath: string | undefined;
+  executionContext: string | undefined;
   runtimePath: string | undefined;
   classPath: string | undefined;
 }> = ({
@@ -46,7 +51,19 @@ const DataSpaceQueryCreatorStoreProvider: React.FC<{
   runtimePath,
   classPath,
 }) => {
-  const { groupId, artifactId, versionId } = parseGAVCoordinates(gav);
+  let queryableDataSpace: QueryableDataSpace | undefined = undefined;
+  if (gav && dataSpacePath && executionContext) {
+    const { groupId, artifactId, versionId } = parseGAVCoordinates(gav);
+    queryableDataSpace = {
+      groupId,
+      artifactId,
+      versionId,
+      dataSpacePath,
+      executionContext,
+      runtimePath,
+      classPath,
+    };
+  }
   const applicationStore = useLegendQueryApplicationStore();
   const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
@@ -54,15 +71,14 @@ const DataSpaceQueryCreatorStoreProvider: React.FC<{
       new DataSpaceQueryCreatorStore(
         applicationStore,
         baseStore.depotServerClient,
-        groupId,
-        artifactId,
-        versionId,
-        dataSpacePath,
-        executionContext,
-        runtimePath,
-        classPath,
+        queryableDataSpace,
       ),
   );
+  useEffect(() => {
+    applicationStore.navigationService.navigator.updateCurrentLocation(
+      generatePath(LEGEND_QUERY_ROUTE_PATTERN.DEFAULT),
+    );
+  }, [applicationStore]);
   return (
     <QueryEditorStoreContext.Provider value={store}>
       {children}
@@ -72,14 +88,16 @@ const DataSpaceQueryCreatorStoreProvider: React.FC<{
 
 export const DataSpaceQueryCreator = observer(() => {
   const applicationStore = useApplicationStore();
-  const parameters = useParams<DataSpaceQueryCreatorPathParams>();
-  const gav = parameters[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV];
+  const parameters = useParams<DataSpaceQueryCreatorPathParams | undefined>();
+  const gav = parameters?.[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV];
   const dataSpacePath =
-    parameters[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH];
+    parameters?.[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SPACE_PATH];
   const executionContext =
-    parameters[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT];
+    parameters?.[
+      DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.EXECUTION_CONTEXT
+    ];
   const runtimePath =
-    parameters[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.RUNTIME_PATH];
+    parameters?.[DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.RUNTIME_PATH];
   const classPath =
     applicationStore.navigationService.navigator.getCurrentLocationParameterValue(
       DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN.CLASS_PATH,

package/src/components/data-space/DataSpaceQuerySetup.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observer, useLocalObservable } from 'mobx-react-lite';
+import { observer } from 'mobx-react-lite';
 import { useApplicationStore } from '@finos/legend-application';
 import { useEffect, useRef } from 'react';
 import { flowResult } from 'mobx';
@@ -26,16 +26,7 @@ import {
   compareLabelFn,
   type SelectComponent,
 } from '@finos/legend-art';
-import {
-  useLegendQueryApplicationStore,
-  useLegendQueryBaseStore,
-} from '../LegendQueryFrameworkProvider.js';
-import {
-  type DataSpaceQuerySetupState,
-  DataSpaceQuerySetupStore,
-} from '../../stores/data-space/DataSpaceQuerySetupState.js';
-import { QueryEditorStoreContext } from '../QueryEditorStoreProvider.js';
-import { QueryEditor } from '../QueryEditor.js';
+import { type DataSpaceQuerySetupState } from '../../stores/data-space/DataSpaceQuerySetupState.js';
 import {
   DataSpaceAdvancedSearchModal,
   buildDataSpaceOption,
@@ -43,31 +34,6 @@ import {
   type DataSpaceOption,
 } from '@finos/legend-extension-dsl-data-space/application-query';
 
-const DataSpaceQuerySetupStoreProvider: React.FC<{
-  children: React.ReactNode;
-}> = ({ children }) => {
-  const applicationStore = useLegendQueryApplicationStore();
-  const baseStore = useLegendQueryBaseStore();
-  const store = useLocalObservable(
-    () =>
-      new DataSpaceQuerySetupStore(
-        applicationStore,
-        baseStore.depotServerClient,
-      ),
-  );
-  return (
-    <QueryEditorStoreContext.Provider value={store}>
-      {children}
-    </QueryEditorStoreContext.Provider>
-  );
-};
-
-export const DataSpaceQuerySetup = observer(() => (
-  <DataSpaceQuerySetupStoreProvider>
-    <QueryEditor />
-  </DataSpaceQuerySetupStoreProvider>
-));
-
 /**
  * This setup panel supports cascading in order: Data-space -> Execution context (-> Runtime) -> Class
  *

package/src/index.ts

@@ -37,12 +37,14 @@ export * from './stores/LegendQueryApplicationPlugin.js';
 export { BaseQuerySetupStore } from './stores/QuerySetupStore.js';
 export {
   type QueryPersistConfiguration,
-  createViewProjectHandler,
-  createViewSDLCProjectHandler,
   QueryEditorStore,
   ExistingQueryEditorStore,
   QueryBuilderActionConfig_QueryApplication,
 } from './stores/QueryEditorStore.js';
+export {
+  createViewProjectHandler,
+  createViewSDLCProjectHandler,
+} from './stores/data-space/DataSpaceQueryBuilderHelper.js';
 // components
 export {
   QueryEditorStoreContext,