From b60898daffe664e11f9fdb72a5e432837f61a870 Mon Sep 17 00:00:00 2001
From: Shrushti Polekar <shrushtipolekar@gmail.com>
Date: Fri, 6 Jun 2025 19:59:47 +0530
Subject: [PATCH] fix profile redirection issue for displayname (#21624)

(cherry picked from commit d529c9fe9d990504abf74ded53356450cbedeec2)
---
 .../ActivityFeedcardNew.component.tsx         |  4 +--
 .../Task/TaskTab/TaskTabNew.component.tsx     | 14 ++++------
 .../TasktabIncidentManagerHeaderNew.tsx       |  7 +++--
 ...rofileSectionUserDetailsCard.component.tsx |  2 +-
 .../PopOverCard/UserPopOverCard.test.tsx      | 26 +++++++++++++++++++
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardNew/ActivityFeedcardNew.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardNew/ActivityFeedcardNew.component.tsx
index f5aa7596edd..8f70aad3d41 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardNew/ActivityFeedcardNew.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardNew/ActivityFeedcardNew.component.tsx
@@ -310,11 +310,11 @@ const ActivityFeedCardNew = ({
           ) : (
             <div className="d-flex gap-2">
               <div>
-                <UserPopOverCard userName={getEntityName(currentUser)}>
+                <UserPopOverCard userName={currentUser?.name ?? ''}>
                   <div className="d-flex items-center">
                     <ProfilePicture
                       key={feed.id}
-                      name={getEntityName(currentUser)}
+                      name={currentUser?.name ?? ''}
                       width="32"
                     />
                   </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
index 5d55d02c810..bbd7c7741ad 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
@@ -958,20 +958,16 @@ export const TaskTabNew = ({
                 {taskThread?.task?.assignees?.length === 1 ? (
                   <div className="d-flex items-center gap-2">
                     <UserPopOverCard
-                      userName={
-                        taskThread?.task?.assignees[0].displayName ?? ''
-                      }>
+                      userName={taskThread?.task?.assignees[0].name ?? ''}>
                       <div className="d-flex items-center">
                         <ProfilePicture
-                          name={
-                            taskThread?.task?.assignees[0].displayName ?? ''
-                          }
+                          name={taskThread?.task?.assignees[0].name ?? ''}
                           width="24"
                         />
                       </div>
                     </UserPopOverCard>
                     <Typography.Text className="text-grey-body">
-                      {taskThread?.task?.assignees[0].displayName}
+                      {getEntityName(taskThread?.task?.assignees[0])}
                     </Typography.Text>
                   </div>
                 ) : (
@@ -1132,11 +1128,11 @@ export const TaskTabNew = ({
               taskThread?.task?.status === ThreadTaskStatus.Open && (
                 <div className="d-flex gap-2">
                   <div className="profile-picture">
-                    <UserPopOverCard userName={getEntityName(currentUser)}>
+                    <UserPopOverCard userName={currentUser?.name ?? ''}>
                       <div className="d-flex items-center">
                         <ProfilePicture
                           key={taskThread.id}
-                          name={getEntityName(currentUser)}
+                          name={currentUser?.name ?? ''}
                           width="32"
                         />
                       </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TasktabIncidentManagerHeaderNew.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TasktabIncidentManagerHeaderNew.tsx
index fcedd7dfaa9..9e9adc5872c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TasktabIncidentManagerHeaderNew.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TasktabIncidentManagerHeaderNew.tsx
@@ -145,17 +145,16 @@ const TaskTabIncidentManagerHeaderNew = ({ thread }: { thread: Thread }) => {
         <Col className="flex items-center gap-2" span={16}>
           {thread?.task?.assignees?.length === 1 ? (
             <div className="d-flex items-center gap-2">
-              <UserPopOverCard
-                userName={thread?.task?.assignees[0].displayName ?? ''}>
+              <UserPopOverCard userName={thread?.task?.assignees[0].name ?? ''}>
                 <div className="d-flex items-center">
                   <ProfilePicture
-                    name={thread?.task?.assignees[0].displayName ?? ''}
+                    name={thread?.task?.assignees[0].name ?? ''}
                     width="24"
                   />
                 </div>
               </UserPopOverCard>
               <Typography.Text className="text-grey-body">
-                {thread?.task?.assignees[0].displayName}
+                {getEntityName(thread?.task?.assignees[0])}
               </Typography.Text>
             </div>
           ) : (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx
index 14afa95cb65..921f2631729 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx
@@ -239,7 +239,7 @@ const ProfileSectionUserDetailsCard = ({
       </Popover>
 
       <div className="m-t-sm">
-        <UserPopOverCard userName={getEntityName(userData)}>
+        <UserPopOverCard userName={userData?.name}>
           <div className="d-flex items-center">
             <ProfilePicture
               data-testid="replied-user"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.test.tsx
index ceb83731e22..0c34ea13139 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.test.tsx
@@ -85,6 +85,11 @@ jest.mock('../ProfilePicture/ProfilePicture', () => {
   return jest.fn().mockImplementation(() => <div>ProfilePicture</div>);
 });
 
+const mockPush = jest.fn();
+(useHistory as jest.Mock).mockImplementation(() => ({
+  push: mockPush,
+}));
+
 describe('Test UserPopOverCard components', () => {
   describe('UserTeams Component', () => {
     it('should render teams when teams are available', () => {
@@ -195,6 +200,27 @@ describe('Test UserPopOverCard components', () => {
       expect(screen.getByText('testUser')).toBeInTheDocument();
     });
 
+    it('should navigate using name instead of display name when clicking display name in tooltip', () => {
+      (useUserProfile as jest.Mock).mockImplementation(() => [
+        null,
+        null,
+        mockUserData,
+      ]);
+
+      render(
+        <PopoverTitle
+          profilePicture={<div>ProfilePicture</div>}
+          type={OwnerType.USER}
+          userName="testUser"
+        />
+      );
+
+      const displayNameButton = screen.getByText('Test User');
+      displayNameButton.click();
+
+      expect(mockPush).toHaveBeenCalledWith('/users/testUser');
+    });
+
     it('should handle click on user name', () => {
       const mockPush = jest.fn();
       (useHistory as jest.Mock).mockImplementationOnce(() => ({