From 69e25b82c25b65cfd28cfc8ea55e0c4e66edcb4f Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Wed, 18 Oct 2017 09:11:30 -0700
Subject: [PATCH] Christmas came early

---
 ui/src/admin/containers/AdminPage.js | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ui/src/admin/containers/AdminPage.js b/ui/src/admin/containers/AdminPage.js
index 65e448d469..29d6d4c95b 100644
--- a/ui/src/admin/containers/AdminPage.js
+++ b/ui/src/admin/containers/AdminPage.js
@@ -2,24 +2,24 @@ import React, {Component, PropTypes} from 'react'
 import {connect} from 'react-redux'
 import {bindActionCreators} from 'redux'
 import {
-  loadUsersAsync,
-  loadRolesAsync,
-  loadPermissionsAsync,
   addUser,
   addRole,
-  deleteUser, // TODO rename to removeUser throughout + tests
-  deleteRole, // TODO rename to removeUser throughout + tests
   editUser,
   editRole,
+  deleteUser,
+  deleteRole,
+  loadUsersAsync,
+  loadRolesAsync,
   createUserAsync,
   createRoleAsync,
   deleteUserAsync,
   deleteRoleAsync,
+  loadPermissionsAsync,
   updateRoleUsersAsync,
-  updateRolePermissionsAsync,
-  updateUserPermissionsAsync,
   updateUserRolesAsync,
   updateUserPasswordAsync,
+  updateRolePermissionsAsync,
+  updateUserPermissionsAsync,
   filterUsers as filterUsersAction,
   filterRoles as filterRolesAction,
 } from 'src/admin/actions'
@@ -166,26 +166,26 @@ class AdminPage extends Component {
                     users={users}
                     roles={roles}
                     source={source}
-                    permissions={allowed}
                     hasRoles={hasRoles}
-                    isEditingUsers={users.some(u => u.isEditing)}
-                    isEditingRoles={roles.some(r => r.isEditing)}
-                    onClickCreate={this.handleClickCreate}
+                    permissions={allowed}
+                    onFilterUsers={filterUsers}
+                    onFilterRoles={filterRoles}
                     onEditUser={this.handleEditUser}
                     onEditRole={this.handleEditRole}
                     onSaveUser={this.handleSaveUser}
                     onSaveRole={this.handleSaveRole}
-                    onCancelEditUser={this.handleCancelEditUser}
-                    onCancelEditRole={this.handleCancelEditRole}
                     onDeleteUser={this.handleDeleteUser}
                     onDeleteRole={this.handleDeleteRole}
-                    onFilterUsers={filterUsers}
-                    onFilterRoles={filterRoles}
+                    onClickCreate={this.handleClickCreate}
+                    onCancelEditUser={this.handleCancelEditUser}
+                    onCancelEditRole={this.handleCancelEditRole}
+                    isEditingUsers={users.some(u => u.isEditing)}
+                    isEditingRoles={roles.some(r => r.isEditing)}
                     onUpdateRoleUsers={this.handleUpdateRoleUsers}
-                    onUpdateRolePermissions={this.handleUpdateRolePermissions}
-                    onUpdateUserPermissions={this.handleUpdateUserPermissions}
                     onUpdateUserRoles={this.handleUpdateUserRoles}
                     onUpdateUserPassword={this.handleUpdateUserPassword}
+                    onUpdateRolePermissions={this.handleUpdateRolePermissions}
+                    onUpdateUserPermissions={this.handleUpdateUserPermissions}
                   />
                 </div>
               </div>