From c9b40ec1caa645b6706a80fb1547997257e4090c Mon Sep 17 00:00:00 2001
From: darapuk <49173956+darapuk@users.noreply.github.com>
Date: Thu, 24 Mar 2022 12:46:58 -0700
Subject: [PATCH] fix: Update GroupProfile to read from properties over
 deprecated info aspect (#4475)

---
 .../src/app/entity/group/GroupProfile.tsx       | 17 +++++++++++++----
 datahub-web-react/src/graphql/group.graphql     |  5 +++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/datahub-web-react/src/app/entity/group/GroupProfile.tsx b/datahub-web-react/src/app/entity/group/GroupProfile.tsx
index 0c4eb37a6f..f401b7bb15 100644
--- a/datahub-web-react/src/app/entity/group/GroupProfile.tsx
+++ b/datahub-web-react/src/app/entity/group/GroupProfile.tsx
@@ -89,11 +89,20 @@ export default function GroupProfile() {
     // Side bar data
     const sideBarData = {
         photoUrl: undefined,
-        avatarName: data?.corpGroup?.info?.displayName || data?.corpGroup?.name,
-        name: data?.corpGroup?.info?.displayName || data?.corpGroup?.name || undefined,
-        email: data?.corpGroup?.editableProperties?.email || undefined,
+        avatarName:
+            data?.corpGroup?.properties?.displayName ||
+            data?.corpGroup?.name ||
+            data?.corpGroup?.info?.displayName ||
+            undefined,
+        name:
+            data?.corpGroup?.properties?.displayName ||
+            data?.corpGroup?.name ||
+            data?.corpGroup?.info?.displayName ||
+            undefined,
+        email: data?.corpGroup?.editableProperties?.email || data?.corpGroup?.properties?.email || undefined,
         slack: data?.corpGroup?.editableProperties?.slack || undefined,
-        aboutText: data?.corpGroup?.editableProperties?.description || undefined,
+        aboutText:
+            data?.corpGroup?.editableProperties?.description || data?.corpGroup?.properties?.description || undefined,
         groupMemberRelationships: groupMemberRelationships as EntityRelationshipsResult,
         groupOwnerShip: data?.corpGroup?.ownership as Ownership,
         urn,
diff --git a/datahub-web-react/src/graphql/group.graphql b/datahub-web-react/src/graphql/group.graphql
index 1ff0971b9b..39dd6e891c 100644
--- a/datahub-web-react/src/graphql/group.graphql
+++ b/datahub-web-react/src/graphql/group.graphql
@@ -13,6 +13,11 @@ query getGroup($urn: String!, $membersCount: Int!) {
             slack
             email
         }
+        properties {
+            displayName
+            description
+            email
+        }
         ownership {
             ...ownershipFields
         }