@finos/legend-application-studio 28.19.14 → 28.19.15

package/src/components/editor/side-bar/CreateNewElementModal.tsx

@@ -488,9 +488,6 @@ const NewLakehouseDataProductEditor = observer(() => {
   const handleTitleChange: React.ChangeEventHandler<HTMLInputElement> = (
     event,
   ) => newProductDriver.setTitle(event.target.value);
-  const handleDescriptionChange: React.ChangeEventHandler<HTMLInputElement> = (
-    event,
-  ) => newProductDriver.setDescription(event.target.value);
   return (
     <>
       <div className="panel__content__form__section__header__label">Title</div>
@@ -503,18 +500,6 @@ const NewLakehouseDataProductEditor = observer(() => {
           placeholder={`Choose a title for this Data Product to display in Marketplace`}
         />
       </div>
-      <div className="panel__content__form__section__header__label">
-        Description
-      </div>
-      <div className="explorer__new-element-modal__driver">
-        <input
-          className="input--dark explorer__new-element-modal__name-input"
-          spellCheck={false}
-          value={newProductDriver.description}
-          onChange={handleDescriptionChange}
-          placeholder={`Provide a meaningful description for this Data Product`}
-        />
-      </div>
     </>
   );
 });

package/src/stores/editor/NewElementState.ts

@@ -86,6 +86,7 @@ import {
   DataProduct,
   LakehouseRuntime,
   type Runtime,
+  AccessPointGroup,
 } from '@finos/legend-graph';
 import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../extensions/DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 import {
@@ -111,6 +112,7 @@ import {
 import { EmbeddedDataType } from './editor-state/ExternalFormatState.js';
 import { createEmbeddedData } from './editor-state/element-editor-state/data/EmbeddedDataState.js';
 import {
+  dataProduct_addAccessPointGroup,
   dataProduct_setDescription,
   dataProduct_setTitle,
 } from '../graph-modifier/DSL_DataProduct_GraphModifierHelper.js';
@@ -528,7 +530,7 @@ export class NewLakehouseDataProductDriver extends NewElementDriver<DataProduct>
   }
 
   override get isValid(): boolean {
-    return Boolean(this.title && this.description);
+    return Boolean(this.title);
   }
 
   setTitle(val: string) {
@@ -541,6 +543,11 @@ export class NewLakehouseDataProductDriver extends NewElementDriver<DataProduct>
     const dataProduct = new DataProduct(name);
     dataProduct_setTitle(dataProduct, this.title);
     dataProduct_setDescription(dataProduct, this.description);
+
+    const defaultGroup = new AccessPointGroup();
+    defaultGroup.id = 'default';
+    dataProduct_addAccessPointGroup(dataProduct, defaultGroup);
+
     return dataProduct;
   }
 }

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

@@ -19,7 +19,7 @@ import {
   LakehouseAccessPoint,
   type PackageableElement,
   type IngestDefinition,
-  type AccessPoint,
+  AccessPoint,
   stub_RawLambda,
   LakehouseTargetEnv,
   LAMBDA_PIPE,
@@ -29,6 +29,9 @@ import {
   isStubbed_RawLambda,
   AccessPointGroup,
   CodeCompletionResult,
+  type Stereotype,
+  getStereotype,
+  type StereotypeReference,
 } from '@finos/legend-graph';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
@@ -52,12 +55,16 @@ import {
   guaranteeNonNullable,
   assertTrue,
   uuid,
+  swapEntry,
+  returnUndefOnError,
 } from '@finos/legend-shared';
 import {
+  accessPointGroup_swapAccessPoints,
   dataProduct_addAccessPoint,
   dataProduct_addAccessPointGroup,
   dataProduct_deleteAccessPoint,
   dataProduct_deleteAccessPointGroup,
+  dataProduct_swapAccessPointGroups,
 } from '../../../../graph-modifier/DSL_DataProduct_GraphModifierHelper.js';
 import { LambdaEditorState } from '@finos/legend-query-builder';
 import {
@@ -70,13 +77,30 @@ import type {
   LakehouseIngestionManager,
 } from '@finos/legend-server-lakehouse';
 
+export enum DATA_PRODUCT_TAB {
+  HOME = 'Home',
+  SUPPORT = 'Support',
+  APG = 'APG',
+}
+
 export class AccessPointState {
-  readonly state: AccessPointGroupState;
+  readonly uuid = uuid();
+  state: AccessPointGroupState;
   accessPoint: AccessPoint;
 
   constructor(val: AccessPoint, editorState: AccessPointGroupState) {
     this.accessPoint = val;
     this.state = editorState;
+
+    makeObservable(this, {
+      state: observable,
+      accessPoint: observable,
+      changeGroupState: action,
+    });
+  }
+
+  changeGroupState(newGroup: AccessPointGroupState): void {
+    this.state = newGroup;
   }
 }
 
@@ -208,24 +232,65 @@ export class AccessPointGroupState {
     this.accessPointStates = val.accessPoints.map((e) =>
       this.buildAccessPointState(e),
     );
+
     makeObservable(this, {
       value: observable,
       accessPointStates: observable,
       addAccessPoint: action,
       deleteAccessPoint: action,
+      swapAccessPoints: action,
+      containsPublicStereotype: computed,
     });
   }
 
+  get containsPublicStereotype(): StereotypeReference | undefined {
+    return this.value.stereotypes.find(
+      (stereotype) => stereotype.value === this.publicStereotype,
+    );
+  }
+
+  get publicStereotype(): Stereotype | undefined {
+    const publicStereotype =
+      this.state.editorStore.applicationStore.config.options.dataProductConfig
+        ?.publicStereotype;
+
+    if (publicStereotype) {
+      return returnUndefOnError(() =>
+        getStereotype(
+          this.state.editorStore.graphManagerState.graph.getProfile(
+            publicStereotype.profile,
+          ),
+          publicStereotype.stereotype,
+        ),
+      );
+    }
+
+    return undefined;
+  }
+
   deleteAccessPoint(val: AccessPointState): void {
     const state = this.accessPointStates.find((a) => a === val);
     deleteEntry(this.accessPointStates, state);
     dataProduct_deleteAccessPoint(this.value, val.accessPoint);
   }
 
-  addAccessPoint(point: AccessPoint): void {
-    const accessPointState = this.buildAccessPointState(point);
+  addAccessPoint(point: AccessPoint | AccessPointState): void {
+    const accessPointState =
+      point instanceof AccessPoint ? this.buildAccessPointState(point) : point;
     addUniqueEntry(this.accessPointStates, accessPointState);
-    dataProduct_addAccessPoint(this.value, point);
+    dataProduct_addAccessPoint(this.value, accessPointState.accessPoint);
+  }
+
+  swapAccessPoints(
+    sourceAccessPoint: AccessPointState,
+    targetAccessPoint: AccessPointState,
+  ): void {
+    swapEntry(this.accessPointStates, sourceAccessPoint, targetAccessPoint);
+    accessPointGroup_swapAccessPoints(
+      this.value,
+      sourceAccessPoint.accessPoint,
+      targetAccessPoint.accessPoint,
+    );
   }
 
   buildAccessPointState(val: AccessPoint): AccessPointState {
@@ -259,14 +324,13 @@ export const generateUrlToDeployOnOpen = (
 };
 
 export class DataProductEditorState extends ElementEditorState {
-  accessPointModal = false;
-  accessPointGroupModal = false;
   deploymentState = ActionState.create();
   accessPointGroupStates: AccessPointGroupState[] = [];
   isConvertingTransformLambdaObjects = false;
   deployOnOpen = false;
   deployResponse: AdhocDataProductDeployResponse | undefined;
-  editingGroupState: AccessPointGroupState | undefined;
+  selectedGroupState: AccessPointGroupState | undefined;
+  selectedTab: DATA_PRODUCT_TAB;
 
   constructor(
     editorStore: EditorStore,
@@ -277,29 +341,35 @@ export class DataProductEditorState extends ElementEditorState {
 
     makeObservable(this, {
       product: computed,
-      accessPointModal: observable,
-      accessPointGroupModal: observable,
       accessPointGroupStates: observable,
       isConvertingTransformLambdaObjects: observable,
+      selectedTab: observable,
+      setSelectedTab: action,
+      addGroupState: action,
+      deleteGroupState: action,
       deploy: flow,
       deployOnOpen: observable,
       deployResponse: observable,
       setDeployOnOpen: action,
       setDeployResponse: action,
-      setAccessPointModal: action,
-      setAccessPointGroupModal: action,
       addAccessPoint: action,
       convertAccessPointsFuncObjects: flow,
-      editingGroupState: observable,
-      setEditingGroupState: action,
+      selectedGroupState: observable,
+      setSelectedGroupState: action,
+      swapAccessPointGroups: action,
     });
+
     this.accessPointGroupStates = this.product.accessPointGroups.map(
       (e) => new AccessPointGroupState(e, this),
     );
+
+    this.selectedGroupState = this.accessPointGroupStates[0];
+
     const elementConfig = config?.elementEditorConfiguration;
     if (elementConfig instanceof DataProductElementEditorInitialConfiguration) {
       this.deployOnOpen = elementConfig.deployOnOpen ?? false;
     }
+    this.selectedTab = DATA_PRODUCT_TAB.HOME;
   }
 
   setDeployOnOpen(value: boolean): void {
@@ -312,6 +382,33 @@ export class DataProductEditorState extends ElementEditorState {
     this.deployResponse = response;
   }
 
+  setSelectedTab(value: DATA_PRODUCT_TAB): void {
+    this.selectedTab = value;
+  }
+
+  addGroupState(value: AccessPointGroupState): void {
+    this.accessPointGroupStates.push(value);
+  }
+
+  deleteGroupState(value: AccessPointGroupState): void {
+    deleteEntry(
+      this.accessPointGroupStates,
+      this.accessPointGroupStates.find((a) => a === value),
+    );
+  }
+
+  swapAccessPointGroups(
+    sourceGroup: AccessPointGroupState,
+    targetGroup: AccessPointGroupState,
+  ): void {
+    swapEntry(this.accessPointGroupStates, sourceGroup, targetGroup);
+    dataProduct_swapAccessPointGroups(
+      this.product,
+      sourceGroup.value,
+      targetGroup.value,
+    );
+  }
+
   *convertAccessPointsFuncObjects(): GeneratorFn<void> {
     const lambdas = new Map<string, RawLambda>();
     const index = new Map<string, LakehouseAccessPointState>();
@@ -350,16 +447,8 @@ export class DataProductEditorState extends ElementEditorState {
     }
   }
 
-  setAccessPointModal(val: boolean): void {
-    this.accessPointModal = val;
-  }
-
-  setEditingGroupState(val: AccessPointGroupState | undefined): void {
-    this.editingGroupState = val;
-  }
-
-  setAccessPointGroupModal(val: boolean): void {
-    this.accessPointGroupModal = val;
+  setSelectedGroupState(val: AccessPointGroupState | undefined): void {
+    this.selectedGroupState = val;
   }
 
   addAccessPoint(
@@ -393,13 +482,20 @@ export class DataProductEditorState extends ElementEditorState {
     group.id = id;
     group.description = description;
     dataProduct_addAccessPointGroup(this.product, group);
-    return new AccessPointGroupState(group, this);
+    const newGroupState = new AccessPointGroupState(group, this);
+    this.addGroupState(newGroupState);
+    return newGroupState;
   }
 
   deleteAccessPointGroup(val: AccessPointGroupState): void {
     const state = this.accessPointGroupStates.find((a) => a === val);
     runInAction(() => {
-      deleteEntry(this.accessPointGroupStates, state);
+      if (state) {
+        this.deleteGroupState(state);
+        if (state === this.selectedGroupState) {
+          this.setSelectedGroupState(this.accessPointGroupStates[0]);
+        }
+      }
       dataProduct_deleteAccessPointGroup(this.product, val.value);
     });
   }

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

@@ -24,9 +24,9 @@ import {
   observe_SupportInfo,
   observe_Email,
   SupportInfo,
+  type LakehouseAccessPoint,
 } from '@finos/legend-graph';
-import { addUniqueEntry, deleteEntry } from '@finos/legend-shared';
-
+import { addUniqueEntry, deleteEntry, swapEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
 
 export const dataProduct_deleteAccessPoint = action(
@@ -41,6 +41,12 @@ export const dataProduct_addAccessPoint = action(
   },
 );
 
+export const accessPoint_setClassification = action(
+  (accessPoint: LakehouseAccessPoint, classification: string | undefined) => {
+    accessPoint.classification = classification;
+  },
+);
+
 export const accessPointGroup_setDescription = action(
   (group: AccessPointGroup, description: string) => {
     group.description = description;
@@ -53,6 +59,16 @@ export const accessPointGroup_setName = action(
   },
 );
 
+export const accessPointGroup_swapAccessPoints = action(
+  (
+    group: AccessPointGroup,
+    sourceAp: AccessPoint,
+    targetAp: AccessPoint,
+  ): void => {
+    swapEntry(group.accessPoints, sourceAp, targetAp);
+  },
+);
+
 export const dataProduct_addAccessPointGroup = action(
   (product: DataProduct, accessPointGroup: AccessPointGroup) => {
     addUniqueEntry(
@@ -68,6 +84,16 @@ export const dataProduct_deleteAccessPointGroup = action(
   },
 );
 
+export const dataProduct_swapAccessPointGroups = action(
+  (
+    product: DataProduct,
+    sourceGroup: AccessPointGroup,
+    targetGroup: AccessPointGroup,
+  ): void => {
+    swapEntry(product.accessPointGroups, sourceGroup, targetGroup);
+  },
+);
+
 export const dataProduct_setTitle = action(
   (product: DataProduct, title: string) => {
     product.title = title;