@finos/legend-application-studio 28.18.131 → 28.18.133

package/src/stores/ingestion/IngestionManager.ts

@@ -18,7 +18,12 @@ import type { AppDirNode } from '@finos/legend-graph';
 import { IngestDeploymentServerClient } from './IngestDeploymentServerClient.js';
 import { IngestDiscoveryServerClient } from './IngestDiscoveryServerClient.js';
 import type { GenericLegendApplicationStore } from '@finos/legend-application';
-import { type ActionState, type PlainObject } from '@finos/legend-shared';
+import {
+  NetworkClientError,
+  type ActionState,
+  type PlainObject,
+  assertErrorThrown,
+} from '@finos/legend-shared';
 import {
   type IngestDefinitionValidationResponse,
   IngestDefinitionDeploymentResponse,
@@ -30,13 +35,18 @@ import {
   IngestDeploymentServerConfig,
   type LegendIngestionConfiguration,
 } from '../../application/LegendIngestionConfiguration.js';
+import {
+  createAdhocDataProductDeployResponse,
+  type AdhocDataProductDeployResponse,
+} from './AdhocDataProductDeployResponse.js';
 
 export class IngestionManager {
+  private readonly applicationStore: GenericLegendApplicationStore;
   private ingestDiscoveryServerClient: IngestDiscoveryServerClient;
   private ingestDeploymentServerClient: IngestDeploymentServerClient;
   private _currentAppID: number | undefined;
   private _currentLevel: string | undefined;
-  private readonly applicationStore: GenericLegendApplicationStore;
+  private useDefaultServer = false;
 
   constructor(
     config: LegendIngestionConfiguration,
@@ -54,6 +64,7 @@ export class IngestionManager {
     this.ingestDeploymentServerClient.setTracerService(
       applicationStore.tracerService,
     );
+    this.useDefaultServer = Boolean(config.deployment.useDefaultServer);
     this.applicationStore = applicationStore;
   }
 
@@ -78,7 +89,7 @@ export class IngestionManager {
     actionState?.setMessage(
       `Discovering associated ingest environment for DID ${appDirNode.appDirId}...`,
     );
-    // await this.identifyIngestDeploymentServer(appDirNode, token);
+    await this.identifyIngestDeploymentServer(appDirNode, token);
     actionState?.setMessage(
       `Validating ingest with server ${this.ingestDeploymentServerClient.baseUrl ?? ''} for realm ${this.ingestDeploymentServerClient.environmentClassification}...`,
     );
@@ -109,6 +120,27 @@ export class IngestionManager {
     return fullResponse;
   }
 
+  async deployDataProduct(
+    grammarText: string,
+    appDirNode: AppDirNode,
+    actionState: ActionState | undefined,
+    token: string | undefined,
+  ): Promise<AdhocDataProductDeployResponse> {
+    actionState?.setMessage(
+      `Discovering associated data product environment for DID ${appDirNode.appDirId}...`,
+    );
+    await this.identifyIngestDeploymentServer(appDirNode, token);
+    actionState?.setMessage(
+      `Deploying data product with server ${this.ingestDeploymentServerClient.baseUrl ?? ''} for realm ${this.ingestDeploymentServerClient.environmentClassification}...`,
+    );
+    const deployResponse =
+      await this.ingestDeploymentServerClient.deployDataProduct(
+        grammarText,
+        token,
+      );
+    return createAdhocDataProductDeployResponse(deployResponse);
+  }
+
   private async _validate(
     ingestDefinition: string,
     appDirNode: AppDirNode | undefined,
@@ -117,12 +149,21 @@ export class IngestionManager {
     if (appDirNode) {
       await this.identifyIngestDeploymentServer(appDirNode, token);
     }
-    // validate
-    const response = await this.ingestDeploymentServerClient.validate(
-      ingestDefinition,
-      token,
-    );
-    return createIngestDefinitionValidationResponse(response);
+    try {
+      const response = await this.ingestDeploymentServerClient.validate(
+        ingestDefinition,
+        token,
+      );
+      return createIngestDefinitionValidationResponse(response);
+    } catch (error) {
+      assertErrorThrown(error);
+      if (error instanceof NetworkClientError) {
+        return createIngestDefinitionValidationResponse(
+          error.payload as PlainObject<IngestDefinitionValidationResponse>,
+        );
+      }
+      throw error;
+    }
   }
 
   private async _deploy(
@@ -146,7 +187,7 @@ export class IngestionManager {
     token: string | undefined,
   ): Promise<void> {
     // we do not change if current appDirNode is the same as the one we are trying to set
-    if (this.isCurrentAppDirNode(appDirNode)) {
+    if (this.useDefaultServer || this.isCurrentAppDirNode(appDirNode)) {
       return;
     }
     const serverConfig = IngestDeploymentServerConfig.serialization.fromJson(
@@ -156,7 +197,6 @@ export class IngestionManager {
         token,
       ),
     );
-
     this.ingestDeploymentServerClient.changeServer(serverConfig);
     this.setCurrentAppDirNode(appDirNode);
   }

package/src/stores/lazy-text-editor/LazyTextEditorStore.ts

@@ -49,6 +49,7 @@ export class LazyTextEditorStore {
         patchReleaseVersionId,
         workspaceId,
         workspaceType,
+        undefined,
       ),
     );
   }

package/tsconfig.json

@@ -205,6 +205,7 @@
     "./src/stores/graph-modifier/STO_FlatData_GraphModifierHelper.ts",
     "./src/stores/graph-modifier/STO_Relational_GraphModifierHelper.ts",
     "./src/stores/graph-modifier/Testable_GraphModifierHelper.ts",
+    "./src/stores/ingestion/AdhocDataProductDeployResponse.ts",
     "./src/stores/ingestion/IngestDeploymentServerClient.ts",
     "./src/stores/ingestion/IngestDiscoveryServerClient.ts",
     "./src/stores/ingestion/IngestionDeploymentResponse.ts",