From 96de8965393b090bcd6c2057062759c0c28b5e8b Mon Sep 17 00:00:00 2001
From: Iris Scholten <irisscholten@Iriss-MacBook-Pro.local>
Date: Wed, 31 Jan 2018 16:43:51 -0800
Subject: [PATCH] add better messaging for removing own user record

---
 ui/src/admin/actions/chronograf.js                     | 1 -
 ui/src/admin/components/chronograf/AllUsersTableRow.js | 7 +++++--
 ui/src/style/components/confirm-button.scss            | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/src/admin/actions/chronograf.js b/ui/src/admin/actions/chronograf.js
index 4a807a836..0ad0204b1 100644
--- a/ui/src/admin/actions/chronograf.js
+++ b/ui/src/admin/actions/chronograf.js
@@ -165,7 +165,6 @@ export const deleteUserAsync = (
 ) => async dispatch => {
   dispatch(removeUser(user))
   try {
-    console.log(user)
     await deleteUserAJAX(user)
     dispatch(
       publishAutoDismissingNotification(
diff --git a/ui/src/admin/components/chronograf/AllUsersTableRow.js b/ui/src/admin/components/chronograf/AllUsersTableRow.js
index 661272a04..150806d2c 100644
--- a/ui/src/admin/components/chronograf/AllUsersTableRow.js
+++ b/ui/src/admin/components/chronograf/AllUsersTableRow.js
@@ -38,6 +38,10 @@ const AllUsersTableRow = ({
 
   const wrappedDelete = () => onDelete(user)
 
+  const removeWarning = userIsMe
+    ? 'WARNING: this will remove your user record entirely and log you out'
+    : 'Remove from all Orgs'
+
   return (
     <tr className={'chronograf-admin-table--user'}>
       <td>
@@ -75,11 +79,10 @@ const AllUsersTableRow = ({
       </td>
       <td style={{textAlign: 'right', width: colActions}}>
         <ConfirmButton
-          confirmText="Remove from all Orgs"
+          confirmText={removeWarning}
           confirmAction={wrappedDelete}
           size="btn-xs"
           text="Remove"
-          disabled={userIsMe}
           customClass="table--show-on-row-hover"
         />
       </td>
diff --git a/ui/src/style/components/confirm-button.scss b/ui/src/style/components/confirm-button.scss
index 4cca85ea0..368a64065 100644
--- a/ui/src/style/components/confirm-button.scss
+++ b/ui/src/style/components/confirm-button.scss
@@ -12,6 +12,7 @@
     top: calc(100% + 8px);
     left: 50%;
     transform: translateX(-50%);
+    z-index: 1;
   }
 }
 .confirm-button--confirmation {