wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-03 09:29:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated with User-Status-Refactor API - User Detail Updated

Browse Source
This commit is contained in:
Belen Curcio
2017-12-11 09:10:50 -03:00
parent 26abd02032
commit e66e23bbf6
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/components/UserDetail.js
+1 -1
View File
@@ -176,7 +176,7 @@ class UserDetail extends React.Component {
</ActionsMenu>
}
{banned || suspended && <UserInfoTooltip user={user} banned={banned} suspended={suspended} />}
{(banned || suspended) && <UserInfoTooltip user={user} banned={banned} suspended={suspended} />}
<div>
<ul className={styles.userDetailList}>
client/coral-admin/src/components/UserInfoTooltip.css
+4
View File
@@ -60,6 +60,10 @@
list-style: none;
}
.strongItem {
margin-right: 3px;
}
.descriptionItem {
font-size: 0.9em;
}
client/coral-admin/src/components/UserInfoTooltip.js
+18 -12
View File
@@ -4,6 +4,7 @@ import cn from 'classnames';
import {Icon} from 'coral-ui';
import styles from './UserInfoTooltip.css';
import ClickOutside from 'coral-framework/components/ClickOutside';
import moment from 'moment';
const initialState = {menuVisible: false};
@@ -18,9 +19,14 @@ class UserInfoTooltip extends React.Component {
this.setState({menuVisible: false});
}
getLastHistoryItem = (user, status = 'banned') => {
const userHistory = user.state.status[status].history;
return userHistory[userHistory.length - 1];
}
render() {
const {menuVisible} = this.state;
const {banned, suspended} = this.props;
const {user, banned, suspended} = this.props;
return (
<ClickOutside onClickOutside={this.hideMenu}>
@@ -36,12 +42,12 @@ class UserInfoTooltip extends React.Component {
<div className={cn(styles.description, 'talk-admin-user-info-tooltip-description-banned')}>
<ul className={cn(styles.descriptionList, 'talk-admin-user-info-tooltip-description-list')}>
<li className={cn(styles.descriptionItem, 'talk-admin-user-info-tooltip-description-item')}>
<strong>Banned On</strong>
<span></span>
<strong className={styles.strongItem}>Banned On</strong>
<span>{moment(new Date(this.getLastHistoryItem(user, 'banned').created_at)).format('MMMM Do YYYY, h:mm:ss a')}</span>
</li>
<li className={cn(styles.descriptionItem, 'talk-admin-user-info-tooltip-description-item')}>
<strong>By</strong>
<span></span>
<strong className={styles.strongItem}>By</strong>
<span>{this.getLastHistoryItem(user, 'banned').assigned_by.username}</span>
</li>
</ul>
</div>
@@ -53,20 +59,20 @@ class UserInfoTooltip extends React.Component {
<div className={cn(styles.description, 'talk-admin-user-info-tooltip-description-suspended')}>
<ul className={cn(styles.descriptionList, 'talk-admin-user-info-tooltip-description-list')}>
<li className={cn(styles.descriptionItem, 'talk-admin-user-info-tooltip-description-item')}>
<strong>Suspension</strong>
<strong className={styles.strongItem}>Suspension</strong>
<span></span>
</li>
<li className={cn(styles.descriptionItem, 'talk-admin-user-info-tooltip-description-item')}>
<strong>By</strong>
<span></span>
<strong className={styles.strongItem}>By</strong>
<span>{this.getLastHistoryItem(user, 'suspended').assigned_by.username}</span>
</li>
<li className={cn(styles.descriptionItem, 'talk-admin-user-info-tooltip-description-item')}>
<strong>Start</strong>
<span></span>
<strong className={styles.strongItem}>Start</strong>
<span>{moment(new Date(this.getLastHistoryItem(user, 'suspended').created_at)).format('MMMM Do YYYY, h:mm:ss a')}</span>
</li>
<li className={cn(styles.descriptionItem, 'talk-admin-user-info-tooltip-description-item')}>
<strong>End</strong>
<span></span>
<strong className={styles.strongItem}>End</strong>
<span>{moment(new Date(this.getLastHistoryItem(user, 'suspended').until)).format('MMMM Do YYYY, h:mm:ss a')}</span>
</li>
</ul>
</div>