diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-13 09:03:42 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-13 09:03:42 -0600 |
| commit | 53b0cd8f2a24798c67505aa447b1d53b9f14197e (patch) | |
| tree | ce915cfe2dfea358f4cf2f520f42d3b26f8b9ba4 /web | |
| parent | 1e1864d78fb1ccb0d93e418f2eaa9f438838bd76 (diff) | |
| parent | fff7143a3175458d5a938cc91973ba475dc45456 (diff) | |
| download | chat-53b0cd8f2a24798c67505aa447b1d53b9f14197e.tar.gz chat-53b0cd8f2a24798c67505aa447b1d53b9f14197e.tar.bz2 chat-53b0cd8f2a24798c67505aa447b1d53b9f14197e.zip | |
Merge pull request #1855 from rgarmsen2295/plt-1006
PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/admin_console/team_analytics.jsx | 44 | ||||
| -rw-r--r-- | web/react/components/channel_header.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/time_since.jsx | 3 | ||||
| -rw-r--r-- | web/react/utils/constants.jsx | 3 |
4 files changed, 45 insertions, 7 deletions
diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx index e28699d3c..fe7230946 100644 --- a/web/react/components/admin_console/team_analytics.jsx +++ b/web/react/components/admin_console/team_analytics.jsx @@ -3,8 +3,12 @@ import * as Client from '../../utils/client.jsx'; import * as Utils from '../../utils/utils.jsx'; +import Constants from '../../utils/constants.jsx'; import LineChart from './line_chart.jsx'; +var Tooltip = ReactBootstrap.Tooltip; +var OverlayTrigger = ReactBootstrap.OverlayTrigger; + export default class TeamAnalytics extends React.Component { constructor(props) { super(props); @@ -314,9 +318,25 @@ export default class TeamAnalytics extends React.Component { <tbody> { this.state.recent_active_users.map((user) => { + const tooltip = ( + <Tooltip id={'recent-user-email-tooltip-' + user.id}> + {user.email} + </Tooltip> + ); + return ( - <tr key={user.id}> - <td>{user.email}</td> + <tr key={'recent-user-table-entry-' + user.id}> + <td> + <OverlayTrigger + delayShow={Constants.OVERLAY_TIME_DELAY} + placement='top' + overlay={tooltip} + > + <time> + {user.username} + </time> + </OverlayTrigger> + </td> <td>{Utils.displayDateTime(user.last_activity_at)}</td> </tr> ); @@ -347,9 +367,25 @@ export default class TeamAnalytics extends React.Component { <tbody> { this.state.newly_created_users.map((user) => { + const tooltip = ( + <Tooltip id={'new-user-email-tooltip-' + user.id}> + {user.email} + </Tooltip> + ); + return ( - <tr key={user.id}> - <td>{user.email}</td> + <tr key={'new-user-table-entry-' + user.id}> + <td> + <OverlayTrigger + delayShow={Constants.OVERLAY_TIME_DELAY} + placement='top' + overlay={tooltip} + > + <time> + {user.username} + </time> + </OverlayTrigger> + </td> <td>{Utils.displayDateTime(user.create_at)}</td> </tr> ); diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 59ceb038e..f64834775 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -379,7 +379,7 @@ export default class ChannelHeader extends React.Component { <th> <div className='dropdown channel-header__links'> <OverlayTrigger - delayShow={400} + delayShow={Constants.OVERLAY_TIME_DELAY} placement='bottom' overlay={recentMentionsTooltip} > diff --git a/web/react/components/time_since.jsx b/web/react/components/time_since.jsx index cffff6ee7..32947bd60 100644 --- a/web/react/components/time_since.jsx +++ b/web/react/components/time_since.jsx @@ -1,6 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import Constants from '../utils/constants.jsx'; import * as Utils from '../utils/utils.jsx'; var Tooltip = ReactBootstrap.Tooltip; @@ -30,7 +31,7 @@ export default class TimeSince extends React.Component { return ( <OverlayTrigger - delayShow={400} + delayShow={Constants.OVERLAY_TIME_DELAY} placement='top' overlay={tooltip} > diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index d6ccb9edd..d0f34293f 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -452,5 +452,6 @@ export default { label: 'embed_preview', description: 'Show preview snippet of links below message' } - } + }, + OVERLAY_TIME_DELAY: 400 }; |