From 5ec308eb98fbd31b12a8c846a7e757bd337154e9 Mon Sep 17 00:00:00 2001
From: iso9000t <119494473+iso9000t@users.noreply.github.com>
Date: Thu, 16 Jan 2025 03:11:30 +0400
Subject: [PATCH 1/3] EPMRPP-98469 || Fix truncation of User Full Name in
 Organizations

---
 .../membersPage/userNameCell/userNameCell.jsx | 46 ++++++++++---------
 .../userNameCell/userNameCell.scss            | 13 +++++-
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
index d46980bd33..aaac95afa2 100644
--- a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
+++ b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
@@ -31,28 +31,32 @@ export const UserNameCell = ({ user, badges }) => {
   return (
     <div className={cx('user-name-cell')}>
       <UserAvatar className={cx('user-avatar')} userId={user.id} thumbnail />
-      <div className={cx('full-name')}>{user.fullName}</div>
-      <div className={cx('badges')}>
-        {badges.map(({ title, type }) => {
-          const badgeContent = (
-            <div key={`${user.id}-${type}`} className={cx('badge', type)}>
-              {formatMessage(title)}
-            </div>
-          );
+      <div className={cx('name-badge-wrapper')}>
+        {' '}
+        {/* Just added this wrapper */}
+        <div className={cx('full-name')}>{user.fullName}</div>
+        <div className={cx('badges')}>
+          {badges.map(({ title, type }) => {
+            const badgeContent = (
+              <div key={`${user.id}-${type}`} className={cx('badge', type)}>
+                {formatMessage(title)}
+              </div>
+            );
 
-          return type === ADMIN_TYPE ? (
-            <Tooltip
-              key={`${user.id}-${type}-tooltip`}
-              content={formatMessage(messages.adminAccessInfo)}
-              placement="top"
-              width={248}
-            >
-              {badgeContent}
-            </Tooltip>
-          ) : (
-            badgeContent
-          );
-        })}
+            return type === ADMIN_TYPE ? (
+              <Tooltip
+                key={`${user.id}-${type}-tooltip`}
+                content={formatMessage(messages.adminAccessInfo)}
+                placement="top"
+                width={248}
+              >
+                {badgeContent}
+              </Tooltip>
+            ) : (
+              badgeContent
+            );
+          })}
+        </div>
       </div>
     </div>
   );
diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.scss b/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
index 37c1fd00f0..451de82656 100644
--- a/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
+++ b/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
@@ -27,8 +27,19 @@
     }
   }
 
-  .full-name {
+  .name-badge-wrapper {
+    display: flex;
+    align-items: center;
     margin-left: 16px;
+    min-width: 0;
+    flex: 1;
+  }
+
+  .full-name {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    min-width: 0;
   }
 
   .badges {

From 5de8feb4c42b53603704348ac9a385e17e56ed8f Mon Sep 17 00:00:00 2001
From: iso9000t <119494473+iso9000t@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:09:01 +0400
Subject: [PATCH 2/3] EPMRPP-98469 || Code review fixes - 1

---
 app/src/pages/common/membersPage/userNameCell/userNameCell.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
index aaac95afa2..07eb6a6ee4 100644
--- a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
+++ b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
@@ -33,7 +33,6 @@ export const UserNameCell = ({ user, badges }) => {
       <UserAvatar className={cx('user-avatar')} userId={user.id} thumbnail />
       <div className={cx('name-badge-wrapper')}>
         {' '}
-        {/* Just added this wrapper */}
         <div className={cx('full-name')}>{user.fullName}</div>
         <div className={cx('badges')}>
           {badges.map(({ title, type }) => {

From c5d5eb189bb2e1208eeb0d435dcf30d22952e27a Mon Sep 17 00:00:00 2001
From: iso9000t <119494473+iso9000t@users.noreply.github.com>
Date: Thu, 16 Jan 2025 20:59:11 +0400
Subject: [PATCH 3/3]  EPMRPP-98469 || Code review fixes - 2

---
 .../membersPage/userNameCell/userNameCell.jsx | 45 ++++++++++---------
 .../userNameCell/userNameCell.scss            |  1 -
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
index 07eb6a6ee4..258619110a 100644
--- a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
+++ b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
@@ -32,30 +32,31 @@ export const UserNameCell = ({ user, badges }) => {
     <div className={cx('user-name-cell')}>
       <UserAvatar className={cx('user-avatar')} userId={user.id} thumbnail />
       <div className={cx('name-badge-wrapper')}>
-        {' '}
         <div className={cx('full-name')}>{user.fullName}</div>
-        <div className={cx('badges')}>
-          {badges.map(({ title, type }) => {
-            const badgeContent = (
-              <div key={`${user.id}-${type}`} className={cx('badge', type)}>
-                {formatMessage(title)}
-              </div>
-            );
+        {badges.length > 0 && (
+          <div className={cx('badges')}>
+            {badges.map(({ title, type }) => {
+              const badgeContent = (
+                <div key={`${user.id}-${type}`} className={cx('badge', type)}>
+                  {formatMessage(title)}
+                </div>
+              );
 
-            return type === ADMIN_TYPE ? (
-              <Tooltip
-                key={`${user.id}-${type}-tooltip`}
-                content={formatMessage(messages.adminAccessInfo)}
-                placement="top"
-                width={248}
-              >
-                {badgeContent}
-              </Tooltip>
-            ) : (
-              badgeContent
-            );
-          })}
-        </div>
+              return type === ADMIN_TYPE ? (
+                <Tooltip
+                  key={`${user.id}-${type}-tooltip`}
+                  content={formatMessage(messages.adminAccessInfo)}
+                  placement="top"
+                  width={248}
+                >
+                  {badgeContent}
+                </Tooltip>
+              ) : (
+                badgeContent
+              );
+            })}
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.scss b/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
index 451de82656..30ff3443dc 100644
--- a/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
+++ b/app/src/pages/common/membersPage/userNameCell/userNameCell.scss
@@ -39,7 +39,6 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    min-width: 0;
   }
 
   .badges {