@finos/legend-extension-dsl-data-space 1.0.4 → 1.0.9

package/src/stores/query/DataSpaceQuerySetupState.ts

@@ -15,24 +15,24 @@
  */
 
 import type { ClassView } from '@finos/legend-extension-dsl-diagram';
-import type { Class } from '@finos/legend-graph';
-import { QueryTaggedValue } from '@finos/legend-graph';
+import { type Class, QueryTaggedValue } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-model-storage';
-import type { QuerySetupStore } from '@finos/legend-query';
 import {
+  type QuerySetupStore,
   CreateQueryInfoState,
   QuerySetupState,
   generateCreateQueryRoute,
 } from '@finos/legend-query';
-import type { StoredEntity } from '@finos/legend-server-depot';
 import {
+  type StoredEntity,
   generateGAVCoordinates,
   DepotScope,
   ProjectData,
   SNAPSHOT_VERSION_ALIAS,
 } from '@finos/legend-server-depot';
-import type { GeneratorFn, PlainObject } from '@finos/legend-shared';
 import {
+  type GeneratorFn,
+  type PlainObject,
   ActionState,
   assertErrorThrown,
   guaranteeNonNullable,
@@ -81,6 +81,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
   dataSpaces: LightDataSpace[] = [];
   loadDataSpacesState = ActionState.create();
   setUpDataSpaceState = ActionState.create();
+  setUpDataSpaceStatusText?: string | undefined;
   currentDataSpace?: LightDataSpace | undefined;
   dataSpaceViewerState?: DataSpaceViewerState | undefined;
   toGetSnapShot = false;
@@ -92,6 +93,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
       dataSpaces: observable,
       currentDataSpace: observable.ref,
       dataSpaceViewerState: observable,
+      setUpDataSpaceStatusText: observable,
       toGetSnapShot: observable,
       setCurrentDataSpace: action,
       setDataSpaceViewerState: action,
@@ -177,6 +179,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
     }
     this.setUpDataSpaceState.inProgress();
     try {
+      this.setUpDataSpaceStatusText = `Fetching information for data space...`;
       const projectData = ProjectData.serialization.fromJson(
         (yield flowResult(
           this.queryStore.depotServerClient.getProject(
@@ -185,6 +188,8 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
           ),
         )) as PlainObject<ProjectData>,
       );
+
+      this.setUpDataSpaceStatusText = `Building graph...`;
       yield flowResult(
         this.queryStore.buildGraph(projectData, dataSpace.content.versionId),
       );
@@ -221,6 +226,8 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
       assertErrorThrown(error);
       this.setUpDataSpaceState.fail();
       this.queryStore.applicationStore.notifyError(error);
+    } finally {
+      this.setUpDataSpaceStatusText = undefined;
     }
   }
 
@@ -249,7 +256,6 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
           this.dataSpaceViewerState.dataSpaceVersionId,
         ),
       ];
-      queryInfoState.class = _class;
       this.queryStore.setQueryInfoState(queryInfoState);
       this.queryStore.applicationStore.navigator.goTo(
         generateCreateQueryRoute(
@@ -258,6 +264,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
           this.dataSpaceViewerState.dataSpace.versionId,
           this.dataSpaceViewerState.currentExecutionContext.mapping.value.path,
           this.dataSpaceViewerState.currentRuntime.path,
+          _class?.path,
         ),
       );
       this.setupStore.setSetupState(undefined);