Merge branch 'master' into test-case-urn-1

datahub-project · Mar 22, 2024 · c8b28b5 · c8b28b5
2 parents f19e7b2 + 8cb65bd
commit c8b28b5
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/.github/actions/ci-optimization/action.yml b/.github/actions/ci-optimization/action.yml
@@ -70,6 +70,7 @@ runs:
             - "metadata-jobs/**"
             - "metadata-service/**"
             - "metadata-utils/**"
+            - "datahub-graphql-core/**"
             - "smoke-test/**"
             - "docker/**"
           kafka-setup:

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -1183,11 +1183,12 @@ private void configureMutationResolvers(final RuntimeWiring.Builder builder) {
                     new DeleteGlossaryEntityResolver(this.entityClient, this.entityService))
                 .dataFetcher(
                     "updateName", new UpdateNameResolver(this.entityService, this.entityClient))
-                .dataFetcher("addRelatedTerms", new AddRelatedTermsResolver(this.entityService,
-                    this.entityClient))
                 .dataFetcher(
-                    "removeRelatedTerms", new RemoveRelatedTermsResolver(this.entityService,
-                    this.entityClient))
+                    "addRelatedTerms",
+                    new AddRelatedTermsResolver(this.entityService, this.entityClient))
+                .dataFetcher(
+                    "removeRelatedTerms",
+                    new RemoveRelatedTermsResolver(this.entityService, this.entityClient))
                 .dataFetcher(
                     "createNativeUserResetToken",
                     new CreateNativeUserResetTokenResolver(this.nativeUserService))

diff --git a/...rc/main/java/com/linkedin/datahub/graphql/resolvers/glossary/AddRelatedTermsResolver.java b/...rc/main/java/com/linkedin/datahub/graphql/resolvers/glossary/AddRelatedTermsResolver.java
@@ -47,7 +47,6 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
           if (GlossaryUtils.canManageChildrenEntities(context, parentUrn, _entityClient)) {
             try {
               final TermRelationshipType relationshipType = input.getRelationshipType();
-              final Urn urn = Urn.createFromString(input.getUrn());
               final List<Urn> termUrns =
                   input.getTermUrns().stream().map(UrnUtils::getUrn).collect(Collectors.toList());
               validateRelatedTermsInput(urn, termUrns);

diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
@@ -198,7 +198,11 @@ export class DatasetEntity implements Entity<Dataset> {
                     component: AccessManagement,
                     display: {
                         visible: (_, _1) => this.appconfig().config.featureFlags.showAccessManagement,
-                        enabled: (_, _2) => true,
+                        enabled: (_, dataset: GetDatasetQuery) => {
+                            const accessAspect = dataset?.dataset?.access;
+                            const rolesList = accessAspect?.roles;
+                            return !!accessAspect && !!rolesList && rolesList.length > 0;
+                        },
                     },
                 },
                 {

diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
@@ -103,6 +103,13 @@ fragment nonSiblingDatasetFields on Dataset {
     assertions(start: 0, count: 1) {
         total
     }
+    access {
+        roles {
+            role {
+                urn
+            }
+        }
+    }
     operations(limit: 1) {
         timestampMillis
         lastUpdatedTimestamp

diff --git a/...ata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java b/...ata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java
@@ -24,7 +24,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
@@ -193,12 +192,14 @@ private void submitMetrics(ExecutionResult executionResult) {
         // Extract top level resolver, parent is top level query. Assumes single query per call.
         List<Map<String, Object>> resolvers =
             (List<Map<String, Object>>) executionData.get("resolvers");
-        Optional<Map<String, Object>> parentResolver =
-            resolvers.stream()
-                .filter(resolver -> resolver.get("parentType").equals("Query"))
-                .findFirst();
         String fieldName =
-            parentResolver.isPresent() ? (String) parentResolver.get().get("fieldName") : "UNKNOWN";
+            resolvers.stream()
+                .filter(
+                    resolver -> List.of("Query", "Mutation").contains(resolver.get("parentType")))
+                .findFirst()
+                .map(parentResolver -> parentResolver.get("fieldName"))
+                .map(Object::toString)
+                .orElse("UNKNOWN");
         MetricUtils.get()
             .histogram(MetricRegistry.name(this.getClass(), fieldName))
             .update(totalDuration);