From 37eacef8c92364e0ce90886dce4e45cf38ba3efa Mon Sep 17 00:00:00 2001
From: Jared Scheib <jared.scheib@gmail.com>
Date: Fri, 26 Jan 2018 19:13:11 -0800
Subject: [PATCH] Show different success message for user delete from
 AllUsersPage vs UsersPage

---
 ui/src/admin/actions/chronograf.js                 | 9 +++++++--
 ui/src/admin/containers/chronograf/AllUsersPage.js | 2 +-
 ui/src/admin/containers/chronograf/UsersPage.js    | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ui/src/admin/actions/chronograf.js b/ui/src/admin/actions/chronograf.js
index d7a64731ef..e2260e8165 100644
--- a/ui/src/admin/actions/chronograf.js
+++ b/ui/src/admin/actions/chronograf.js
@@ -160,14 +160,19 @@ export const updateUserAsync = (user, updatedUser) => async dispatch => {
   }
 }
 
-export const deleteUserAsync = user => async dispatch => {
+export const deleteUserAsync = (
+  user,
+  {isAbsoluteDelete} = {}
+) => async dispatch => {
   dispatch(removeUser(user))
   try {
     await deleteUserAJAX(user)
     dispatch(
       publishAutoDismissingNotification(
         'success',
-        `User removed from organization: ${user.scheme}::${user.provider}::${user.name}`
+        `User removed from ${isAbsoluteDelete
+          ? 'all organizations and deleted'
+          : 'organization'}: ${user.scheme}::${user.provider}::${user.name}`
       )
     )
   } catch (error) {
diff --git a/ui/src/admin/containers/chronograf/AllUsersPage.js b/ui/src/admin/containers/chronograf/AllUsersPage.js
index 0222629810..822c7fade9 100644
--- a/ui/src/admin/containers/chronograf/AllUsersPage.js
+++ b/ui/src/admin/containers/chronograf/AllUsersPage.js
@@ -45,7 +45,7 @@ class AllUsersPage extends Component {
 
   handleDeleteUser = user => {
     const {actionsAdmin: {deleteUserAsync}} = this.props
-    deleteUserAsync(user)
+    deleteUserAsync(user, {isAbsoluteDelete: true})
   }
 
   async componentWillMount() {
diff --git a/ui/src/admin/containers/chronograf/UsersPage.js b/ui/src/admin/containers/chronograf/UsersPage.js
index 250b83b5c7..e306574694 100644
--- a/ui/src/admin/containers/chronograf/UsersPage.js
+++ b/ui/src/admin/containers/chronograf/UsersPage.js
@@ -33,7 +33,7 @@ class UsersPage extends Component {
 
   handleDeleteUser = user => {
     const {actions: {deleteUserAsync}} = this.props
-    deleteUserAsync(user)
+    deleteUserAsync(user, {isAbsoluteDelete: false})
   }
 
   async componentWillMount() {