Variable naming and displaying username, title, and department below …

…displayname
datahub-project · Dec 3, 2024 · fffa18f · fffa18f
1 parent 954f6b1
commit fffa18f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/...-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/...-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
@@ -79,15 +79,15 @@ export const EditOwnersModal = ({
         const avatarUrl =
             (entity.type === EntityType.CorpUser && (entity as CorpUser).editableProperties?.pictureLink) || undefined;
         const isCorpUser = (entity.type as EntityType) === EntityType.CorpUser;
-        const displayCorpUserDepartmentName =
+        const corpUserDepartmentName =
             (entity.type === EntityType.CorpUser && (entity as CorpUser).properties?.departmentName) || '';
-        const displayCorpUserUserName = (entity.type === EntityType.CorpUser && (entity as CorpUser).username) || '';
-
+        const corpUserId = (entity.type === EntityType.CorpUser && (entity as CorpUser).username) || '';
+        const corpUserTitle = (entity.type === EntityType.CorpUser && (entity as CorpUser).properties?.title) || '';
         const displayName = entityRegistry.getDisplayName(entity.type, entity);
         const concatenatedValue = isCorpUser
-            ? displayName
-                  .concat(displayCorpUserUserName ? ` - ${displayCorpUserUserName}` : '')
-                  .concat(displayCorpUserDepartmentName ? ` - ${displayCorpUserDepartmentName}` : '')
+            ? `${displayName}\n${corpUserId ? `${corpUserId}` : ''}${corpUserTitle ? ` ${corpUserTitle}` : ''}${
+                  corpUserDepartmentName ? ` ${corpUserDepartmentName}` : ''
+              }`
             : displayName;
 
         return (

diff --git a/datahub-web-react/src/app/shared/OwnerLabel.tsx b/datahub-web-react/src/app/shared/OwnerLabel.tsx
@@ -27,7 +27,14 @@ export const OwnerLabel = ({ name, avatarUrl, type }: Props) => {
         <OwnerContainerWrapper>
             <OwnerContentWrapper>
                 <CustomAvatar size={24} name={name} photoUrl={avatarUrl} isGroup={type === EntityType.CorpGroup} />
-                <div>{name}</div>
+                <div>
+                    {name.split('\n').map((line, index) => (
+                        <span key={index} style={index > 0 ? { color: 'gray' } : {}}>
+                            {line}
+                            <br />
+                        </span>
+                    ))}
+                </div>
             </OwnerContentWrapper>
         </OwnerContainerWrapper>
     );

diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
@@ -418,6 +418,7 @@ fragment searchResultsWithoutSchemaField on Entity {
             fullName
             email
             departmentName
+            title
         }
         info {
             active
@@ -428,6 +429,7 @@ fragment searchResultsWithoutSchemaField on Entity {
             fullName
             email
             departmentName
+            title
         }
         editableProperties {
             displayName