[dagit] Add opNames field to AssetNode (#7565)

dagster-io · Apr 25, 2022 · 2f7ccad · 2f7ccad
1 parent 5480b04
commit 2f7ccad
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 9 deletions.
diff --git a/js_modules/dagit/packages/core/src/asset-graph/AssetGraphExplorer.tsx b/js_modules/dagit/packages/core/src/asset-graph/AssetGraphExplorer.tsx
@@ -170,11 +170,11 @@ const AssetGraphExplorerWithData: React.FC<
       e.stopPropagation();
 
       const token = tokenForAssetKey(assetKey);
-      let clicked: {opName: string | null; jobName: string | null} = {opName: null, jobName: null};
+      let clicked: {opNames: string[]; jobName: string | null} = {opNames: [], jobName: null};
 
       if (node?.definition) {
         // The asset's defintion was provided in our job.assetNodes query. Show it in the current graph.
-        clicked = {opName: node.definition.opName, jobName: explorerPath.pipelineName};
+        clicked = {opNames: node.definition.opNames, jobName: explorerPath.pipelineName};
       } else {
         // The asset's definition was not provided in our query for job.assetNodes. This means
         // it's in another job or is a source asset not defined in the repository at all.
@@ -185,7 +185,7 @@ const AssetGraphExplorerWithData: React.FC<
       let nextOpsNameSelection = token;
 
       // If no opName, this is a source asset.
-      if (clicked.jobName !== explorerPath.pipelineName || !clicked.opName) {
+      if (clicked.jobName !== explorerPath.pipelineName || !clicked.opNames.length) {
         nextOpsQuery = '';
       } else if (e.shiftKey || e.metaKey) {
         const existing = explorerPath.opNames[0].split(',');
@@ -296,7 +296,7 @@ const AssetGraphExplorerWithData: React.FC<
                         }}
                         style={{overflow: 'visible'}}
                       >
-                        {!graphNode || !graphNode.definition.opName ? (
+                        {!graphNode || !graphNode.definition.opNames.length ? (
                           <ForeignNode assetKey={{path}} />
                         ) : (
                           <AssetNode
@@ -323,8 +323,8 @@ const AssetGraphExplorerWithData: React.FC<
                     {
                       ...explorerPath,
                       opNames:
-                        selectedGraphNodes.length && selectedGraphNodes[0].definition.opName
-                          ? [selectedGraphNodes[0].definition.opName]
+                        selectedGraphNodes.length && selectedGraphNodes[0].definition.opNames.length
+                          ? selectedGraphNodes[0].definition.opNames
                           : [],
                     },
                     'replace',

diff --git a/js_modules/dagit/packages/core/src/asset-graph/AssetNode.tsx b/js_modules/dagit/packages/core/src/asset-graph/AssetNode.tsx
@@ -174,6 +174,7 @@ export const ASSET_NODE_LIVE_FRAGMENT = gql`
   fragment AssetNodeLiveFragment on AssetNode {
     id
     opName
+    opNames
     repository {
       id
     }
@@ -191,6 +192,7 @@ export const ASSET_NODE_FRAGMENT = gql`
   fragment AssetNodeFragment on AssetNode {
     id
     opName
+    opNames
     description
     partitionDefinition
     computeKind

diff --git a/js_modules/dagit/packages/core/src/asset-graph/types/AssetForNavigationQuery.ts b/js_modules/dagit/packages/core/src/asset-graph/types/AssetForNavigationQuery.ts
diff --git a/js_modules/dagit/packages/core/src/asset-graph/types/AssetGraphLiveQuery.ts b/js_modules/dagit/packages/core/src/asset-graph/types/AssetGraphLiveQuery.ts
diff --git a/js_modules/dagit/packages/core/src/asset-graph/types/AssetGraphQuery.ts b/js_modules/dagit/packages/core/src/asset-graph/types/AssetGraphQuery.ts
diff --git a/js_modules/dagit/packages/core/src/asset-graph/types/AssetNodeFragment.ts b/js_modules/dagit/packages/core/src/asset-graph/types/AssetNodeFragment.ts
diff --git a/js_modules/dagit/packages/core/src/asset-graph/types/AssetNodeLiveFragment.ts b/js_modules/dagit/packages/core/src/asset-graph/types/AssetNodeLiveFragment.ts
diff --git a/js_modules/dagit/packages/core/src/asset-graph/useFindAssetInWorkspace.tsx b/js_modules/dagit/packages/core/src/asset-graph/useFindAssetInWorkspace.tsx
@@ -12,16 +12,16 @@ export function useFindAssetInWorkspace() {
   const apollo = useApolloClient();
 
   return React.useCallback(
-    async (key: AssetKeyInput): Promise<{opName: string | null; jobName: string | null}> => {
+    async (key: AssetKeyInput): Promise<{opNames: string[]; jobName: string | null}> => {
       const {data} = await apollo.query<AssetForNavigationQuery, AssetForNavigationQueryVariables>({
         query: ASSET_FOR_NAVIGATION_QUERY,
         variables: {key},
       });
       if (data?.assetOrError.__typename === 'Asset' && data?.assetOrError.definition) {
         const def = data.assetOrError.definition;
-        return {opName: def.opName, jobName: def.jobNames[0] || null};
+        return {opNames: def.opNames, jobName: def.jobNames[0] || null};
       }
-      return {opName: null, jobName: null};
+      return {opNames: [], jobName: null};
     },
     [apollo],
   );
@@ -36,6 +36,7 @@ const ASSET_FOR_NAVIGATION_QUERY = gql`
         definition {
           id
           opName
+          opNames
           jobNames
         }
       }

diff --git a/js_modules/dagit/packages/core/src/assets/AssetDefinedInMultipleReposNotice.tsx b/js_modules/dagit/packages/core/src/assets/AssetDefinedInMultipleReposNotice.tsx
@@ -60,6 +60,7 @@ const ASSET_ID_SCAN_QUERY = gql`
           assetNodes {
             id
             opName
+            opNames
           }
         }
       }

diff --git a/js_modules/dagit/packages/core/src/assets/AssetNodeDefinition.tsx b/js_modules/dagit/packages/core/src/assets/AssetNodeDefinition.tsx
@@ -201,6 +201,7 @@ export const ASSET_NODE_DEFINITION_FRAGMENT = gql`
     id
     description
     opName
+    opNames
     jobNames
     repository {
       id
@@ -219,6 +220,7 @@ export const ASSET_NODE_DEFINITION_FRAGMENT = gql`
       asset {
         id
         opName
+        opNames
         jobNames
         ...AssetNodeFragment
         ...AssetNodeLiveFragment
@@ -228,6 +230,7 @@ export const ASSET_NODE_DEFINITION_FRAGMENT = gql`
       asset {
         id
         opName
+        opNames
         jobNames
         ...AssetNodeFragment
         ...AssetNodeLiveFragment

diff --git a/js_modules/dagit/packages/core/src/assets/AssetTable.tsx b/js_modules/dagit/packages/core/src/assets/AssetTable.tsx
@@ -280,6 +280,7 @@ export const ASSET_TABLE_FRAGMENT = gql`
     definition {
       id
       opName
+      opNames
       description
       repository {
         id

diff --git a/js_modules/dagit/packages/core/src/assets/types/AssetCatalogTableQuery.ts b/js_modules/dagit/packages/core/src/assets/types/AssetCatalogTableQuery.ts
diff --git a/js_modules/dagit/packages/core/src/assets/types/AssetIdScanQuery.ts b/js_modules/dagit/packages/core/src/assets/types/AssetIdScanQuery.ts
diff --git a/js_modules/dagit/packages/core/src/assets/types/AssetNodeDefinitionFragment.ts b/js_modules/dagit/packages/core/src/assets/types/AssetNodeDefinitionFragment.ts
diff --git a/js_modules/dagit/packages/core/src/assets/types/AssetQuery.ts b/js_modules/dagit/packages/core/src/assets/types/AssetQuery.ts
diff --git a/js_modules/dagit/packages/core/src/assets/types/AssetTableFragment.ts b/js_modules/dagit/packages/core/src/assets/types/AssetTableFragment.ts
diff --git a/js_modules/dagit/packages/core/src/graphql/schema.graphql b/js_modules/dagit/packages/core/src/graphql/schema.graphql
diff --git a/js_modules/dagit/packages/core/src/pipelines/GraphExplorer.tsx b/js_modules/dagit/packages/core/src/pipelines/GraphExplorer.tsx
@@ -319,6 +319,7 @@ export const GRAPH_EXPLORER_ASSET_NODE_FRAGMENT = gql`
   fragment GraphExplorerAssetNodeFragment on AssetNode {
     id
     opName
+    opNames
     assetKey {
       path
     }

diff --git a/js_modules/dagit/packages/core/src/pipelines/types/GraphExplorerAssetNodeFragment.ts b/js_modules/dagit/packages/core/src/pipelines/types/GraphExplorerAssetNodeFragment.ts
diff --git a/js_modules/dagit/packages/core/src/pipelines/types/PipelineExplorerRootQuery.ts b/js_modules/dagit/packages/core/src/pipelines/types/PipelineExplorerRootQuery.ts
diff --git a/js_modules/dagit/packages/core/src/workspace/RepositoryAssetsList.tsx b/js_modules/dagit/packages/core/src/workspace/RepositoryAssetsList.tsx
@@ -27,6 +27,7 @@ const REPOSITORY_ASSETS_LIST_QUERY = gql`
             path
           }
           opName
+          opNames
           description
           repository {
             id

diff --git a/js_modules/dagit/packages/core/src/workspace/types/RepositoryAssetsListQuery.ts b/js_modules/dagit/packages/core/src/workspace/types/RepositoryAssetsListQuery.ts
diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/asset_graph.py b/python_modules/dagster-graphql/dagster_graphql/schema/asset_graph.py
@@ -101,6 +101,7 @@ class GrapheneAssetNode(graphene.ObjectType):
     metadata_entries = non_null_list(GrapheneMetadataEntry)
     op = graphene.Field(GrapheneSolidDefinition)
     opName = graphene.String()
+    opNames = non_null_list(graphene.String)
     partitionKeys = non_null_list(graphene.String)
     partitionDefinition = graphene.String()
     repository = graphene.NonNull(lambda: external.GrapheneRepository)
@@ -368,6 +369,13 @@ def resolve_op(
         else:
             return None
 
+    def resolve_opNames(self, _graphene_info) -> List[str]:
+        # todo OwenKephart: Return the correct list of op names.
+        if self._external_asset_node.op_name:
+            return [self._external_asset_node.op_name]
+        else:
+            return []
+
     def resolve_partitionDefinition(self, _graphene_info) -> Optional[str]:
         partitions_def_data = self._external_asset_node.partitions_def_data
         if partitions_def_data: