diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-03-30 12:46:47 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-03-30 09:46:47 -0700 |
commit | 689cac535e45c47a4f603b236dc129dd456efcc9 (patch) | |
tree | 767ef80b310d6d073840bd5216da38c439f6e193 /webapp/components/user_list.jsx | |
parent | 9a9729f22fea7275637eafb4046900c9f372ec56 (diff) | |
download | chat-689cac535e45c47a4f603b236dc129dd456efcc9.tar.gz chat-689cac535e45c47a4f603b236dc129dd456efcc9.tar.bz2 chat-689cac535e45c47a4f603b236dc129dd456efcc9.zip |
PLT-2713/PLT-6028 Added System Users list to System Console (#5882)
* PLT-2713 Added ability for admins to list users not in any team
* Updated style of unit test
* Split SearchableUserList to give better control over its properties
* Added users without any teams to the user store
* Added ManageUsers page
* Renamed ManageUsers to SystemUsers
* Added ability to search by user id in SystemUsers page
* Added SystemUsersDropdown
* Removed unnecessary injectIntl
* Created TeamUtils
* Reduced scope of system console heading CSS
* Added team filter to TeamAnalytics page
* Updated admin console sidebar
* Removed unnecessary TODO
* Removed unused reference to deleted modal
* Fixed system console sidebar not scrolling on first load
* Fixed TeamAnalytics page not rendering on first load
* Fixed chart.js throwing an error when switching between teams
* Changed TeamAnalytics header to show the team's display name
* Fixed appearance of TeamAnalytics and SystemUsers on small screen widths
* Fixed placement of 'No users found' message
* Fixed teams not appearing in SystemUsers on first load
* Updated user count text for SystemUsers
* Changed search by id fallback to trigger less often
* Fixed SystemUsers list items not updating when searching
* Fixed localization strings for SystemUsers page
Diffstat (limited to 'webapp/components/user_list.jsx')
-rw-r--r-- | webapp/components/user_list.jsx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/webapp/components/user_list.jsx b/webapp/components/user_list.jsx index d34404c89..c521b95cc 100644 --- a/webapp/components/user_list.jsx +++ b/webapp/components/user_list.jsx @@ -8,6 +8,18 @@ import React from 'react'; import {FormattedMessage} from 'react-intl'; export default class UserList extends React.Component { + constructor(props) { + super(props); + + this.scrollToTop = this.scrollToTop.bind(this); + } + + scrollToTop() { + if (this.refs.container) { + this.refs.container.scrollTop = 0; + } + } + render() { const users = this.props.users; @@ -31,12 +43,12 @@ export default class UserList extends React.Component { content = ( <div key='no-users-found' - className='no-channel-message' + className='more-modal__placeholder-row' > - <p className='primary-message'> + <p> <FormattedMessage id='user_list.notFound' - defaultMessage='No users found :(' + defaultMessage='No users found' /> </p> </div> @@ -44,7 +56,7 @@ export default class UserList extends React.Component { } return ( - <div> + <div ref='container'> {content} </div> ); |