@finos/legend-application-studio 28.18.146 → 28.18.148

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

@@ -47,10 +47,6 @@ import {
 } from '../ElementEditorInitialConfiguration.js';
 import type { AuthContextProps } from 'react-oidc-context';
 import { EXTERNAL_APPLICATION_NAVIGATION__generateUrlWithEditorConfig } from '../../../../../__lib__/LegendStudioNavigation.js';
-import {
-  ActionAlertActionType,
-  ActionAlertType,
-} from '@finos/legend-application';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../../../__lib__/LegendStudioEvent.js';
 
 const createEditorInitialConfiguration = (): EditorInitialConfiguration => {
@@ -98,9 +94,12 @@ export class IngestDefinitionEditorState extends ElementEditorState {
       init_with_deploy: flow,
       deploy: flow,
     });
-    const elementConfig = config?.elementEditorConfiguration;
-    if (elementConfig instanceof IngestElementEditorInitialConfiguration) {
-      this.deployOnOpen = elementConfig.deployOnOpen ?? false;
+    if (
+      config?.elementEditorConfiguration instanceof
+      IngestElementEditorInitialConfiguration
+    ) {
+      this.deployOnOpen =
+        config.elementEditorConfiguration.deployOnOpen ?? false;
     }
   }
 
@@ -170,44 +169,13 @@ export class IngestDefinitionEditorState extends ElementEditorState {
       this.editorStore.applicationStore.alertService.setBlockingAlert(
         undefined,
       );
-      const deploymentResponse = response.deploymentResponse;
-      if (deploymentResponse) {
+      if (response.deploymentResponse) {
         this.editorStore.applicationStore.logService.info(
           LogEvent.create(LEGEND_STUDIO_APP_EVENT.INGESTION_DEPLOY_SUCCESS_URN),
-          deploymentResponse.ingestDefinitionUrn,
+          response.deploymentResponse.ingestDefinitionUrn,
         );
-        this.editorStore.applicationStore.alertService.setActionAlertInfo({
-          title: `Ingest Definition Deployment`,
-          message: `Ingest definition deployed successfully. You may use URN for ingestion of Data`,
-          prompt: `${deploymentResponse.ingestDefinitionUrn}`,
-          type: ActionAlertType.STANDARD,
-          actions: [
-            {
-              label: 'Copy URN',
-              type: ActionAlertActionType.PROCEED,
-              handler: (): void => {
-                this.editorStore.applicationStore.clipboardService
-                  .copyTextToClipboard(deploymentResponse.ingestDefinitionUrn)
-                  .then(() =>
-                    this.editorStore.applicationStore.notificationService.notifySuccess(
-                      'Ingest URN copied to clipboard',
-                      undefined,
-                      2500,
-                    ),
-                  )
-                  .catch(this.editorStore.applicationStore.alertUnhandledError);
-              },
-              default: true,
-            },
-            {
-              label: 'Close',
-              type: ActionAlertActionType.PROCEED_WITH_CAUTION,
-            },
-          ],
-        });
-      } else {
-        this.setValidateAndDeployResponse(response);
       }
+      this.setValidateAndDeployResponse(response);
     } catch (error) {
       this.editorStore.applicationStore.alertService.setBlockingAlert(
         undefined,

package/src/stores/editor/panel-group/SQLPlaygroundPanelState.ts

@@ -95,7 +95,7 @@ export class SQLPlaygroundPanelState implements CommandRegistrar {
     this.connection = val;
     if (val) {
       const connection = guaranteeRelationalDatabaseConnection(val);
-      this.database = connection.store.value;
+      this.database = connection.store?.value;
       this.schemaExplorerState = new DatabaseSchemaExplorerState(
         this.editorStore,
         connection,

package/src/stores/graph-modifier/DSL_DataProduct_GraphModifierHelper.ts

@@ -37,6 +37,12 @@ export const dataProduct_addAccessPoint = action(
   },
 );
 
+export const accessPointGroup_setDescription = action(
+  (product: AccessPointGroup, description: string) => {
+    product.description = description;
+  },
+);
+
 export const dataProduct_addAccessPointGroup = action(
   (product: DataProduct, accessPointGroup: AccessPointGroup) => {
     addUniqueEntry(

package/src/stores/ingestion/IngestDeploymentServerClient.ts

@@ -55,9 +55,11 @@ export class IngestDeploymentServerClient extends AbstractServerClient {
   private _dataProduct = (): string =>
     `${this.baseUrl}/${this.DATA_PRODUCT_URL}/api/entitlements/sdlc/deploy/definitions`;
 
-  private _ingest = (): string =>
+  private _ingestDefinitions = (): string =>
     `${this.baseUrl}/api/ingest/sdlc/deploy/definitions`;
 
+  private _ingest = (): string => `${this.baseUrl}/api/ingest`;
+
   changeServer(serverConfig: IngestDeploymentServerConfig): void {
     this.baseUrl = serverConfig.ingestServerUrl;
     this.environmentClassification = serverConfig.environmentClassification;
@@ -68,7 +70,7 @@ export class IngestDeploymentServerClient extends AbstractServerClient {
     token: string | undefined,
   ): Promise<PlainObject<IngestDefinitionValidationResponse>> {
     return this.post(
-      `${this._ingest()}/validate`,
+      `${this._ingestDefinitions()}/validate`,
       validateGrammar,
       undefined,
       this._tokenWithTextPlain(token),
@@ -80,13 +82,22 @@ export class IngestDeploymentServerClient extends AbstractServerClient {
     token: string | undefined,
   ): Promise<IngestDefinitionDeploymentResponse> {
     return this.post(
-      `${this._ingest()}`,
+      `${this._ingestDefinitions()}`,
       deployGrammar,
       undefined,
       this._tokenWithTextPlain(token),
     );
   }
 
+  write_location(urn: string, token: string | undefined): Promise<PlainObject> {
+    return this.post(
+      `${this._ingest()}/${encodeURIComponent(urn)}/write-location`,
+      undefined,
+      undefined,
+      this._token(token),
+    );
+  }
+
   deployDataProduct(
     fullGrammar: string,
     token: string | undefined,

package/src/stores/ingestion/IngestionDeploymentResponse.ts

@@ -51,6 +51,7 @@ export const createIngestDefinitionValidationResponse = (
 
 export class IngestDefinitionDeploymentResponse {
   ingestDefinitionUrn!: string;
+  write_location: PlainObject | undefined;
 
   static readonly serialization = new SerializationFactory(
     createModelSchema(IngestDefinitionDeploymentResponse, {

package/src/stores/ingestion/IngestionManager.ts

@@ -115,7 +115,13 @@ export class IngestionManager {
       undefined,
       token,
     );
-    fullResponse.deploymentResponse = deployResponse;
+    try {
+      messageCallBack(`Deployment Success. Fetching write location...`);
+      await this._fetchDeployLocations(deployResponse, token);
+    } catch (error) {
+      assertErrorThrown(error);
+    }
+
     return fullResponse;
   }
 
@@ -181,6 +187,17 @@ export class IngestionManager {
     return IngestDefinitionDeploymentResponse.serialization.fromJson(response);
   }
 
+  private async _fetchDeployLocations(
+    depploymentResponse: IngestDefinitionDeploymentResponse,
+    token: string | undefined,
+  ): Promise<void> {
+    const response = (await this.ingestDeploymentServerClient.write_location(
+      depploymentResponse.ingestDefinitionUrn,
+      token,
+    )) as unknown as PlainObject;
+    depploymentResponse.write_location = response;
+  }
+
   private async identifyIngestDeploymentServer(
     appDirNode: AppDirNode,
     token: string | undefined,