@finos/legend-application-studio 28.19.34 → 28.19.36

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

@@ -32,6 +32,20 @@ import {
   type Stereotype,
   getStereotype,
   type StereotypeReference,
+  ModelAccessPointGroup,
+  PackageableRuntime,
+  Association,
+  Class,
+  Enumeration,
+  Package,
+  observe_DataProductRuntimeInfo,
+  PackageableElementExplicitReference,
+  DataProductRuntimeInfo,
+  type DataProductElement,
+  type Mapping,
+  observe_DataProductElementScope,
+  DataProductElementScope,
+  validate_PureExecutionMapping,
 } from '@finos/legend-graph';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
@@ -57,6 +71,7 @@ import {
   uuid,
   swapEntry,
   returnUndefOnError,
+  deepEqual,
 } from '@finos/legend-shared';
 import {
   accessPointGroup_swapAccessPoints,
@@ -65,6 +80,13 @@ import {
   dataProduct_deleteAccessPoint,
   dataProduct_deleteAccessPointGroup,
   dataProduct_swapAccessPointGroups,
+  modelAccessPointGroup_addCompatibleRuntime,
+  modelAccessPointGroup_addElement,
+  modelAccessPointGroup_removeCompatibleRuntime,
+  modelAccessPointGroup_removeElement,
+  modelAccessPointGroup_setDefaultRuntime,
+  modelAccessPointGroup_setElementExclude,
+  modelAccessPointGroup_setMapping,
 } from '../../../../graph-modifier/DSL_DataProduct_GraphModifierHelper.js';
 import { LambdaEditorState } from '@finos/legend-query-builder';
 import {
@@ -280,6 +302,16 @@ export class AccessPointGroupState {
     return undefined;
   }
 
+  hasErrors(): boolean {
+    return (
+      this.accessPointStates.length === 0 ||
+      this.value.id === '' ||
+      Boolean(
+        this.accessPointStates.find((apState) => apState.accessPoint.id === ''),
+      )
+    );
+  }
+
   deleteAccessPoint(val: AccessPointState): void {
     const state = this.accessPointStates.find((a) => a === val);
     deleteEntry(this.accessPointStates, state);
@@ -313,6 +345,122 @@ export class AccessPointGroupState {
   }
 }
 
+export class ModelAccessPointGroupState extends AccessPointGroupState {
+  declare value: ModelAccessPointGroup;
+  showNewModal = false;
+
+  constructor(val: ModelAccessPointGroup, editorState: DataProductEditorState) {
+    super(val, editorState);
+    this.value = val;
+  }
+
+  setMapping(mapping: Mapping): void {
+    modelAccessPointGroup_setMapping(
+      this.value,
+      PackageableElementExplicitReference.create(mapping),
+    );
+  }
+
+  setDefaultRuntime(runtime: DataProductRuntimeInfo) {
+    modelAccessPointGroup_setDefaultRuntime(this.value, runtime);
+  }
+
+  addCompatibleRuntime(runtime: PackageableRuntime): void {
+    const newRuntime = observe_DataProductRuntimeInfo(
+      new DataProductRuntimeInfo(),
+    );
+    newRuntime.id = runtime.name;
+    newRuntime.runtime = PackageableElementExplicitReference.create(runtime);
+    modelAccessPointGroup_addCompatibleRuntime(this.value, newRuntime);
+
+    if (deepEqual(this.value.defaultRuntime, new DataProductRuntimeInfo())) {
+      this.setDefaultRuntime(newRuntime);
+    }
+  }
+
+  removeCompatibleRuntime(runtime: DataProductRuntimeInfo): void {
+    modelAccessPointGroup_removeCompatibleRuntime(this.value, runtime);
+    if (runtime === this.value.defaultRuntime) {
+      if (!this.value.compatibleRuntimes.length) {
+        this.setDefaultRuntime(new DataProductRuntimeInfo());
+      } else if (this.value.compatibleRuntimes[0]) {
+        this.setDefaultRuntime(this.value.compatibleRuntimes[0]);
+      }
+    }
+  }
+
+  addFeaturedElement(element: DataProductElement): void {
+    const elementPointer = observe_DataProductElementScope(
+      new DataProductElementScope(),
+    );
+    elementPointer.element =
+      PackageableElementExplicitReference.create(element);
+    modelAccessPointGroup_addElement(this.value, elementPointer);
+  }
+
+  removeFeaturedElement(element: DataProductElementScope): void {
+    modelAccessPointGroup_removeElement(this.value, element);
+  }
+
+  excludeFeaturedElement(
+    element: DataProductElementScope,
+    value: boolean,
+  ): void {
+    modelAccessPointGroup_setElementExclude(element, value);
+  }
+
+  override hasErrors(): boolean {
+    return Boolean(
+      super.hasErrors() ||
+        !validate_PureExecutionMapping(this.value.mapping.value) ||
+        !deepEqual(this.value.defaultRuntime, new DataProductRuntimeInfo()),
+    );
+  }
+
+  getCompatibleRuntimeOptions(): {
+    label: string;
+    value: PackageableRuntime;
+  }[] {
+    const currentRuntimes = this.value.compatibleRuntimes.map(
+      (runtimePointer) => runtimePointer.runtime.value,
+    );
+    return this.state.editorStore.graphManagerState.graph.allOwnElements
+      .filter(
+        (element): element is PackageableRuntime =>
+          element instanceof PackageableRuntime,
+      )
+      .filter((runtime) => !currentRuntimes.includes(runtime))
+      .map((runtime) => ({
+        label: runtime.path,
+        value: runtime,
+      }));
+  }
+
+  isValidDataProductElement(
+    element: PackageableElement,
+  ): element is DataProductElement {
+    return (
+      element instanceof Package ||
+      element instanceof Class ||
+      element instanceof Enumeration ||
+      element instanceof Association
+    );
+  }
+
+  getFeaturedElementOptions(): { label: string; value: DataProductElement }[] {
+    const currentElements = this.value.featuredElements.map(
+      (elementPointer) => elementPointer.element.value,
+    );
+    return this.state.editorStore.graphManagerState.graph.allOwnElements
+      .filter((element) => this.isValidDataProductElement(element))
+      .filter((element) => !currentElements.includes(element))
+      .map((element) => ({
+        label: element.path,
+        value: element,
+      }));
+  }
+}
+
 const createEditorInitialConfiguration = (): EditorInitialConfiguration => {
   const config = new EditorInitialConfiguration();
   const ingest = new DataProductElementEditorInitialConfiguration();
@@ -343,6 +491,7 @@ export class DataProductEditorState extends ElementEditorState {
   deployResponse: AdhocDataProductDeployResponse | undefined;
   selectedGroupState: AccessPointGroupState | undefined;
   selectedTab: DATA_PRODUCT_TAB;
+  modelledDataProduct = false;
 
   constructor(
     editorStore: EditorStore,
@@ -356,6 +505,7 @@ export class DataProductEditorState extends ElementEditorState {
       accessPointGroupStates: observable,
       isConvertingTransformLambdaObjects: observable,
       selectedTab: observable,
+      modelledDataProduct: observable,
       setSelectedTab: action,
       addGroupState: action,
       deleteGroupState: action,
@@ -371,9 +521,18 @@ export class DataProductEditorState extends ElementEditorState {
       swapAccessPointGroups: action,
     });
 
-    this.accessPointGroupStates = this.product.accessPointGroups.map(
-      (e) => new AccessPointGroupState(e, this),
-    );
+    this.accessPointGroupStates = this.product.accessPointGroups.map((e) => {
+      if (e instanceof ModelAccessPointGroup) {
+        this.modelledDataProduct = true;
+        return new ModelAccessPointGroupState(e, this);
+      } else if (e instanceof AccessPointGroup) {
+        return new AccessPointGroupState(e, this);
+      } else {
+        throw new Error(
+          `Can't build access point group state for unsupported access point group type: ${e}`,
+        );
+      }
+    });
 
     this.selectedGroupState = this.accessPointGroupStates[0];
 

package/src/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionState.ts

@@ -885,6 +885,7 @@ export class MappingExecutionState extends MappingEditorTabState {
               this.mappingEditorState.mapping,
               runtime,
               this.editorStore.graphManagerState.graph,
+              undefined,
               report,
             )) as { plan: RawExecutionPlan; debug: string };
 
@@ -900,6 +901,7 @@ export class MappingExecutionState extends MappingEditorTabState {
               this.mappingEditorState.mapping,
               runtime,
               this.editorStore.graphManagerState.graph,
+              undefined,
               report,
             )) as object;
         }

package/src/stores/editor/editor-state/element-editor-state/mapping/legacy/DEPRECATED__MappingTestState.ts

@@ -874,6 +874,7 @@ export class DEPRECATED__MappingTestState extends MappingEditorTabState {
             this.mappingEditorState.mapping,
             this.inputDataState.runtime,
             this.editorStore.graphManagerState.graph,
+            undefined,
             report,
           )) as { plan: RawExecutionPlan; debug: string };
         rawPlan = debugResult.plan;
@@ -888,6 +889,7 @@ export class DEPRECATED__MappingTestState extends MappingEditorTabState {
             this.mappingEditorState.mapping,
             this.inputDataState.runtime,
             this.editorStore.graphManagerState.graph,
+            undefined,
             report,
           )) as object;
       }

