@finos/legend-application-studio 28.18.126 → 28.18.128

package/src/stores/editor/GraphEditorMode.ts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import type { PackageableElement } from '@finos/legend-graph';
+import type {
+  PackageableElement,
+  GraphTextInputOption,
+} from '@finos/legend-graph';
 import type { GeneratorFn } from '@finos/legend-shared';
 import type { Entity } from '@finos/legend-storage';
 import { makeObservable, flow, action } from 'mobx';
@@ -23,6 +26,7 @@ import type { EditorStore } from './EditorStore.js';
 import type { GRAPH_EDITOR_MODE } from './EditorConfig.js';
 import type { Problem } from './EditorGraphState.js';
 import type { EditorInitialConfiguration } from './editor-state/element-editor-state/ElementEditorInitialConfiguration.js';
+import type { FileSystem_File } from './utils/FileSystemTreeUtils.js';
 
 export abstract class GraphEditorMode {
   readonly editorStore: EditorStore;
@@ -39,6 +43,7 @@ export abstract class GraphEditorMode {
       cleanupBeforeEntering: flow,
       handleCleanupFailure: flow,
       openElement: action,
+      openFileSystem_File: action,
     });
     this.editorStore = editorStore;
   }
@@ -86,4 +91,10 @@ export abstract class GraphEditorMode {
     element: PackageableElement,
     config?: EditorInitialConfiguration | undefined,
   ): void;
+
+  getGraphTextInputOption(): GraphTextInputOption | undefined {
+    return undefined;
+  }
+
+  abstract openFileSystem_File(file: FileSystem_File): void;
 }

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

@@ -178,6 +178,7 @@ export class DEPREACTED_GlobalFileGenerationState {
               fileGeneration.value,
               mode,
               this.editorStore.graphManagerState.graph,
+              this.editorStore.graphEditorMode.getGraphTextInputOption(),
             )) as GenerationOutput[];
         } catch (error) {
           assertErrorThrown(error);
@@ -348,6 +349,7 @@ export class GraphGenerationState {
             (yield this.editorStore.graphManagerState.graphManager.generateModel(
               node.generationElement.value,
               this.editorStore.graphManagerState.graph,
+              this.editorStore.graphEditorMode.getGraphTextInputOption(),
             )) as Entity[];
         } catch (error) {
           assertErrorThrown(error);
@@ -398,6 +400,7 @@ export class GraphGenerationState {
         artifacts =
           (yield this.editorStore.graphManagerState.graphManager.generateArtifacts(
             this.editorStore.graphManagerState.graph,
+            this.editorStore.graphEditorMode.getGraphTextInputOption(),
           )) as ArtifactGenerationExtensionResult;
       }
 
@@ -559,9 +562,7 @@ export class GraphGenerationState {
       }
     }
     if (!reprocess && node.fileNode instanceof FileSystem_File) {
-      this.editorStore.tabManagerState.openTab(
-        new ArtifactGenerationViewerState(this.editorStore, node.fileNode),
-      );
+      this.editorStore.graphEditorMode.openFileSystem_File(node.fileNode);
     }
     this.setSelectedNode(node);
     this.editorStore.graphState.editorStore.explorerTreeState.setArtifactsGenerationTreeData(

package/src/stores/editor/editor-state/element-editor-state/ingest/IngestDefinitionEditorState.ts

@@ -23,6 +23,7 @@ import {
   assertTrue,
   guaranteeNonNullable,
   guaranteeType,
+  removePrefix,
   type GeneratorFn,
 } from '@finos/legend-shared';
 import type { IngestionManager } from '../../../../ingestion/IngestionManager.js';
@@ -59,6 +60,8 @@ export const generateUrlToDeployOnOpen = (
     ),
   );
 };
+
+const PARSER_SECTION = `###Lakehouse`;
 export class IngestDefinitionEditorState extends ElementEditorState {
   validationError: IngestDefinitionValidationResponse | undefined;
   deploymentState = ActionState.create();
@@ -127,7 +130,8 @@ export class IngestDefinitionEditorState extends ElementEditorState {
       const response = (yield guaranteeNonNullable(
         this.ingestionManager,
       ).deploy(
-        guaranteeNonNullable(this.textContent),
+        // remove parser prefix for now since api already expects it to be under lakehouse parser
+        guaranteeNonNullable(removePrefix(this.textContent, PARSER_SECTION)),
         guaranteeNonNullable(this.ingest.appDirDeployment),
         this.deploymentState,
         token,

package/src/stores/ingestion/IngestDeploymentServerClient.ts

@@ -50,7 +50,7 @@ export class IngestDeploymentServerClient extends AbstractServerClient {
   });
 
   private _ingest = (): string =>
-    `${this.baseUrl}/ingest/sdlc/deploy/definitions`;
+    `${this.baseUrl}/api/ingest/sdlc/deploy/definitions`;
 
   changeServer(serverConfig: IngestDeploymentServerConfig): void {
     this.baseUrl = serverConfig.ingestServerUrl;