From 59eedd207d662c39418d7825e2c95f3992d51dcf Mon Sep 17 00:00:00 2001
From: Gabe Lyons <itsgabelyons@gmail.com>
Date: Tue, 8 Mar 2022 08:27:03 -0800
Subject: [PATCH 1/2] query for custom properties on containers

---
 datahub-graphql-core/src/main/resources/entity.graphql | 4 ++--
 datahub-web-react/src/graphql/container.graphql        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index 2b0b43d97a7b9..7e38e71079c94 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -1391,12 +1391,12 @@ type ContainerProperties {
   description: String
 
   """
-  Custom properties of the Dataset
+  Custom properties of the Container
   """
   customProperties: [StringMapEntry!]
 
   """
-  Native platform URL of the dashboard
+  Native platform URL of the Container
   """
   externalUrl: String
 }
diff --git a/datahub-web-react/src/graphql/container.graphql b/datahub-web-react/src/graphql/container.graphql
index 417a46b217a75..53f1ea6a7c933 100644
--- a/datahub-web-react/src/graphql/container.graphql
+++ b/datahub-web-react/src/graphql/container.graphql
@@ -7,6 +7,10 @@ query getContainer($urn: String!) {
         properties {
             name
             description
+            customProperties {
+                key
+                value
+            }
         }
         editableProperties {
             description

From 4cf835402aa6aacb8b7f5de528b874bdd20c476d Mon Sep 17 00:00:00 2001
From: Gabe Lyons <itsgabelyons@gmail.com>
Date: Thu, 10 Mar 2022 16:00:18 -0800
Subject: [PATCH 2/2] fix browse doubleclick error

---
 datahub-web-react/src/app/browse/BrowseResultsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datahub-web-react/src/app/browse/BrowseResultsPage.tsx b/datahub-web-react/src/app/browse/BrowseResultsPage.tsx
index 25e85f67b1825..485667b8f2634 100644
--- a/datahub-web-react/src/app/browse/BrowseResultsPage.tsx
+++ b/datahub-web-react/src/app/browse/BrowseResultsPage.tsx
@@ -61,7 +61,7 @@ export const BrowseResultsPage = () => {
                 <LegacyBrowsePath type={entityType} path={path} isBrowsable />
             </Affix>
             {loading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
-            {data && data.browse && (
+            {data && data.browse && !loading && (
                 <BrowseResults
                     type={entityType}
                     rootPath={rootPath}