diff --git a/ui/src/admin/containers/influxdb/UserPage.tsx b/ui/src/admin/containers/influxdb/UserPage.tsx index 3170b7b67..5eac8cb55 100644 --- a/ui/src/admin/containers/influxdb/UserPage.tsx +++ b/ui/src/admin/containers/influxdb/UserPage.tsx @@ -54,7 +54,7 @@ type Props = WithRouterProps & ConnectedProps & ReduxDispatchProps -const UserPageContent = ({ +const UserPage = ({ users, databases, permissions: serverPermissions, @@ -223,7 +223,7 @@ const UserPageContent = ({ }, [user, changedPermissions, userDBPermissions] ) - return ( + const body = (

@@ -295,16 +295,6 @@ const UserPageContent = ({

Database Privileges{permissionsChanged ? ' (unsaved)' : ''}

- {permissionsChanged && ( -
{isAdmin && ( @@ -363,12 +353,10 @@ const UserPageContent = ({
) -} - -const UserPage = (props: Props) => { const exitHandler = useCallback(() => { - props.router.push(`/sources/${props.params.sourceID}/admin-influxdb/users`) - }, [props.router, props.source]) + router.push(`/sources/${sourceID}/admin-influxdb/users`) + }, [router, source]) + return ( @@ -376,15 +364,33 @@ const UserPage = (props: Props) => { -