@finos/legend-application-studio 26.1.8 → 26.1.10

package/src/components/editor/side-bar/Explorer.tsx

@@ -977,7 +977,7 @@ const ExplorerTrees = observer(() => {
 
   // Generated Files Tree
   const generationFileTreeData =
-    editorStore.explorerTreeState.getFileGenerationTreeData();
+    editorStore.explorerTreeState.getArtifactsGenerationTreeData();
   const onGenerationFileTreeNodeSelect = (node: FileSystemTreeNodeData): void =>
     editorStore.graphState.graphGenerationState.onTreeNodeSelect(
       node,

package/src/stores/editor/EditorGraphState.ts

@@ -98,6 +98,7 @@ import { LEGEND_STUDIO_APP_EVENT } from '../../__lib__/LegendStudioEvent.js';
 import { LEGEND_STUDIO_SETTING_KEY } from '../../__lib__/LegendStudioSetting.js';
 import type { TabState } from '@finos/legend-lego/application';
 import { LegendStudioTelemetryHelper } from '../../__lib__/LegendStudioTelemetryHelper.js';
+import { ArtifactGenerationViewerState } from './editor-state/ArtifactGenerationViewerState.js';
 
 export enum GraphBuilderStatus {
   SUCCEEDED = 'SUCCEEDED',
@@ -583,15 +584,15 @@ export class EditorGraphState {
           openedTabEditorPaths.push(state.elementPath);
         }
       });
+      const currentTab = this.editorStore.tabManagerState.currentTab;
       const currentTabState =
-        this.editorStore.tabManagerState.currentTab instanceof
-        ElementEditorState
+        currentTab instanceof ElementEditorState ||
+        currentTab instanceof ArtifactGenerationViewerState
           ? undefined
-          : this.editorStore.tabManagerState.currentTab;
+          : currentTab;
       const currentTabElementPath =
-        this.editorStore.tabManagerState.currentTab instanceof
-        ElementEditorState
-          ? this.editorStore.tabManagerState.currentTab.elementPath
+        currentTab instanceof ElementEditorState
+          ? currentTab.elementPath
           : undefined;
       this.editorStore.tabManagerState.closeAllTabs();
 

package/src/stores/editor/EditorStore.ts

@@ -716,7 +716,7 @@ export class EditorStore implements CommandRegistrar {
       this.workspaceReviewState.fetchCurrentWorkspaceReview(),
       this.workspaceUpdaterState.fetchLatestCommittedReviews(),
       this.projectConfigurationEditorState.fetchLatestProjectStructureVersion(),
-      this.graphState.graphGenerationState.fetchAvailableFileGenerationDescriptions(),
+      this.graphState.graphGenerationState.globalFileGenerationState.fetchAvailableFileGenerationDescriptions(),
       this.graphState.graphGenerationState.externalFormatState.fetchExternalFormatDescriptions(),
       this.graphState.fetchAvailableFunctionActivatorConfigurations(),
       this.sdlcState.fetchProjectVersions(),
@@ -757,7 +757,7 @@ export class EditorStore implements CommandRegistrar {
       this.conflictResolutionState.initialize(),
       this.sdlcState.checkIfWorkspaceIsOutdated(),
       this.projectConfigurationEditorState.fetchLatestProjectStructureVersion(),
-      this.graphState.graphGenerationState.fetchAvailableFileGenerationDescriptions(),
+      this.graphState.graphGenerationState.globalFileGenerationState.fetchAvailableFileGenerationDescriptions(),
       this.graphState.graphGenerationState.externalFormatState.fetchExternalFormatDescriptions(),
       this.graphState.fetchAvailableFunctionActivatorConfigurations(),
       this.sdlcState.fetchProjectVersions(),

package/src/stores/editor/ExplorerTreeState.ts

@@ -71,7 +71,7 @@ export class ExplorerTreeState {
   legalTreeData?: TreeData<PackageTreeNodeData> | undefined;
   dependencyTreeData?: TreeData<PackageTreeNodeData> | undefined;
   selectedNode?: PackageTreeNodeData | undefined;
-  fileGenerationTreeData?: TreeData<FileSystemTreeNodeData> | undefined;
+  artifactsGenerationTreeData?: TreeData<FileSystemTreeNodeData> | undefined;
 
   elementToRename?: PackageableElement | undefined;
   classToGenerateSampleData?: Class | undefined;
@@ -84,7 +84,7 @@ export class ExplorerTreeState {
       systemTreeData: observable.ref,
       legalTreeData: observable.ref,
       dependencyTreeData: observable.ref,
-      fileGenerationTreeData: observable.ref,
+      artifactsGenerationTreeData: observable.ref,
       selectedNode: observable.ref,
       elementToRename: observable,
       classToGenerateSampleData: observable,
@@ -94,7 +94,7 @@ export class ExplorerTreeState {
       setSystemTreeData: action,
       setLegalTreeData: action,
       setDependencyTreeData: action,
-      setFileGenerationTreeData: action,
+      setArtifactsGenerationTreeData: action,
       setSelectedNode: action,
       setElementToRename: action,
       setClassToGenerateSampleData: action,
@@ -166,8 +166,8 @@ export class ExplorerTreeState {
   setDependencyTreeData(data: TreeData<PackageTreeNodeData>): void {
     this.dependencyTreeData = data;
   }
-  setFileGenerationTreeData(data: TreeData<FileSystemTreeNodeData>): void {
-    this.fileGenerationTreeData = data;
+  setArtifactsGenerationTreeData(data: TreeData<FileSystemTreeNodeData>): void {
+    this.artifactsGenerationTreeData = data;
   }
   setElementToRename(val: PackageableElement | undefined): void {
     this.elementToRename = val;
@@ -214,7 +214,7 @@ export class ExplorerTreeState {
       this.editorStore.graphManagerState.graph.generationModel.root,
       ExplorerTreeRootPackageLabel.MODEL_GENERATION,
     );
-    this.fileGenerationTreeData = getFileSystemTreeData(
+    this.artifactsGenerationTreeData = getFileSystemTreeData(
       this.editorStore.graphState.graphGenerationState.rootFileDirectory,
       ExplorerTreeRootPackageLabel.FILE_GENERATION,
     );
@@ -248,7 +248,7 @@ export class ExplorerTreeState {
       this.editorStore.graphManagerState.graph.generationModel.root,
       ExplorerTreeRootPackageLabel.MODEL_GENERATION,
     );
-    this.fileGenerationTreeData = getFileSystemTreeData(
+    this.artifactsGenerationTreeData = getFileSystemTreeData(
       this.editorStore.graphState.graphGenerationState.rootFileDirectory,
       ExplorerTreeRootPackageLabel.FILE_GENERATION,
     );
@@ -438,7 +438,7 @@ export class ExplorerTreeState {
     }
     // File generation tree
     // TODO: fix this so it does proper reprocessing, right now it just rebuilds
-    this.fileGenerationTreeData = getFileSystemTreeData(
+    this.artifactsGenerationTreeData = getFileSystemTreeData(
       this.editorStore.graphState.graphGenerationState.rootFileDirectory,
       ExplorerTreeRootPackageLabel.FILE_GENERATION,
     );
@@ -558,9 +558,9 @@ export class ExplorerTreeState {
     }
   }
 
-  getFileGenerationTreeData(): TreeData<FileSystemTreeNodeData> {
+  getArtifactsGenerationTreeData(): TreeData<FileSystemTreeNodeData> {
     return guaranteeNonNullable(
-      this.fileGenerationTreeData,
+      this.artifactsGenerationTreeData,
       'File generation tree data has not been initialized',
     );
   }

package/src/stores/editor/NewElementState.ts

@@ -34,7 +34,7 @@ import {
 import { decorateRuntimeWithNewMapping } from './editor-state/element-editor-state/RuntimeEditorState.js';
 import type { DSL_LegendStudioApplicationPlugin_Extension } from '../LegendStudioApplicationPlugin.js';
 import {
-  type FileGenerationTypeOption,
+  type GenerationTypeOption,
   DEFAULT_GENERATION_SPECIFICATION_NAME,
 } from './editor-state/GraphGenerationState.js';
 import {
@@ -523,7 +523,7 @@ export class NewServiceDriver extends NewElementDriver<Service> {
 }
 
 export class NewFileGenerationDriver extends NewElementDriver<FileGenerationSpecification> {
-  typeOption?: FileGenerationTypeOption | undefined;
+  typeOption?: GenerationTypeOption | undefined;
 
   constructor(editorStore: EditorStore) {
     super(editorStore);
@@ -534,13 +534,13 @@ export class NewFileGenerationDriver extends NewElementDriver<FileGenerationSpec
     });
 
     this.typeOption = editorStore.graphState.graphGenerationState
-      .fileGenerationConfigurationOptions.length
-      ? editorStore.graphState.graphGenerationState
+      .globalFileGenerationState.fileGenerationConfigurationOptions.length
+      ? editorStore.graphState.graphGenerationState.globalFileGenerationState
           .fileGenerationConfigurationOptions[0]
       : undefined;
   }
 
-  setTypeOption(typeOption: FileGenerationTypeOption | undefined): void {
+  setTypeOption(typeOption: GenerationTypeOption | undefined): void {
     this.typeOption = typeOption;
   }
 

package/src/stores/editor/editor-state/{FileGenerationViewerState.ts → ArtifactGenerationViewerState.ts}

@@ -17,10 +17,10 @@
 import type { EditorStore } from '../EditorStore.js';
 import { EditorState } from './EditorState.js';
 import { observable, makeObservable, computed } from 'mobx';
-import type { FileSystem_File } from '../utils/FileSystemTreeUtils.js';
-import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import { returnUndefOnError } from '@finos/legend-shared';
+import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import { CODE_EDITOR_LANGUAGE } from '@finos/legend-lego/code-editor';
+import type { FileSystem_File } from '../utils/FileSystemTreeUtils.js';
 
 export const getTextContent = (
   content: string,
@@ -51,30 +51,33 @@ export const getEditorLanguageForFormat = (
   }
 };
 
-export class FileGenerationViewerState extends EditorState {
-  file: FileSystem_File;
+export class ArtifactGenerationViewerState extends EditorState {
+  artifact: FileSystem_File;
 
   constructor(editorStore: EditorStore, file: FileSystem_File) {
     super(editorStore);
 
     makeObservable(this, {
-      file: observable,
+      artifact: observable,
       label: computed,
       generatedFilePath: computed,
     });
 
-    this.file = file;
+    this.artifact = file;
   }
 
   get label(): string {
-    return this.file.name;
+    return this.artifact.name;
   }
 
   override match(tab: EditorState): boolean {
-    return tab instanceof FileGenerationViewerState && tab.file === this.file;
+    return (
+      tab instanceof ArtifactGenerationViewerState &&
+      tab.artifact === this.artifact
+    );
   }
 
   get generatedFilePath(): string {
-    return this.file.path;
+    return this.artifact.path;
   }
 }

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

@@ -230,7 +230,7 @@ export class FileGenerationState extends GeneratedFileStructureState {
         return;
       }
       const mode =
-        this.editorStore.graphState.graphGenerationState.getFileGenerationConfiguration(
+        this.editorStore.graphState.graphGenerationState.globalFileGenerationState.getFileGenerationConfiguration(
           this.fileGeneration.type,
         ).generationMode;
       const result =