diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index e77046213..29f53e353 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -13,11 +13,11 @@ import {getReliability} from 'coral-framework/utils/user';
import ButtonCopyToClipboard from './ButtonCopyToClipboard';
import ClickOutside from 'coral-framework/components/ClickOutside';
import {Icon, Drawer, Spinner, TabBar, Tab, TabContent, TabPane} from 'coral-ui';
-import LoadMore from '../components/LoadMore';
import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
import UserInfoTooltip from './UserInfoTooltip';
-
+import get from 'lodash/get';
+
class UserDetail extends React.Component {
rejectThenReload = async (info) => {
@@ -68,20 +68,6 @@ class UserDetail extends React.Component {
this.props.changeStatus(tab);
}
- render() {
-
-<<<<<<< HEAD
- if (this.props.loading) {
- return (
-
-
-
-
-
- );
- }
-
-=======
showSuspenUserDialog = () => this.props.showSuspendUserDialog({
userId: this.props.root.user.id,
username: this.props.root.user.username,
@@ -105,17 +91,17 @@ class UserDetail extends React.Component {
getActionMenuLabel() {
const {root: {user}} = this.props;
- if (user.status === 'BANNED') {
- return 'Banned';
- } else if (user.suspension.until && new Date(user.suspension.until) > new Date()) {
- return 'Suspended';
- } else {
- return '';
- }
+ // if (user.status === 'BANNED') {
+ // return 'Banned';
+ // } else if (user.suspension.until && new Date(user.suspension.until) > new Date()) {
+ // return 'Suspended';
+ // } else {
+ // return '';
+ // }
+ return '';
}
renderLoaded() {
->>>>>>> c53fe4b1976db5b4644e2a48d03c85c3fdf56733
const {
data,
root,
@@ -142,12 +128,14 @@ class UserDetail extends React.Component {
rejectedPercent = 0;
}
+ const banned = get(user, 'status.banned.status');
+ const suspensionUntil = get(user, 'status.suspension.until');
+
const suspended =
user &&
- user.suspension.until &&
- new Date(user.suspension.until) > new Date();
+ suspensionUntil &&
+ new Date(suspensionUntil) > new Date();
- const banned = user.status === 'BANNED';
return (
@@ -332,13 +320,17 @@ class UserDetail extends React.Component {
);
}
+
+ render() {
+ if (this.props.loading) {
+ return this.renderLoading();
+ }
+ return this.renderLoaded();
+ }
}
UserDetail.propTypes = {
-<<<<<<< HEAD
userId: PropTypes.string.isRequired,
-=======
->>>>>>> c53fe4b1976db5b4644e2a48d03c85c3fdf56733
hideUserDetail: PropTypes.func.isRequired,
root: PropTypes.object.isRequired,
acceptComment: PropTypes.func.isRequired,
@@ -356,13 +348,9 @@ UserDetail.propTypes = {
selectedCommentIds: PropTypes.array.isRequired,
viewUserDetail: PropTypes.any.isRequired,
loadMore: PropTypes.any.isRequired,
-<<<<<<< HEAD
- notify: PropTypes.func.isRequired
-=======
notify: PropTypes.func.isRequired,
showSuspendUserDialog: PropTypes.func,
showBanUserDialog: PropTypes.func,
->>>>>>> c53fe4b1976db5b4644e2a48d03c85c3fdf56733
};
export default UserDetail;
diff --git a/yarn.lock b/yarn.lock
index e94038032..1e61e69c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -441,7 +441,7 @@ async@2.1.4:
dependencies:
lodash "^4.14.0"
-async@2.4.1, async@^2.1.2, async@^2.1.4:
+async@2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
dependencies:
@@ -451,6 +451,12 @@ async@^1.4.0, async@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+async@^2.1.2, async@^2.1.4, async@~2.6.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+ dependencies:
+ lodash "^4.14.0"
+
async@~0.9.0:
version "0.9.2"
resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -459,12 +465,6 @@ async@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
-async@~2.6.0:
- version "2.6.0"
- resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
- dependencies:
- lodash "^4.14.0"
-
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -5873,11 +5873,7 @@ mute-stream@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-nan@^2.3.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
-nan@^2.6.2:
+nan@^2.3.0, nan@^2.6.2:
version "2.8.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
@@ -8021,15 +8017,15 @@ right-pad@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
-rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+rimraf@2, rimraf@^2.2.8, rimraf@~2.5.2:
+ version "2.5.4"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
dependencies:
glob "^7.0.5"
-rimraf@^2.2.8, rimraf@~2.5.2:
- version "2.5.4"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
+rimraf@^2.5.1, rimraf@^2.6.1:
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
dependencies:
glob "^7.0.5"
@@ -8183,25 +8179,7 @@ send@0.16.0:
range-parser "~1.2.0"
statuses "~1.3.1"
-send@0.16.1:
- version "0.16.1"
- resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
- dependencies:
- debug "2.6.9"
- depd "~1.1.1"
- destroy "~1.0.4"
- encodeurl "~1.0.1"
- escape-html "~1.0.3"
- etag "~1.8.1"
- fresh "0.5.2"
- http-errors "~1.6.2"
- mime "1.4.1"
- ms "2.0.0"
- on-finished "~2.3.0"
- range-parser "~1.2.0"
- statuses "~1.3.1"
-
-serve-static@1.13.0:
+serve-static@1.13.0, serve-static@^1.12.3:
version "1.13.0"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.0.tgz#810c91db800e94ba287eae6b4e06caab9fdc16f1"
dependencies:
@@ -8210,15 +8188,6 @@ serve-static@1.13.0:
parseurl "~1.3.2"
send "0.16.0"
-serve-static@^1.12.3:
- version "1.13.1"
- resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
- dependencies:
- encodeurl "~1.0.1"
- escape-html "~1.0.3"
- parseurl "~1.3.2"
- send "0.16.1"
-
set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -8765,7 +8734,7 @@ tar-pack@^3.4.0:
tar "^2.2.1"
uid-number "^0.0.6"
-tar-stream@1.5.2:
+tar-stream@1.5.2, tar-stream@^1.1.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.2.tgz#fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf"
dependencies:
@@ -8774,15 +8743,6 @@ tar-stream@1.5.2:
readable-stream "^2.0.0"
xtend "^4.0.0"
-tar-stream@^1.1.2:
- version "1.5.5"
- resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
- dependencies:
- bl "^1.0.0"
- end-of-stream "^1.0.0"
- readable-stream "^2.0.0"
- xtend "^4.0.0"
-
tar@^2.0.0, tar@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"