Merge pull request #274 from uselagoon/org-user-remove-confirm

change: show which user is being removed
uselagoon · Jul 3, 2024 · a07070b · a07070b
2 parents 10bd107 + eb95f7b
commit a07070b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/Organizations/SharedStyles.tsx b/src/components/Organizations/SharedStyles.tsx
@@ -450,6 +450,9 @@ export const RemoveModalParagraph = styled.p`
   line-height: 24px;
   span {
     font-weight: bold;
+    &.highlight {
+      color: #4b84ff;
+    }
   }
 `;
 

diff --git a/src/components/Organizations/Users/index.js b/src/components/Organizations/Users/index.js
@@ -132,7 +132,7 @@ const Users = ({ users = [], organization, organizationId, organizationName, ref
             </Tooltip>
             {!user.email.startsWith('default-user') ? (
               <>
-                <Tooltip overlayClassName="orgTooltip" placement="bottom" title="Delete user">
+                <Tooltip overlayClassName="orgTooltip" placement="bottom" title="Remove user">
                   <DeleteOutlined
                     className="delete"
                     onClick={() => {
@@ -144,7 +144,8 @@ const Users = ({ users = [], organization, organizationId, organizationName, ref
                 <Modal isOpen={deleteUserModalOpen && selectedUser === user?.id} onRequestClose={closeUserModal}>
                   <RemoveModalHeader>Remove user?</RemoveModalHeader>
                   <RemoveModalParagraph>
-                    This action will remove this user from all groups, you might not be able to reverse this.
+                    This action will remove user <span className="highlight">{user.email}</span> from all groups in this
+                    organization, you might not be able to reverse this.
                   </RemoveModalParagraph>
 
                   <Footer>