@finos/legend-application-query 13.4.21 → 13.5.0

package/src/stores/data-space/DataSpaceQuerySetupState.ts

@@ -16,24 +16,20 @@
 
 import {
   DepotScope,
-  LATEST_VERSION_ALIAS,
   type DepotServerClient,
   type StoredEntity,
 } from '@finos/legend-server-depot';
-import type { GraphManagerState, RawLambda } from '@finos/legend-graph';
+import type { GraphManagerState } from '@finos/legend-graph';
 import { type GenericLegendApplicationStore } from '@finos/legend-application';
-import { action, flow, flowResult, makeObservable, observable } from 'mobx';
+import { action, flow, makeObservable, observable } from 'mobx';
 import {
   type QueryBuilderConfig,
   QueryBuilderState,
   QueryBuilderDataBrowserWorkflow,
 } from '@finos/legend-query-builder';
-import type { Entity, ProjectGAVCoordinates } from '@finos/legend-storage';
 import {
   ActionState,
   assertErrorThrown,
-  guaranteeNonNullable,
-  UnsupportedOperationError,
   type GeneratorFn,
 } from '@finos/legend-shared';
 import {
@@ -43,21 +39,11 @@ import {
 import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '@finos/legend-extension-dsl-data-space/graph';
 import {
   QueryBuilderActionConfig_QueryApplication,
-  QueryEditorStore,
-  createViewProjectHandler,
-  createViewSDLCProjectHandler,
-  type QueryPersistConfiguration,
+  type QueryEditorStore,
 } from '../QueryEditorStore.js';
-import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { renderDataSpaceQuerySetupSetupPanelContent } from '../../components/data-space/DataSpaceQuerySetup.js';
 import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
-import type { VisitedDataspace } from '../../__lib__/LegendQueryUserDataSpaceHelper.js';
-import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
 
-type DataSpaceVisitedEntity = {
-  visited: VisitedDataspace;
-  entity: Entity;
-};
 export class DataSpaceQuerySetupState extends QueryBuilderState {
   editorStore: QueryEditorStore;
   readonly depotServerClient: DepotServerClient;
@@ -111,11 +97,10 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
     makeObservable(this, {
       dataSpaces: observable,
       advancedSearchState: observable,
+      configureDataSpaceOptions: action,
       showAdvancedSearchPanel: action,
       hideAdvancedSearchPanel: action,
       initializeDataSpaceSetup: flow,
-      redirectIfPossible: flow,
-      hyrdateVisitedDataSpace: flow,
     });
 
     this.editorStore = editorStore;
@@ -136,6 +121,10 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
     return 'query-builder__setup__data-space-setup';
   }
 
+  configureDataSpaceOptions(val: DataSpaceInfo[]): void {
+    this.dataSpaces = val;
+  }
+
   showAdvancedSearchPanel(): void {
     this.advancedSearchState = new DataSpaceAdvancedSearchState(
       this.applicationStore,
@@ -155,26 +144,6 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
   *initializeDataSpaceSetup(): GeneratorFn<void> {
     this.loadDataSpacesState.inProgress();
     try {
-      const hydrated = (yield flowResult(this.redirectIfPossible())) as
-        | DataSpaceVisitedEntity
-        | undefined;
-      if (hydrated) {
-        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 ??
-              (hydrated.entity.content.defaultExecutionContext as string),
-            undefined,
-            undefined,
-          ),
-        );
-        this.loadDataSpacesState.complete();
-        return;
-      }
-
       this.dataSpaces = (
         (yield this.depotServerClient.getEntitiesByClassifier(
           DATA_SPACE_ELEMENT_CLASSIFIER_PATH,
@@ -190,121 +159,4 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
       this.applicationStore.notificationService.notifyError(error);
     }
   }
-
-  *redirectIfPossible(): GeneratorFn<DataSpaceVisitedEntity | undefined> {
-    const visitedQueries =
-      LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(
-        this.applicationStore.userDataService,
-      );
-    let redirect: DataSpaceVisitedEntity | undefined = undefined;
-    for (let i = 0; i < visitedQueries.length; i++) {
-      const visited = visitedQueries[i];
-      if (visited) {
-        const hydrated = (yield flowResult(
-          this.hyrdateVisitedDataSpace(visited),
-        )) as DataSpaceVisitedEntity | undefined;
-        if (hydrated) {
-          redirect = hydrated;
-          break;
-        }
-      }
-    }
-    return redirect;
-  }
-
-  *hyrdateVisitedDataSpace(
-    visited: VisitedDataspace,
-  ): GeneratorFn<DataSpaceVisitedEntity | undefined> {
-    try {
-      const entity = (yield this.depotServerClient.getVersionEntity(
-        visited.groupId,
-        visited.artifactId,
-        visited.versionId ?? LATEST_VERSION_ALIAS,
-        visited.path,
-      )) as Entity;
-      const content = entity.content as {
-        executionContexts: { name: string }[];
-      };
-      if (visited.execContext) {
-        const found = content.executionContexts.find(
-          (e) => e.name === visited.execContext,
-        );
-        if (!found) {
-          visited.execContext = undefined;
-          return {
-            visited,
-            entity,
-          };
-        }
-      }
-      return {
-        visited,
-        entity,
-      };
-    } catch (error) {
-      assertErrorThrown(error);
-      LegendQueryUserDataHelper.removeRecentlyViewedDataSpace(
-        this.applicationStore.userDataService,
-        visited.id,
-      );
-    }
-    return undefined;
-  }
-}
-
-export class DataSpaceQuerySetupStore extends QueryEditorStore {
-  override get isViewProjectActionDisabled(): boolean {
-    return true;
-  }
-
-  getProjectInfo(): ProjectGAVCoordinates {
-    throw new UnsupportedOperationError();
-  }
-
-  getPersistConfiguration(
-    lambda: RawLambda,
-    options?: { update?: boolean | undefined },
-  ): QueryPersistConfiguration {
-    throw new UnsupportedOperationError();
-  }
-
-  async initializeQueryBuilderState(): Promise<QueryBuilderState> {
-    const queryBuilderState = new DataSpaceQuerySetupState(
-      this,
-      this.applicationStore,
-      this.graphManagerState,
-      this.depotServerClient,
-      (dataSpaceInfo: DataSpaceInfo) => {
-        if (dataSpaceInfo.defaultExecutionContext) {
-          this.applicationStore.navigationService.navigator.goToLocation(
-            generateDataSpaceQueryCreatorRoute(
-              guaranteeNonNullable(dataSpaceInfo.groupId),
-              guaranteeNonNullable(dataSpaceInfo.artifactId),
-              LATEST_VERSION_ALIAS, //always default to latest
-              dataSpaceInfo.path,
-              dataSpaceInfo.defaultExecutionContext,
-              undefined,
-              undefined,
-            ),
-          );
-        } else {
-          this.applicationStore.notificationService.notifyWarning(
-            `Can't switch data space: default execution context not specified`,
-          );
-        }
-      },
-      createViewProjectHandler(this.applicationStore),
-      createViewSDLCProjectHandler(
-        this.applicationStore,
-        this.depotServerClient,
-      ),
-      this.applicationStore.config.options.queryBuilderConfig,
-    );
-
-    return queryBuilderState;
-  }
-
-  override *buildGraph(): GeneratorFn<void> {
-    // do nothing
-  }
 }

package/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts

@@ -32,8 +32,6 @@ import type { ProjectGAVCoordinates } from '@finos/legend-storage';
 import {
   QueryBuilderActionConfig_QueryApplication,
   QueryEditorStore,
-  createViewProjectHandler,
-  createViewSDLCProjectHandler,
   type QueryPersistConfiguration,
 } from '../QueryEditorStore.js';
 import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
@@ -44,11 +42,11 @@ import {
   retrieveAnalyticsResultCache,
 } from '@finos/legend-extension-dsl-data-space/graph';
 import {
-  DataSpaceProjectInfo,
   DataSpaceQueryBuilderState,
   createQueryClassTaggedValue,
   type DataSpaceInfo,
 } from '@finos/legend-extension-dsl-data-space/application';
+import { createDataSpaceDepoRepo } from './DataSpaceQueryBuilderHelper.js';
 
 export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
   readonly groupId: string;
@@ -122,41 +120,35 @@ 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,
+      createDataSpaceDepoRepo(
+        this,
+        this.groupId,
+        this.artifactId,
+        this.versionId,
+        undefined,
+      ),
       (dataSpaceInfo: 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,
     );

package/tsconfig.json

@@ -72,6 +72,7 @@
     "./src/stores/QuerySetupStore.ts",
     "./src/stores/UpdateExistingServiceQuerySetupStore.ts",
     "./src/stores/__test-utils__/LegendQueryApplicationTestUtils.ts",
+    "./src/stores/data-space/DataSpaceQueryBuilderHelper.ts",
     "./src/stores/data-space/DataSpaceQueryCreatorStore.ts",
     "./src/stores/data-space/DataSpaceQuerySetupState.ts",
     "./src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts",