diff options
author | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
commit | 6d6cada0970a2b341f36dac9b0fed8262ada1865 (patch) | |
tree | fc3728f15deaebd0c870838a63735659a33456e7 /web/react/components/admin_console/team_analytics.jsx | |
parent | 0b986ed3147c885af6b2f33e1ff3eb6754e8f274 (diff) | |
parent | a341dbad2b8a4564b6f270c79f2f9932e499ac80 (diff) | |
download | chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.gz chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.bz2 chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.zip |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'web/react/components/admin_console/team_analytics.jsx')
-rw-r--r-- | web/react/components/admin_console/team_analytics.jsx | 44 |
1 files changed, 40 insertions, 4 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> ); |