@finos/legend-application-studio 28.19.70 → 28.19.72

package/src/stores/editor/editor-state/element-editor-state/dataProduct/DataProductEditorState.ts

@@ -64,6 +64,7 @@ import {
   V1_RemoteEngine,
   DataElementReference,
   DataElement,
+  DataProductDiagram,
 } from '@finos/legend-graph';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
@@ -98,8 +99,10 @@ import {
   dataProduct_addAccessPoint,
   dataProduct_addAccessPointGroup,
   supportInfo_addExpertise,
+  modelAccessPointGroup_addDiagram,
   dataProduct_deleteAccessPoint,
   dataProduct_deleteAccessPointGroup,
+  modelAccessPointGroup_removeDiagram,
   dataProduct_swapAccessPointGroups,
   modelAccessPointGroup_addCompatibleRuntime,
   modelAccessPointGroup_addElement,
@@ -121,6 +124,7 @@ import type {
   LakehouseIngestionManager,
 } from '@finos/legend-server-lakehouse';
 import { deserialize } from 'serializr';
+import { Diagram } from '@finos/legend-extension-dsl-diagram';
 
 export enum DATA_PRODUCT_TAB {
   HOME = 'Home',
@@ -762,11 +766,13 @@ export class AccessPointGroupState {
 
 export class ModelAccessPointGroupState extends AccessPointGroupState {
   declare value: ModelAccessPointGroup;
+  readonly editorState: DataProductEditorState;
   showNewModal = false;
 
   constructor(val: ModelAccessPointGroup, editorState: DataProductEditorState) {
     super(val, editorState);
     this.value = val;
+    this.editorState = editorState;
   }
 
   setMapping(mapping: Mapping): void {
@@ -793,6 +799,23 @@ export class ModelAccessPointGroupState extends AccessPointGroupState {
     }
   }
 
+  getCompatibleDiagramOptions(): {
+    label: string;
+    value: PackageableElement;
+  }[] {
+    const currentDiagrams = this.value.diagrams.map(
+      (diagram) => diagram.diagram,
+    );
+
+    return this.state.editorStore.graphManagerState.graph.allOwnElements
+      .filter((element): element is Diagram => element instanceof Diagram)
+      .filter((diagram) => !currentDiagrams.includes(diagram))
+      .map((diagram) => ({
+        label: diagram.path,
+        value: diagram,
+      }));
+  }
+
   removeCompatibleRuntime(runtime: DataProductRuntimeInfo): void {
     modelAccessPointGroup_removeCompatibleRuntime(this.value, runtime);
     if (runtime === this.value.defaultRuntime) {
@@ -804,6 +827,18 @@ export class ModelAccessPointGroupState extends AccessPointGroupState {
     }
   }
 
+  addDiagram = (option: { label: string; value: PackageableElement }): void => {
+    const diagramValue = option.value;
+    const newDiagram = new DataProductDiagram();
+    newDiagram.title = diagramValue.name;
+    newDiagram.diagram = diagramValue;
+    modelAccessPointGroup_addDiagram(this.value, newDiagram);
+  };
+
+  handleRemoveDiagram = (diagram: DataProductDiagram): void => {
+    modelAccessPointGroup_removeDiagram(this.value, diagram);
+  };
+
   addFeaturedElement(element: DataProductElement): void {
     const elementPointer = observe_DataProductElementScope(
       new DataProductElementScope(),

package/src/stores/editor/sidebar-state/dev-metadata/DevMetadataState.ts

@@ -17,48 +17,48 @@
 import {
   ActionState,
   assertErrorThrown,
-  assertNonEmptyString,
   assertNonNullable,
   assertTrue,
-  filterByType,
   type GeneratorFn,
 } from '@finos/legend-shared';
 import type { EditorStore } from '../../EditorStore.js';
 import { action, flow, makeObservable, observable } from 'mobx';
-import { type DevMetadataResult, IngestDefinition } from '@finos/legend-graph';
-import { generateGAVCoordinates } from '@finos/legend-storage';
+import {
+  type DeployProjectResponse,
+  MetadataRequestOptions,
+} from '@finos/legend-graph';
 
 export class DevMetadataState {
   readonly editorStore: EditorStore;
-  result: DevMetadataResult | undefined;
+  result: DeployProjectResponse | undefined;
+  options: MetadataRequestOptions = new MetadataRequestOptions();
   pushState = ActionState.create();
-  did = '';
 
   constructor(editorStore: EditorStore) {
     this.editorStore = editorStore;
 
     makeObservable(this, {
       pushState: observable,
-      did: observable,
-      setDid: action,
       push: flow,
-      init: action,
+      options: observable,
+      setOptions: action,
     });
   }
 
-  setDid(did: string): void {
-    this.did = did;
+  setOptions(options: MetadataRequestOptions): void {
+    this.options = options;
   }
 
-  init(): void {
-    if (!this.did) {
-      const ingestDID = this.editorStore.graphManagerState.graph.allElements
-        .filter(filterByType(IngestDefinition))[0]
-        ?.appDirDeployment?.appDirId?.toString();
-      if (ingestDID) {
-        this.setDid(ingestDID);
-      }
+  get projectGAV(): { groupId: string; artifactId: string } | undefined {
+    const currentProjectConfiguration =
+      this.editorStore.projectConfigurationEditorState.projectConfiguration;
+    if (currentProjectConfiguration) {
+      return {
+        groupId: currentProjectConfiguration.groupId,
+        artifactId: currentProjectConfiguration.artifactId,
+      };
     }
+    return undefined;
   }
 
   *push(): GeneratorFn<void> {
@@ -78,34 +78,23 @@ export class DevMetadataState {
         currentProjectConfiguration,
         'Project Name required to push to dev mode',
       );
-      const projectId = generateGAVCoordinates(
-        currentProjectConfiguration.groupId,
-        currentProjectConfiguration.artifactId,
-        undefined,
-      );
-      assertNonEmptyString(this.did, 'DID required to push to dev mode');
       this.pushState.inProgress();
-      this.editorStore.applicationStore.alertService.setBlockingAlert({
-        message: 'Pushing to Dev Mode',
-        showLoading: true,
-      });
       const result =
         (yield this.editorStore.graphManagerState.graphManager.pushToDevMetadata(
-          this.did,
-          projectId,
+          currentProjectConfiguration.groupId,
+          currentProjectConfiguration.artifactId,
+          undefined,
+          this.options,
           this.editorStore.graphManagerState.graph,
-        )) as DevMetadataResult;
+        )) as DeployProjectResponse;
       this.result = result;
-      this.editorStore.applicationStore.notificationService.notifySuccess(
-        `Pushed to dev mode`,
-      );
+      this.pushState.complete();
     } catch (error) {
       assertErrorThrown(error);
-      this.pushState.fail();
-    } finally {
-      this.editorStore.applicationStore.alertService.setBlockingAlert(
-        undefined,
+      this.editorStore.applicationStore.notificationService.notifyError(
+        `Error pushing to dev metadata: ${error.message}`,
       );
+      this.pushState.fail();
     }
   }
 }

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

@@ -28,10 +28,10 @@ import {
   observe_SupportInfo,
   observer_DataProductLink,
   SupportInfo,
-  type ModelAccessPointGroup,
   type DataProductRuntimeInfo,
   type PackageableElementReference,
   type Mapping,
+  type ModelAccessPointGroup,
   type DataProductDiagram,
   type DataProductElementScope,
   observe_APG,