Propagate automation condition information through the UI for user co…

…de conditions
dagster-io · Oct 16, 2024 · 12f4f07 · 12f4f07
1 parent 057a145
commit 12f4f07
Show file tree

Hide file tree

Showing 28 changed files with 345 additions and 156 deletions.
diff --git a/js_modules/dagster-ui/packages/ui-core/client.json b/js_modules/dagster-ui/packages/ui-core/client.json
diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetGroupRoot.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetGroupRoot.tsx
@@ -143,7 +143,7 @@ export const ASSET_GROUP_METADATA_QUERY = gql`
   query AssetGroupMetadataQuery($selector: AssetGroupSelector!) {
     assetNodes(group: $selector) {
       id
-      autoMaterializePolicy {
+      automationCondition {
         __typename
       }
     }
@@ -172,7 +172,7 @@ export const AssetGroupTags = ({
 
     if (
       automaterializeSensorsFlagState === 'has-global-amp' &&
-      assetNodes.some((a) => !!a.autoMaterializePolicy)
+      assetNodes.some((a) => !!a.automationCondition)
     ) {
       return <AutomaterializeDaemonStatusTag />;
     }

diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetNodeOverview.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetNodeOverview.tsx
@@ -481,7 +481,7 @@ export const AssetNodeOverview = ({
 
     if (
       attributes.every((props) => isEmptyChildren(props.children)) &&
-      !cachedOrLiveAssetNode.autoMaterializePolicy
+      !cachedOrLiveAssetNode.automationCondition
     ) {
       return (
         <SectionEmptyState

diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTableFragment.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTableFragment.tsx
@@ -23,8 +23,9 @@ export const ASSET_TABLE_DEFINITION_FRAGMENT = gql`
         dynamicPartitionsDefinitionName
       }
     }
