@finos/legend-application-studio 22.2.1 → 22.3.0

package/src/stores/EditorGraphState.ts

@@ -93,6 +93,7 @@ import {
   type CompilationWarning,
   type TextCompilationResult,
   type CompilationResult,
+  type PureModel,
 } from '@finos/legend-graph';
 import {
   ActionAlertActionType,
@@ -152,6 +153,7 @@ export class EditorGraphState {
       | 'updateGraphAndApplicationInTextMode'
       | 'mostRecentFormModeCompilationGraphHash'
       | 'mostRecentTextModeCompilationGraphHash'
+      | 'buildDependencies'
     >(this, {
       isInitializingGraph: observable,
       isRunningGlobalCompile: observable,
@@ -177,6 +179,7 @@ export class EditorGraphState {
       updateGraphAndApplicationInFormMode: flow,
       updateGraphAndApplicationInTextMode: flow,
       updateGenerationGraphAndApplication: flow,
+      buildDependencies: flow,
     });
 
     this.editorStore = editorStore;
@@ -898,12 +901,52 @@ export class EditorGraphState {
   }
 
   /**
-   * It creates a new explorer tree state when we compile in text mode. It resets the explorer state properly
+   * NOTE: this can post memory-leak issue if we start having immutable elements referencing current graph elements:
+   * e.g. subclass analytics on the immutable class, etc.
+   *
+   * @risk memory-leak
+   */
+  private *buildDependencies(newGraph: PureModel): GeneratorFn<void> {
+    if (
+      this.editorStore.graphManagerState.dependenciesBuildState.hasSucceeded
+    ) {
+      newGraph.dependencyManager =
+        this.editorStore.graphManagerState.graph.dependencyManager;
+    } else {
+      this.editorStore.projectConfigurationEditorState.setProjectConfiguration(
+        ProjectConfiguration.serialization.fromJson(
+          (yield this.editorStore.sdlcServerClient.getConfiguration(
+            this.editorStore.sdlcState.activeProject.projectId,
+            this.editorStore.sdlcState.activeWorkspace,
+          )) as PlainObject<ProjectConfiguration>,
+        ),
+      );
+      const dependencyManager =
+        this.editorStore.graphManagerState.createEmptyDependencyManager();
+      newGraph.dependencyManager = dependencyManager;
+      const dependenciesBuildState = ActionState.create();
+      yield this.editorStore.graphManagerState.graphManager.buildDependencies(
+        this.editorStore.graphManagerState.coreModel,
+        this.editorStore.graphManagerState.systemModel,
+        dependencyManager,
+        (yield flowResult(this.getIndexedDependencyEntities())) as Map<
+          string,
+          Entity[]
+        >,
+        dependenciesBuildState,
+      );
+      this.editorStore.graphManagerState.dependenciesBuildState =
+        dependenciesBuildState;
+    }
+  }
+
+  /**
+   * Creates a new explorer tree state when compiling in text mode. It resets the explorer state properly
    * after the new graph is built. It tries to maintain the explorer state similar to what it was before compilation.
    * To achieve that we store node ids of the opened nodes before creating a new explorer state. After creating a
    * new state we open the nodes which were opened before so that user see the same explorer state as before.
    */
-  updateExplorerTree(): void {
+  reprocessExplorerTreeInTextMode(): void {
     const mainTreeOpenedNodeIds = this.editorStore.explorerTreeState.treeData
       ? Array.from(this.editorStore.explorerTreeState.treeData.nodes.values())
           .filter((node) => node.isOpen)
@@ -981,43 +1024,7 @@ export class EditorGraphState {
     this.isUpdatingGraph = true;
     try {
       const newGraph = this.editorStore.graphManagerState.createEmptyGraph();
-      /**
-       * NOTE: this can post memory-leak issue if we start having immutable elements referencing current graph elements:
-       * e.g. subclass analytics on the immutable class, etc.
-       *
-       * @risk memory-leak
-       */
-      if (
-        this.editorStore.graphManagerState.dependenciesBuildState.hasSucceeded
-      ) {
-        newGraph.dependencyManager =
-          this.editorStore.graphManagerState.graph.dependencyManager;
-      } else {
-        this.editorStore.projectConfigurationEditorState.setProjectConfiguration(
-          ProjectConfiguration.serialization.fromJson(
-            (yield this.editorStore.sdlcServerClient.getConfiguration(
-              this.editorStore.sdlcState.activeProject.projectId,
-              this.editorStore.sdlcState.activeWorkspace,
-            )) as PlainObject<ProjectConfiguration>,
-          ),
-        );
-        const dependencyManager =
-          this.editorStore.graphManagerState.createEmptyDependencyManager();
-        newGraph.dependencyManager = dependencyManager;
-        const dependenciesBuildState = ActionState.create();
-        yield this.editorStore.graphManagerState.graphManager.buildDependencies(
-          this.editorStore.graphManagerState.coreModel,
-          this.editorStore.graphManagerState.systemModel,
-          dependencyManager,
-          (yield flowResult(this.getIndexedDependencyEntities())) as Map<
-            string,
-            Entity[]
-          >,
-          dependenciesBuildState,
-        );
-        this.editorStore.graphManagerState.dependenciesBuildState =
-          dependenciesBuildState;
-      }
+      yield flowResult(this.buildDependencies(newGraph));
 
       /**
        * Backup and editor states info before resetting. Here we store the element paths of the
@@ -1091,7 +1098,7 @@ export class EditorGraphState {
       this.editorStore.graphManagerState.generationsBuildState =
         generationsBuildState;
 
-      this.updateExplorerTree();
+      this.editorStore.explorerTreeState.reprocess();
 
       /**
        * Re-build the editor states which were opened before from the information we have stored before
@@ -1101,7 +1108,6 @@ export class EditorGraphState {
         openedTabPaths,
         currentTabState,
         currentTabElementPath,
-        true,
       );
 
       this.editorStore.applicationStore.log.info(
@@ -1133,7 +1139,7 @@ export class EditorGraphState {
       this.isUpdatingGraph = false;
       // Note: in the future this function will probably be ideal to refactor when we have different classes for each mode
       // as we would handle this error differently in `text` mode and `form` mode.
-      if (error instanceof GraphBuilderError && this.editorStore.isInFormMode) {
+      if (error instanceof GraphBuilderError) {
         this.editorStore.applicationStore.setBlockingAlert({
           message: `Can't build graph: ${error.message}`,
           prompt: 'Refreshing full application...',
@@ -1142,10 +1148,6 @@ export class EditorGraphState {
         this.editorStore.tabManagerState.closeAllTabs();
         this.editorStore.cleanUp();
         yield flowResult(this.editorStore.buildGraph(entities));
-      } else {
-        this.editorStore.applicationStore.notifyError(
-          `Can't build graph: ${error.message}`,
-        );
       }
     } finally {
       this.isUpdatingApplication = false;
@@ -1161,79 +1163,7 @@ export class EditorGraphState {
     this.isUpdatingGraph = true;
     try {
       const newGraph = this.editorStore.graphManagerState.createEmptyGraph();
-      /**
-       * NOTE: this can post memory-leak issue if we start having immutable elements referencing current graph elements:
-       * e.g. subclass analytics on the immutable class, etc.
-       *
-       * @risk memory-leak
-       */
-      if (
-        this.editorStore.graphManagerState.dependenciesBuildState.hasSucceeded
-      ) {
-        newGraph.dependencyManager =
-          this.editorStore.graphManagerState.graph.dependencyManager;
-      } else {
-        this.editorStore.projectConfigurationEditorState.setProjectConfiguration(
-          ProjectConfiguration.serialization.fromJson(
-            (yield this.editorStore.sdlcServerClient.getConfiguration(
-              this.editorStore.sdlcState.activeProject.projectId,
-              this.editorStore.sdlcState.activeWorkspace,
-            )) as PlainObject<ProjectConfiguration>,
-          ),
-        );
-        const dependencyManager =
-          this.editorStore.graphManagerState.createEmptyDependencyManager();
-        newGraph.dependencyManager = dependencyManager;
-        const dependenciesBuildState = ActionState.create();
-        yield this.editorStore.graphManagerState.graphManager.buildDependencies(
-          this.editorStore.graphManagerState.coreModel,
-          this.editorStore.graphManagerState.systemModel,
-          dependencyManager,
-          (yield flowResult(this.getIndexedDependencyEntities())) as Map<
-            string,
-            Entity[]
-          >,
-          dependenciesBuildState,
-        );
-        this.editorStore.graphManagerState.dependenciesBuildState =
-          dependenciesBuildState;
-      }
-
-      /**
-       * Backup and editor states info before resetting. Here we store the element paths of the
-       * elements editors as element paths don't refer to the actual graph. We can find the element
-       * from the new graph that is built by using element path and can reprocess the element editor states.
-       * The other kind of editors we reprocess are file generation editors, we store them as is as they don't
-       * hold any reference to the actual graph.
-       */
-      const openedTabPaths: string[] = [];
-      this.editorStore.tabManagerState.tabs.forEach((state: TabState) => {
-        if (state instanceof ElementEditorState) {
-          openedTabPaths.push(state.elementPath);
-        }
-      });
-      // Only stores editor state for file generation editors as they don't hold any references to the
-      // actual graph.
-      const currentTabState =
-        this.editorStore.tabManagerState.currentTab instanceof
-        ElementEditorState
-          ? undefined
-          : this.editorStore.tabManagerState.currentTab;
-      const currentTabElementPath =
-        this.editorStore.tabManagerState.currentTab instanceof
-        ElementEditorState
-          ? this.editorStore.tabManagerState.currentTab.elementPath
-          : undefined;
-      /**
-       * We remove the current editor state so that we no longer let React displays the element that belongs to the old graph
-       * NOTE: this causes an UI flash, but this is in many way, acceptable since the user probably should know that we are
-       * refreshing the memory graph anyway.
-       *
-       * If this is really bothering, we can handle it by building mocked replica of the current editor state using stub element
-       * e.g. if the current editor is a class, we stub the class, create a new class editor state around it and copy over
-       * navigation information, etc.
-       */
-      this.editorStore.tabManagerState.closeAllTabs();
+      yield flowResult(this.buildDependencies(newGraph));
       yield flowResult(graph_dispose(this.editorStore.graphManagerState.graph));
 
       const graphBuildState = ActionState.create();
@@ -1249,37 +1179,7 @@ export class EditorGraphState {
         },
       );
 
-      // Activity States
-      this.editorStore.globalTestRunnerState = new GlobalTestRunnerState(
-        this.editorStore,
-        this.editorStore.sdlcState,
-      );
-
-      // NOTE: build model generation entities every-time we rebuild the graph - should we do this?
-      const generationsBuildState = ActionState.create();
-      yield this.editorStore.graphManagerState.graphManager.buildGenerations(
-        newGraph,
-        this.graphGenerationState.generatedEntities,
-        generationsBuildState,
-      );
-
-      this.editorStore.graphManagerState.graph = newGraph;
-      this.editorStore.graphManagerState.graphBuildState = graphBuildState;
-      this.editorStore.graphManagerState.generationsBuildState =
-        generationsBuildState;
-
-      this.updateExplorerTree();
-
-      /**
-       * Re-build the editor states which were opened before from the information we have stored before
-       * creating the new graph
-       */
-      this.editorStore.tabManagerState.recoverTabs(
-        openedTabPaths,
-        currentTabState,
-        currentTabElementPath,
-        false,
-      );
+      this.reprocessExplorerTreeInTextMode();
 
       this.editorStore.applicationStore.log.info(
         LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_UPDATED_AND_REBUILT),
@@ -1295,9 +1195,11 @@ export class EditorGraphState {
         error,
       );
       this.isUpdatingGraph = false;
-      this.editorStore.applicationStore.notifyError(
-        `Can't build graph: ${error.message}`,
-      );
+      if (error instanceof GraphBuilderError) {
+        this.editorStore.applicationStore.notifyError(
+          `Can't build graph: ${error.message}`,
+        );
+      }
     } finally {
       this.isUpdatingApplication = false;
       this.editorStore.applicationStore.setBlockingAlert(undefined);
@@ -1348,12 +1250,11 @@ export class EditorGraphState {
         this.graphGenerationState.generatedEntities,
         this.editorStore.graphManagerState.generationsBuildState,
       );
-      this.updateExplorerTree();
+      this.editorStore.explorerTreeState.reprocess();
       this.editorStore.tabManagerState.recoverTabs(
         openedTabEditorPaths,
         currentTabState,
         currentTabElementPath,
-        true,
       );
     } catch (error) {
       assertErrorThrown(error);

package/src/stores/EditorStore.ts

@@ -347,11 +347,21 @@ export class EditorStore implements CommandRegistrar {
     if (graphEditor === GRAPH_EDITOR_MODE.GRAMMAR_TEXT) {
       // Stop change detection as we don't need the actual change detection in text mode
       this.changeDetectionState.stop();
-      this.changeDetectionState.computeLocalChangesInTextMode(
-        (yield this.graphManagerState.graphManager.pureCodeToEntities(
-          this.grammarTextEditorState.graphGrammarText,
-        )) as Entity[],
-      );
+      try {
+        yield flowResult(
+          this.changeDetectionState.computeLocalChangesInTextMode(
+            (yield this.graphManagerState.graphManager.pureCodeToEntities(
+              this.grammarTextEditorState.graphGrammarText,
+            )) as Entity[],
+          ),
+        );
+      } catch (error) {
+        assertErrorThrown(error);
+        this.applicationStore.log.warn(
+          LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
+          error,
+        );
+      }
     }
   }
 

package/src/stores/EditorTabManagerState.ts

@@ -95,27 +95,24 @@ export class EditorTabManagerState extends TabManagerState {
     openedTabEditorPaths: string[],
     currentTabState: EditorState | undefined,
     currentTabElementPath: string | undefined,
-    shouldRecoverTabs: boolean,
   ): void => {
-    if (shouldRecoverTabs) {
-      this.tabs = openedTabEditorPaths
-        .map((editorPath) => {
-          const correspondingElement =
-            this.editorStore.graphManagerState.graph.getNullableElement(
-              editorPath,
-            );
-          if (correspondingElement) {
-            return this.editorStore.createElementEditorState(
-              correspondingElement,
-            );
-          }
-          return undefined;
-        })
-        .filter(isNonNullable);
-      this.setCurrentTab(
-        this.findCurrentTab(currentTabState, currentTabElementPath),
-      );
-    }
+    this.tabs = openedTabEditorPaths
+      .map((editorPath) => {
+        const correspondingElement =
+          this.editorStore.graphManagerState.graph.getNullableElement(
+            editorPath,
+          );
+        if (correspondingElement) {
+          return this.editorStore.createElementEditorState(
+            correspondingElement,
+          );
+        }
+        return undefined;
+      })
+      .filter(isNonNullable);
+    this.setCurrentTab(
+      this.findCurrentTab(currentTabState, currentTabElementPath),
+    );
   };
 
   findCurrentTab = (

package/src/stores/ExplorerTreeState.ts

@@ -25,6 +25,7 @@ import {
   ActionState,
 } from '@finos/legend-shared';
 import {
+  getDependenciesPackableElementTreeData,
   getPackableElementTreeData,
   openNode,
   openNodeById,
@@ -35,9 +36,9 @@ import { LEGEND_STUDIO_APP_EVENT } from './LegendStudioAppEvent.js';
 import type { PackageTreeNodeData } from './shared/TreeUtils.js';
 import type { TreeData } from '@finos/legend-art';
 import {
-  type GenerationTreeNodeData,
-  getGenerationTreeData,
-} from './shared/FileGenerationTreeUtils.js';
+  type FileSystemTreeNodeData,
+  getFileSystemTreeData,
+} from './shared/FileSystemTreeUtils.js';
 import {
   type PackageableElement,
   ROOT_PACKAGE_NAME,
@@ -45,6 +46,7 @@ import {
   Unit,
   PrimitiveType,
   getElementRootPackage,
+  isDependencyElement,
 } from '@finos/legend-graph';
 import { APPLICATION_EVENT } from '@finos/legend-application';
 
@@ -63,7 +65,7 @@ export class ExplorerTreeState {
   legalTreeData?: TreeData<PackageTreeNodeData> | undefined;
   dependencyTreeData?: TreeData<PackageTreeNodeData> | undefined;
   selectedNode?: PackageTreeNodeData | undefined;
-  fileGenerationTreeData?: TreeData<GenerationTreeNodeData> | undefined;
+  fileGenerationTreeData?: TreeData<FileSystemTreeNodeData> | undefined;
   elementToRename?: PackageableElement | undefined;
   buildState = ActionState.create();
 
@@ -76,7 +78,6 @@ export class ExplorerTreeState {
       dependencyTreeData: observable.ref,
       selectedNode: observable.ref,
       fileGenerationTreeData: observable.ref,
-      elementToRename: observable,
       setTreeData: action,
       setGenerationTreeData: action,
       setSystemTreeData: action,
@@ -151,7 +152,7 @@ export class ExplorerTreeState {
   setDependencyTreeData(data: TreeData<PackageTreeNodeData>): void {
     this.dependencyTreeData = data;
   }
-  setFileGenerationTreeData(data: TreeData<GenerationTreeNodeData>): void {
+  setFileGenerationTreeData(data: TreeData<FileSystemTreeNodeData>): void {
     this.fileGenerationTreeData = data;
   }
   setElementToRename(val: PackageableElement | undefined): void {
@@ -180,7 +181,7 @@ export class ExplorerTreeState {
       this.editorStore.graphManagerState.graph.generationModel.root,
       ExplorerTreeRootPackageLabel.MODEL_GENERATION,
     );
-    this.fileGenerationTreeData = getGenerationTreeData(
+    this.fileGenerationTreeData = getFileSystemTreeData(
       this.editorStore.graphState.graphGenerationState.rootFileDirectory,
       ExplorerTreeRootPackageLabel.FILE_GENERATION,
     );
@@ -198,9 +199,9 @@ export class ExplorerTreeState {
       );
     }
     if (!this.dependencyTreeData) {
-      this.dependencyTreeData = getPackableElementTreeData(
+      this.dependencyTreeData = getDependenciesPackableElementTreeData(
         this.editorStore,
-        this.editorStore.graphManagerState.graph.dependencyManager.root,
+        this.editorStore.graphManagerState.graph.dependencyManager.roots,
         ExplorerTreeRootPackageLabel.PROJECT_DEPENDENCY,
       );
     }
@@ -214,7 +215,7 @@ export class ExplorerTreeState {
       this.editorStore.graphManagerState.graph.generationModel.root,
       ExplorerTreeRootPackageLabel.MODEL_GENERATION,
     );
-    this.fileGenerationTreeData = getGenerationTreeData(
+    this.fileGenerationTreeData = getFileSystemTreeData(
       this.editorStore.graphState.graphGenerationState.rootFileDirectory,
       ExplorerTreeRootPackageLabel.FILE_GENERATION,
     );
@@ -228,9 +229,9 @@ export class ExplorerTreeState {
       this.editorStore.graphManagerState.systemModel.root,
       ExplorerTreeRootPackageLabel.SYSTEM,
     );
-    this.dependencyTreeData = getPackableElementTreeData(
+    this.dependencyTreeData = getDependenciesPackableElementTreeData(
       this.editorStore,
-      this.editorStore.graphManagerState.graph.dependencyManager.root,
+      this.editorStore.graphManagerState.graph.dependencyManager.roots,
       ExplorerTreeRootPackageLabel.PROJECT_DEPENDENCY,
     );
   }
@@ -332,9 +333,9 @@ export class ExplorerTreeState {
       );
     }
     if (!this.dependencyTreeData) {
-      this.dependencyTreeData = getPackableElementTreeData(
+      this.dependencyTreeData = getDependenciesPackableElementTreeData(
         this.editorStore,
-        this.editorStore.graphManagerState.graph.dependencyManager.root,
+        this.editorStore.graphManagerState.graph.dependencyManager.roots,
         ExplorerTreeRootPackageLabel.PROJECT_DEPENDENCY,
       );
     }
@@ -404,7 +405,7 @@ export class ExplorerTreeState {
     }
     // File generation tree
     // TODO: fix this so it does proper reprocessing, right now it just rebuilds
-    this.fileGenerationTreeData = getGenerationTreeData(
+    this.fileGenerationTreeData = getFileSystemTreeData(
       this.editorStore.graphState.graphGenerationState.rootFileDirectory,
       ExplorerTreeRootPackageLabel.FILE_GENERATION,
     );
@@ -445,7 +446,12 @@ export class ExplorerTreeState {
     if (node.childrenIds?.length) {
       node.isOpen = !node.isOpen;
       if (node.packageableElement instanceof Package) {
-        populatePackageTreeNodeChildren(this.editorStore, node, treeData);
+        populatePackageTreeNodeChildren(
+          this.editorStore,
+          node,
+          treeData,
+          rootPackageName === ROOT_PACKAGE_NAME.PROJECT_DEPENDENCY_ROOT,
+        );
       }
     }
     this.setSelectedNode(node);
@@ -503,13 +509,15 @@ export class ExplorerTreeState {
       this.setSelectedNode(openingNode);
       opened = true;
     } else if (
-      rootPackageName === ROOT_PACKAGE_NAME.PROJECT_DEPENDENCY_ROOT &&
+      isDependencyElement(element, this.editorStore.graphManagerState.graph) &&
       this.dependencyTreeData
     ) {
       const openingNode = openNode(
         this.editorStore,
         element,
         this.dependencyTreeData,
+        undefined,
+        true,
       );
       this.setSelectedNode(openingNode);
       opened = true;
@@ -522,7 +530,7 @@ export class ExplorerTreeState {
     }
   }
 
-  getFileGenerationTreeData(): TreeData<GenerationTreeNodeData> {
+  getFileGenerationTreeData(): TreeData<FileSystemTreeNodeData> {
     return guaranteeNonNullable(
       this.fileGenerationTreeData,
       'File generation tree data has not been initialized',

package/src/stores/editor/NewElementState.ts

@@ -406,8 +406,6 @@ export class NewPackageableConnectionDriver extends NewElementDriver<Packageable
       return new NewPureModelConnectionDriver(this.editorStore);
     } else if (store instanceof FlatData) {
       return new NewFlatDataConnectionDriver(this.editorStore);
-    } else if (store instanceof Database) {
-      return new NewRelationalDatabaseConnectionDriver(this.editorStore);
     }
     const extraNewConnectionDriverCreators = this.editorStore.pluginManager
       .getApplicationPlugins()

package/src/stores/editor-state/ExternalFormatState.ts

@@ -24,6 +24,7 @@ import {
 import { flow, action, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../EditorStore.js';
 import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
+import { ElementXTSchemaGenerationState } from './element-editor-state/ElementExternalFormatGenerationState.js';
 
 export type ExternalFormatTypeOption = {
   value: string;
@@ -41,10 +42,12 @@ export class ExternalFormatState {
   fetchingDescriptionsState = ActionState.create();
   editorStore: EditorStore;
   externalFormatsDescriptions: ExternalFormatDescription[] = [];
+  schemaGenerationStates: ElementXTSchemaGenerationState[] = [];
 
   constructor(editorStore: EditorStore) {
     makeObservable<ExternalFormatState>(this, {
       externalFormatsDescriptions: observable,
+      schemaGenerationStates: observable,
       setExternalFormatsDescriptions: action,
       fetchExternalFormatsDescriptions: flow,
     });
@@ -92,6 +95,12 @@ export class ExternalFormatState {
       const externalFormatDescriptions =
         (yield this.editorStore.graphManagerState.graphManager.getAvailableExternalFormatsDescriptions()) as ExternalFormatDescription[];
       this.setExternalFormatsDescriptions(externalFormatDescriptions);
+      this.schemaGenerationStates = externalFormatDescriptions
+        .filter((s) => s.supportsSchemaGeneration)
+        .map(
+          (descr) =>
+            new ElementXTSchemaGenerationState(this.editorStore, descr),
+        );
       this.fetchingDescriptionsState.complete();
     } catch (error) {
       assertErrorThrown(error);