diff --git a/frontend/src/main/web/.babelrc b/frontend/src/main/web/.babelrc deleted file mode 100644 index 9921a456ee..0000000000 --- a/frontend/src/main/web/.babelrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "presets": ["es2015", "stage-0", "react"], - "env": { - "development": { - "presets": ["react-hmre"] - } - } -} diff --git a/frontend/src/main/web/package.json b/frontend/src/main/web/package.json index 4d03a021b9..983fd8df42 100644 --- a/frontend/src/main/web/package.json +++ b/frontend/src/main/web/package.json @@ -26,7 +26,7 @@ "atomic-loader": "^0.1.3", "autoprefixer-loader": "^3.2.0", "babel-core": "^6.7.2", - "babel-eslint": "^5.0.0", + "babel-eslint": "^6.0.0", "babel-jest": "^6.0.1", "babel-loader": "^6.2.1", "babel-plugin-lodash": "2.1.0", @@ -38,7 +38,7 @@ "eslint": "^2.4.0", "eslint-config-standard": "^5.1.0", "eslint-config-standard-react": "^2.3.0", - "eslint-config-zanata": "^2.0.0", + "eslint-config-zanata": "^2.0.1", "eslint-loader": "^1.3.0", "eslint-plugin-promise": "^1.1.0", "eslint-plugin-react": "^4.2.3", diff --git a/frontend/src/main/web/src/containers/UserProfile/index.jsx b/frontend/src/main/web/src/containers/UserProfile/index.jsx index 509cdca1ad..06a1d2b667 100644 --- a/frontend/src/main/web/src/containers/UserProfile/index.jsx +++ b/frontend/src/main/web/src/containers/UserProfile/index.jsx @@ -72,10 +72,9 @@ var UserProfile = React.createClass({ render: function () { const user = isEmpty(this.state.user) ? window.config.user : this.state.user const username = user && user.username ? user.username : '' - const languageTeams = user && user.languageTeams.length > 0 + const languageTeams = user && !isEmpty(user.languageTeams) ? user.languageTeams.join() : '' const notification = this.state.notification - console.log(languageTeams, user) return ( {notification && () } - {user && user.languageTeams.length > 0 && + {user && !isEmpty(user.languageTeams) && (