-    autoMaterializePolicy {
-      policyType
+    automationCondition {
+      label
+      expandedLabel
     }
     description
     owners {

diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTabs.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTabs.tsx
@@ -40,7 +40,7 @@ export type AssetTabConfigInput = {
   definition:
     | {
         isMaterializable: boolean;
-        autoMaterializePolicy: {__typename: 'AutoMaterializePolicy'} | null | undefined;
+        automationCondition: {__typename: 'AutomationCondition'} | null | undefined;
         partitionDefinition: {__typename: 'PartitionDefinition'} | null | undefined;
       }
     | null
@@ -94,7 +94,7 @@ export const buildAssetTabMap = (input: AssetTabConfigInput) => {
       title: 'Automation',
       to: buildAssetViewParams({...params, view: 'automation'}),
       disabled: !definition,
-      hidden: !definition?.autoMaterializePolicy,
+      hidden: !definition?.automationCondition,
     } as AssetTabConfig,
   };
 };

diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/__tests__/useAssetTabs.test.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/__tests__/useAssetTabs.test.tsx
@@ -250,7 +250,7 @@ describe('buildAssetTabs', () => {
   it('hides auto-materialize tab if no auto-materialize policy', () => {
     const hookResult = renderHook(() =>
       useAssetTabs({
-        definition: {...definitionWithPartition, autoMaterializePolicy: null},
+        definition: {...definitionWithPartition, automationCondition: null},
         params,
       }),
     );
@@ -272,7 +272,7 @@ describe('buildAssetTabs', () => {
   it('hides partitions and auto-materialize tabs if no partitions or auto-materializing', () => {
     const hookResult = renderHook(() =>
       useAssetTabs({
-        definition: {...definitionWithoutPartition, autoMaterializePolicy: null},
+        definition: {...definitionWithoutPartition, automationCondition: null},
         params,
       }),
     );

diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/types/AssetGroupRoot.types.ts b/js_modules/dagster-ui/packages/ui-core/src/assets/types/AssetGroupRoot.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/types/AssetTableFragment.types.ts b/js_modules/dagster-ui/packages/ui-core/src/assets/types/AssetTableFragment.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/types/AssetsCatalogTable.types.ts b/js_modules/dagster-ui/packages/ui-core/src/assets/types/AssetsCatalogTable.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/automation/AutomationAssetSelectionFragment.tsx b/js_modules/dagster-ui/packages/ui-core/src/automation/AutomationAssetSelectionFragment.tsx
@@ -24,7 +24,7 @@ export const AUTOMATION_ASSET_SELECTION_FRAGMENT = gql`
     }
     definition {
       id
-      autoMaterializePolicy {
+      automationCondition {
         __typename
       }
     }

diff --git a/js_modules/dagster-ui/packages/ui-core/src/automation/AutomationTargetList.tsx b/js_modules/dagster-ui/packages/ui-core/src/automation/AutomationTargetList.tsx
@@ -106,11 +106,11 @@ const AssetSelectionTag = ({
   }, [assetSelection.assetsOrError]);
 
   const assetsWithAMP = useMemo(
-    () => sortedAssets.filter((asset) => !!asset.definition?.autoMaterializePolicy),
+    () => sortedAssets.filter((asset) => !!asset.definition?.automationCondition),
     [sortedAssets],
   );
   const assetsWithoutAMP = useMemo(
-    () => sortedAssets.filter((asset) => !asset.definition?.autoMaterializePolicy),
+    () => sortedAssets.filter((asset) => !asset.definition?.automationCondition),
     [sortedAssets],
   );
 

diff --git a/...agster-ui/packages/ui-core/src/automation/types/AutomationAssetSelectionFragment.types.ts b/...agster-ui/packages/ui-core/src/automation/types/AutomationAssetSelectionFragment.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/nav/JobMetadata.tsx b/js_modules/dagster-ui/packages/ui-core/src/nav/JobMetadata.tsx
@@ -87,7 +87,7 @@ export const JobMetadata = (props: Props) => {
         <JobScheduleOrSensorTag job={metadata.job} repoAddress={repoAddress} />
       ) : null}
       <LatestRunTag pipelineName={pipelineName} repoAddress={repoAddress} />
-      {metadata.assetNodes && metadata.assetNodes.some((a) => !!a.autoMaterializePolicy) && (
+      {metadata.assetNodes && metadata.assetNodes.some((a) => !!a.automationCondition) && (
         <AutomaterializeDaemonStatusTag />
       )}
       {metadata.runsForAssetScan ? (
@@ -214,7 +214,7 @@ export const JOB_METADATA_QUERY = gql`
 
   fragment JobMetadataAssetNode on AssetNode {
     id
-    autoMaterializePolicy {
+    automationCondition {
       __typename
     }
     assetKey {

diff --git a/js_modules/dagster-ui/packages/ui-core/src/nav/types/JobMetadata.types.ts b/js_modules/dagster-ui/packages/ui-core/src/nav/types/JobMetadata.types.ts
diff --git a/...les/dagster-ui/packages/ui-core/src/schedules/types/ScheduleAssetSelectionsQuery.types.ts b/...les/dagster-ui/packages/ui-core/src/schedules/types/ScheduleAssetSelectionsQuery.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/sensors/types/SensorRoot.types.ts b/js_modules/dagster-ui/packages/ui-core/src/sensors/types/SensorRoot.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/workspace/types/WorkspaceAssetsQuery.types.ts b/js_modules/dagster-ui/packages/ui-core/src/workspace/types/WorkspaceAssetsQuery.types.ts
diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/asset_condition_evaluations.py b/python_modules/dagster-graphql/dagster_graphql/schema/asset_condition_evaluations.py
@@ -4,11 +4,9 @@
 
 import graphene
 from dagster._core.asset_graph_view.serializable_entity_subset import SerializableEntitySubset
-from dagster._core.definitions.declarative_automation.automation_condition import (
-    AutomationCondition,
-)
 from dagster._core.definitions.declarative_automation.serialized_objects import (
     AutomationConditionEvaluation,
+    AutomationConditionSnapshot,
 )
 from dagster._core.definitions.partition import PartitionsDefinition
 from dagster._core.scheduler.instigation import AutoMaterializeAssetEvaluationRecord
@@ -329,13 +327,14 @@ def _flatten_evaluation(
 
 
 def get_expanded_label(
-    item: Union[AutomationConditionEvaluation, AutomationCondition], use_label=False
+    item: Union[AutomationConditionEvaluation, AutomationConditionSnapshot],
+    use_label=False,
 ) -> Sequence[str]:
-    if isinstance(item, AutomationCondition):
+    if isinstance(item, AutomationConditionSnapshot):
         label, name, description, children = (
-            item.get_label(),
-            item.name,
-            item.description,
+            item.node_snapshot.label,
+            item.node_snapshot.name,
+            item.node_snapshot.description,
             item.children,
         )
     else: