From b0801de7ad6ce75114a0dff6b405a8102f77d921 Mon Sep 17 00:00:00 2001
From: John Joyce <jjoyce6@nd.edu>
Date: Fri, 5 Feb 2021 12:56:50 -0800
Subject: [PATCH] fix(GraphQL): Add schemaMetadata mapping & correctly form
 path string (#2084)

* Fixing DataHub frontend Browse bug

* Add schema mapping

Co-authored-by: John Joyce <john@acryl.io>
---
 .../linkedin/datahub/graphql/types/dataset/DatasetType.java    | 3 ++-
 .../linkedin/datahub/graphql/types/mappers/DatasetMapper.java  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
index 28cf124ea9..eecb2f71ec 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
@@ -107,8 +107,9 @@ public class DatasetType implements SearchableEntityType<Dataset>, BrowsableEnti
                                 int start,
                                 int count) throws Exception {
         final Map<String, String> facetFilters = ResolverUtils.buildFacetFilters(filters, FACET_FIELDS);
+        final String pathStr = path.size() > 0 ? BROWSE_PATH_DELIMITER + String.join(BROWSE_PATH_DELIMITER, path) : "";
         final BrowseResult result = _datasetsClient.browse(
-                BROWSE_PATH_DELIMITER + String.join(BROWSE_PATH_DELIMITER, path),
+                pathStr,
                 facetFilters,
                 start,
                 count);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/DatasetMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/DatasetMapper.java
index bf5128308d..d16f82af0c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/DatasetMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/DatasetMapper.java
@@ -42,6 +42,7 @@ public class DatasetMapper implements ModelMapper<com.linkedin.dataset.Dataset,
             if (dataset.getSchemaMetadata().hasDeleted()) {
                 result.setDeleted(AuditStampMapper.map(dataset.getSchemaMetadata().getDeleted()));
             }
+            result.setSchema(SchemaMetadataMapper.map(dataset.getSchemaMetadata()));
         }
         if (dataset.hasPlatformNativeType()) {
             result.setPlatformNativeType(Enum.valueOf(PlatformNativeType.class, dataset.getPlatformNativeType().name()));