[gql] add id to resource, asset group gql objects (#16857)

## Summary Introduces an id field to external resource and asset group objects --------- Co-authored-by: Isaac Hellendag <[email protected]>
dagster-io · Sep 27, 2023 · 1a06f30 · 1a06f30 · github-actions · Sep 27, 2023
1 parent 15fabaf
commit 1a06f30
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 11 deletions.
diff --git a/js_modules/dagster-ui/packages/ui-core/src/graphql/schema.graphql b/js_modules/dagster-ui/packages/ui-core/src/graphql/schema.graphql
diff --git a/js_modules/dagster-ui/packages/ui-core/src/graphql/types.ts b/js_modules/dagster-ui/packages/ui-core/src/graphql/types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/overview/OverviewResourcesRoot.tsx b/js_modules/dagster-ui/packages/ui-core/src/overview/OverviewResourcesRoot.tsx
@@ -220,6 +220,7 @@ const OVERVIEW_RESOURCES_QUERY = gql`
                 id
                 name
                 allTopLevelResourceDetails {
+                  id
                   ...ResourceEntryFragment
                 }
               }

diff --git a/js_modules/dagster-ui/packages/ui-core/src/overview/types/OverviewResourcesRoot.types.ts b/js_modules/dagster-ui/packages/ui-core/src/overview/types/OverviewResourcesRoot.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/resources/WorkspaceResourcesRoot.tsx b/js_modules/dagster-ui/packages/ui-core/src/resources/WorkspaceResourcesRoot.tsx
@@ -152,6 +152,7 @@ const WORKSPACE_RESOURCES_QUERY = gql`
         id
         name
         allTopLevelResourceDetails {
+          id
           ...ResourceEntryFragment
         }
       }

diff --git a/js_modules/dagster-ui/packages/ui-core/src/resources/types/WorkspaceResourcesRoot.types.ts b/js_modules/dagster-ui/packages/ui-core/src/resources/types/WorkspaceResourcesRoot.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/search/types/useGlobalSearch.types.ts b/js_modules/dagster-ui/packages/ui-core/src/search/types/useGlobalSearch.types.ts
diff --git a/js_modules/dagster-ui/packages/ui-core/src/search/useGlobalSearch.tsx b/js_modules/dagster-ui/packages/ui-core/src/search/useGlobalSearch.tsx
@@ -246,6 +246,7 @@ export const SEARCH_PRIMARY_QUERY = gql`
                   id
                   name
                   assetGroups {
+                    id
                     groupName
                   }
                   pipelines {
@@ -267,6 +268,7 @@ export const SEARCH_PRIMARY_QUERY = gql`
                     pipelineName
                   }
                   allTopLevelResourceDetails {
+                    id
                     name
                   }
                 }

diff --git a/js_modules/dagster-ui/packages/ui-core/src/workspace/WorkspaceContext.tsx b/js_modules/dagster-ui/packages/ui-core/src/workspace/WorkspaceContext.tsx
@@ -130,9 +130,11 @@ export const ROOT_WORKSPACE_QUERY = gql`
       pipelineName
     }
     assetGroups {
+      id
       groupName
     }
     allTopLevelResourceDetails {
+      id
       name
     }
     ...RepositoryInfoFragment

diff --git a/js_modules/dagster-ui/packages/ui-core/src/workspace/types/WorkspaceContext.types.ts b/js_modules/dagster-ui/packages/ui-core/src/workspace/types/WorkspaceContext.types.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
@@ -1104,6 +1104,7 @@ def resolve_assetChecks(self, graphene_info: ResolveInfo) -> List[GrapheneAssetC
 
 
 class GrapheneAssetGroup(graphene.ObjectType):
+    id = graphene.NonNull(graphene.String)
     groupName = graphene.NonNull(graphene.String)
     assetKeys = non_null_list(GrapheneAssetKey)
 

diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/external.py b/python_modules/dagster-graphql/dagster_graphql/schema/external.py
@@ -344,7 +344,9 @@ def resolve_assetGroups(self, _graphene_info: ResolveInfo):
 
         return [
             GrapheneAssetGroup(
-                group_name, [external_node.asset_key for external_node in external_nodes]
+                f"{self._repository_location.name}-{self._repository.name}-{group_name}",
+                group_name,
+                [external_node.asset_key for external_node in external_nodes],
             )
             for group_name, external_nodes in groups.items()
         ]

diff --git a/python_modules/dagster-graphql/dagster_graphql/schema/resources.py b/python_modules/dagster-graphql/dagster_graphql/schema/resources.py
@@ -76,6 +76,7 @@ class Meta:
 
 
 class GrapheneResourceDetails(graphene.ObjectType):
+    id = graphene.NonNull(graphene.String)
     name = graphene.NonNull(graphene.String)
     description = graphene.String()
     configFields = graphene.Field(
@@ -112,6 +113,8 @@ def __init__(
     ):
         super().__init__()
 
+        self.id = f"{location_name}-{repository_name}-{external_resource.name}"
+
         self._location_name = check.str_param(location_name, "location_name")
         self._repository_name = check.str_param(repository_name, "repository_name")
-Original file line number
+Diff line change
@@ Expand Up / @@ -220,6 +220,7 @@ const OVERVIEW_RESOURCES_QUERY = gql` @@
                     id
                     name
                     allTopLevelResourceDetails {
+                      id
                       ...ResourceEntryFragment
                     }
                   }
@@ Expand Down @@