@finos/legend-application-studio 28.19.117 → 28.20.0

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

@@ -63,6 +63,8 @@ import {
   DataProductDiagram,
   observe_DataProductDiagram,
   stub_Mapping,
+  AppDirOwner,
+  type AppDirNode,
 } from '@finos/legend-graph';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
@@ -1192,7 +1194,7 @@ export class DataProductEditorState extends ElementEditorState {
         this.ingestionManager,
       ).deployDataProduct(
         grammar,
-        guaranteeNonNullable(this.associatedIngest?.appDirDeployment),
+        guaranteeNonNullable(this.appDirDeployment),
         (val: string) =>
           this.editorStore.applicationStore.alertService.setBlockingAlert({
             message: val,
@@ -1261,9 +1263,7 @@ export class DataProductEditorState extends ElementEditorState {
   }
 
   get validForDeployment(): boolean {
-    return Boolean(
-      this.associatedIngest?.appDirDeployment && this.ingestionManager,
-    );
+    return Boolean(this.appDirDeployment && this.ingestionManager);
   }
 
   get accessPoints(): AccessPoint[] {
@@ -1275,7 +1275,7 @@ export class DataProductEditorState extends ElementEditorState {
   }
 
   get deployValidationMessage(): string {
-    if (!this.associatedIngest?.appDirDeployment) {
+    if (!this.appDirDeployment) {
       return 'No app dir deployment found';
     } else if (!this.ingestionManager) {
       return 'No ingestion manager found';
@@ -1283,6 +1283,15 @@ export class DataProductEditorState extends ElementEditorState {
     return 'Deploy';
   }
 
+  // Use explicit owner from the data product if available, otherwise fall back to the associated ingest's app dir deployment
+  get appDirDeployment(): AppDirNode | undefined {
+    const owner = this.product.owner;
+    if (owner instanceof AppDirOwner) {
+      return owner.production;
+    }
+    return this.associatedIngest?.appDirDeployment;
+  }
+
   // We need to get the associated Ingest to get the app dir deployment
   // We could do a more in depth check on the access point lambdas to check which ingest it uses but for now
   // we will assume all ingests have the same DID

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

@@ -43,6 +43,9 @@ import {
   DataProductOperationalMetadata,
   type DataProduct_DeliveryFrequency,
   type DataProduct_Region,
+  type DataProductOwner,
+  type AppDirOwner,
+  type AppDirNode,
 } from '@finos/legend-graph';
 import { addUniqueEntry, deleteEntry, swapEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
@@ -409,3 +412,27 @@ export const operationalMetadata_deleteCoverageRegion = action(
     }
   },
 );
+
+export const dataProduct_setOwner = action(
+  (product: DataProduct, owner: DataProductOwner | undefined) => {
+    product.owner = owner;
+  },
+);
+
+export const appDirOwner_setProduction = action(
+  (owner: AppDirOwner, appDirNode: AppDirNode | undefined) => {
+    owner.production = appDirNode;
+  },
+);
+
+export const appDirOwner_setProdParallel = action(
+  (owner: AppDirOwner, appDirNode: AppDirNode | undefined) => {
+    owner.prodParallel = appDirNode;
+  },
+);
+
+export const appDirNode_setAppDirId = action(
+  (node: AppDirNode, appDirId: number) => {
+    node.appDirId = appDirId;
+  },
+);

package/tsconfig.json

@@ -72,7 +72,6 @@
     "./src/application/LegendStudioApplicationConfig.ts",
     "./src/application/LegendStudioPluginManager.ts",
     "./src/components/__test-utils__/EmbeddedQueryBuilderTestUtils.ts",
-    "./src/components/editor/editor-group/accessor/AccessorQueryBuilderHelper.ts",
     "./src/components/editor/editor-group/dataProduct/DataProductQueryBuilderHelper.ts",
     "./src/components/shared/StudioSDLCErrors.ts",
     "./src/stores/LegendStudioApplicationPlugin.ts",
@@ -248,6 +247,8 @@
     "./src/components/editor/editor-group/ProtocolValueBuilder.tsx",
     "./src/components/editor/editor-group/RuntimeEditor.tsx",
     "./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/connection-editor/ConnectionEditor.tsx",
     "./src/components/editor/editor-group/connection-editor/DatabaseBuilderWizard.tsx",
     "./src/components/editor/editor-group/connection-editor/DatabaseEditorHelper.tsx",