package/src/stores/editor/editor-state/element-editor-state/service/ServiceExecutionState.ts

@@ -570,6 +570,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
             this.selectedExecutionContextState?.executionContext.mapping.value,
             this.selectedExecutionContextState?.executionContext.runtime,
             this.editorStore.graphManagerState.graph,
+            undefined,
             report,
           )) as { plan: RawExecutionPlan; debug: string };
         rawPlan = debugResult.plan;
@@ -584,6 +585,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
             this.selectedExecutionContextState?.executionContext.mapping.value,
             this.selectedExecutionContextState?.executionContext.runtime,
             this.editorStore.graphManagerState.graph,
+            undefined,
             report,
           )) as object;
       }

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

@@ -23,11 +23,17 @@ import {
   type LakehouseAccessPoint,
   DataProductLink,
   observe_AccessPoint,
-  observe_AccessPointGroup,
   observe_Email,
   observe_SupportInfo,
   observer_DataProductLink,
   SupportInfo,
+  type ModelAccessPointGroup,
+  type DataProductRuntimeInfo,
+  type PackageableElementReference,
+  type Mapping,
+  type DataProductDiagram,
+  type DataProductElementScope,
+  observe_APG,
 } from '@finos/legend-graph';
 import { addUniqueEntry, deleteEntry, swapEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
@@ -68,6 +74,87 @@ export const accessPointGroup_setName = action(
   },
 );
 
