@finos/legend-application-studio 28.21.31 → 28.21.33

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

@@ -18,7 +18,6 @@ import {
   type AppDirNode,
   type ArtifactGenerationExtensionResult,
   type BatchLambdasRelationTypeResult,
-  type DataProductElement,
   type IngestDefinition,
   type Mapping,
   type PackageableElement,
@@ -33,15 +32,10 @@ import {
   AccessPoint,
   AccessPointGroup,
   AppDirOwner,
-  Association,
-  Class,
   CodeCompletionResult,
   DataElement,
   DataElementReference,
   DataProduct,
-  DataProductDiagram,
-  DataProductElementScope,
-  Enumeration,
   Expertise,
   getStereotype,
   GRAPH_MANAGER_EVENT,
@@ -50,11 +44,8 @@ import {
   LakehouseTargetEnv,
   LAMBDA_PIPE,
   ModelAccessPointGroup,
-  observe_DataProductDiagram,
-  observe_DataProductElementScope,
   observe_RelationElement,
   observe_RelationElementsData,
-  Package,
   PackageableElementExplicitReference,
   ParserError,
   RelationElement,
@@ -97,11 +88,6 @@ import {
   dataProduct_deleteAccessPointGroup,
   dataProduct_setSupportInfoIfAbsent,
   dataProduct_swapAccessPointGroups,
-  modelAccessPointGroup_addDiagram,
-  modelAccessPointGroup_addElement,
-  modelAccessPointGroup_removeDiagram,
-  modelAccessPointGroup_removeElement,
-  modelAccessPointGroup_setElementExclude,
   modelAccessPointGroup_setMapping,
   supportInfo_addExpertise,
 } from '../../../../graph-modifier/DSL_DataProduct_GraphModifierHelper.js';
@@ -116,9 +102,7 @@ import type {
   AdhocDataProductDeployResponse,
   LakehouseIngestionManager,
 } from '@finos/legend-server-lakehouse';
-import { Diagram } from '@finos/legend-extension-dsl-diagram';
 import { LegendStudioTelemetryHelper } from '../../../../../__lib__/LegendStudioTelemetryHelper.js';
-import { onGeneratingDiagramFromMapping } from '../mapping/MappingEditorState.js';
 
 export enum DATA_PRODUCT_TAB {
   HOME = 'Home',
@@ -764,16 +748,11 @@ 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;
-
-    makeObservable(this, {
-      generateDiagramFromMapping: flow,
-    });
   }
 
   override hasErrors(): boolean {
@@ -781,8 +760,7 @@ export class ModelAccessPointGroupState extends AccessPointGroupState {
       this.value.id === '' ||
       !this.value.description ||
       !this.value.title ||
-      this.value.mapping.value.path === '' ||
-      this.value.diagrams.length === 0
+      this.value.mapping.value.path === ''
     );
   }
 
@@ -792,145 +770,6 @@ export class ModelAccessPointGroupState extends AccessPointGroupState {
       PackageableElementExplicitReference.create(mapping),
     );
   }
-
-  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,
-      }));
-  }
-
-  collectFeaturedClasses = (
-    element: PackageableElement,
-    excludedPaths: string[],
-    elements: Set<Class>,
-  ): void => {
-    if (excludedPaths.includes(element.path)) {
-      return;
-    }
-    if (element instanceof Class) {
-      elements.add(element);
-    } else if (element instanceof Package) {
-      this.collectClassesFromPackage(element, excludedPaths, elements);
-    }
-  };
-
-  collectClassesFromPackage = (
-    element: Package,
-    excludedPaths: string[],
-    elements: Set<Class>,
-  ): void => {
-    element.children.forEach((child) => {
-      if (excludedPaths.includes(child.path)) {
-        return;
-      }
-      if (child instanceof Class) {
-        elements.add(child);
-      } else if (child instanceof Package) {
-        this.collectClassesFromPackage(child, excludedPaths, elements);
-      }
-    });
-  };
-
-  addDiagram = (option: { label: string; value: PackageableElement }): void => {
-    const diagramValue = option.value;
-    const newDiagram = observe_DataProductDiagram(new DataProductDiagram());
-    newDiagram.title = diagramValue.name;
-    newDiagram.diagram = diagramValue;
-    modelAccessPointGroup_addDiagram(this.value, newDiagram);
-  };
-
-  handleRemoveDiagram = (diagram: DataProductDiagram): void => {
-    modelAccessPointGroup_removeDiagram(this.value, diagram);
-  };
-
-  *generateDiagramFromMapping(): GeneratorFn<void> {
-    const mapping = this.value.mapping.value;
-    if (mapping.path === '') {
-      return;
-    }
-    let featuredClasses: Class[] | undefined = undefined;
-    if (this.value.featuredElements.length > 0) {
-      const includes = this.value.featuredElements
-        .filter((el) => el.exclude === undefined || el.exclude === false)
-        .map((el) => el.element.value);
-      const excludedPaths = this.value.featuredElements
-        .filter((el) => el.exclude !== undefined && el.exclude === true)
-        .map((el) => el.element.value.path);
-      const elements = new Set<Class>();
-      includes.forEach((element) => {
-        this.collectFeaturedClasses(element, excludedPaths, elements);
-      });
-      featuredClasses = Array.from(elements);
-    }
-    const diagram = (yield flowResult(
-      onGeneratingDiagramFromMapping(
-        mapping,
-        this.state.editorStore,
-        featuredClasses,
-      ),
-    )) as Diagram | undefined;
-    if (diagram) {
-      const newDiagram = observe_DataProductDiagram(new DataProductDiagram());
-      newDiagram.title = diagram.name;
-      newDiagram.diagram = diagram;
-      modelAccessPointGroup_addDiagram(this.value, newDiagram);
-    }
-  }
-
-  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);
-  }
-
-  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 => {

package/src/stores/editor/utils/ModelClassifierUtils.ts

@@ -80,6 +80,7 @@ export enum PACKAGEABLE_ELEMENT_TYPE {
   TEMPORARY__LOCAL_CONNECTION = 'LOCAL_CONNECTION',
   INTERNAL__UnknownElement = 'UNKNOWN',
   INGEST_DEFINITION = 'INGEST_DEFINITION',
+  AVAILABILITY = 'AVAILABILITY',
 }
 
 export enum PACKAGEABLE_ELEMENT_GROUP_BY_CATEGORY {

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

@@ -32,8 +32,6 @@ import {
   type PackageableElementReference,
   type Mapping,
   type ModelAccessPointGroup,
-  type DataProductDiagram,
-  type DataProductElementScope,
   observe_APG,
   type DataProductType,
   type ExternalDataProductType,
@@ -113,48 +111,6 @@ export const modelAccessPointGroup_setMapping = action(
   },
 );
 
-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;

package/tsconfig.json

@@ -125,6 +125,8 @@
     "./src/stores/editor/editor-state/element-editor-state/RuntimeEditorState.ts",
     "./src/stores/editor/editor-state/element-editor-state/ToDelete_FunctionActivatorBuilderState.ts",
     "./src/stores/editor/editor-state/element-editor-state/UMLEditorState.ts",
+    "./src/stores/editor/editor-state/element-editor-state/availability/AvailabilityEditorState.ts",
+    "./src/stores/editor/editor-state/element-editor-state/availability/testable/AvailabilityTestableState.ts",
     "./src/stores/editor/editor-state/element-editor-state/connection/ConnectionEditorState.ts",
     "./src/stores/editor/editor-state/element-editor-state/connection/DatabaseBuilderState.ts",
     "./src/stores/editor/editor-state/element-editor-state/connection/DatabaseBuilderWizardState.ts",
@@ -256,6 +258,8 @@
     "./src/components/editor/editor-group/UnsupportedElementEditor.tsx",
     "./src/components/editor/editor-group/accessor/AccessorQueryBuilder.tsx",
     "./src/components/editor/editor-group/accessor/AccessorQueryBuilderHelper.tsx",
+    "./src/components/editor/editor-group/availability/AvailabilityEditor.tsx",
+    "./src/components/editor/editor-group/availability/testable/AvailabilityTestableEditor.tsx",
     "./src/components/editor/editor-group/connection-editor/ConnectionEditor.tsx",
     "./src/components/editor/editor-group/connection-editor/DatabaseBuilderWizard.tsx",
     "./src/components/editor/editor-group/connection-editor/DatabaseEditorHelper.tsx",