+export const modelAccessPointGroup_setDefaultRuntime = action(
+  (group: ModelAccessPointGroup, runtime: DataProductRuntimeInfo) => {
+    group.defaultRuntime = runtime;
+  },
+);
+
+export const modelAccessPointGroup_setMapping = action(
+  (
+    group: ModelAccessPointGroup,
+    mapping: PackageableElementReference<Mapping>,
+  ) => {
+    group.mapping = mapping;
+  },
+);
+
+export const modelAccessPointGroup_addCompatibleRuntime = action(
+  (group: ModelAccessPointGroup, runtime: DataProductRuntimeInfo) => {
+    addUniqueEntry(group.compatibleRuntimes, runtime);
+  },
+);
+
+export const modelAccessPointGroup_removeCompatibleRuntime = action(
+  (group: ModelAccessPointGroup, runtime: DataProductRuntimeInfo): void => {
+    deleteEntry(group.compatibleRuntimes, runtime);
+  },
+);
+
+export const modelAccessPointGroup_addElement = action(
+  (group: ModelAccessPointGroup, element: DataProductElementScope): void => {
+    addUniqueEntry(group.featuredElements, element);
+  },
+);
+
+export const modelAccessPointGroup_removeElement = action(
+  (group: ModelAccessPointGroup, element: DataProductElementScope): void => {
+    deleteEntry(group.featuredElements, element);
+  },
+);
+
+export const modelAccessPointGroup_setElementExclude = action(
+  (element: DataProductElementScope, exclude: boolean): void => {
+    element.exclude = exclude;
+  },
+);
+
+export const modelAccessPointGroup_addDiagram = action(
+  (group: ModelAccessPointGroup, diagram: DataProductDiagram): void => {
+    addUniqueEntry(group.diagrams, diagram);
+  },
+);
+
+export const modelAccessPointGroup_removeDiagram = action(
+  (group: ModelAccessPointGroup, diagram: DataProductDiagram): void => {
+    deleteEntry(group.diagrams, diagram);
+  },
+);
+
+export const dataProductDiagram_setTitle = action(
+  (diagram: DataProductDiagram, title: string): void => {
+    diagram.title = title;
+  },
+);
+
+export const dataProductDiagram_setDescription = action(
+  (diagram: DataProductDiagram, desc: string | undefined): void => {
+    diagram.description = desc;
+  },
+);
+
+export const runtimeInfo_setId = action(
+  (runtimeInfo: DataProductRuntimeInfo, id: string): void => {
+    runtimeInfo.id = id;
+  },
+);
+
+export const runtimeInfo_setDescription = action(
+  (runtimeInfo: DataProductRuntimeInfo, desc: string | undefined): void => {
+    runtimeInfo.description = desc;
+  },
+);
+
 export const accessPointGroup_swapAccessPoints = action(
   (
     group: AccessPointGroup,
@@ -80,10 +167,8 @@ export const accessPointGroup_swapAccessPoints = action(
 
 export const dataProduct_addAccessPointGroup = action(
   (product: DataProduct, accessPointGroup: AccessPointGroup) => {
-    addUniqueEntry(
-      product.accessPointGroups,
-      observe_AccessPointGroup(accessPointGroup),
-    );
+    const observedApg = observe_APG(accessPointGroup);
+    addUniqueEntry(product.accessPointGroups, observedApg);
   },
 );