From 893fd3aae19564027c90683dd1378bc67e127180 Mon Sep 17 00:00:00 2001
From: wwu <wwu@wenbinwu.com>
Date: Fri, 26 Jan 2018 21:51:39 +0100
Subject: [PATCH] Issue 1593 delete UserAvatar

---
 src/api/projectMembers.js            |  2 +-
 src/components/User/UserAvatar.jsx   | 36 ----------------------------
 src/components/User/UserWithName.jsx | 11 +++++----
 3 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 src/components/User/UserAvatar.jsx

diff --git a/src/api/projectMembers.js b/src/api/projectMembers.js
index 252df38c0..64a08f5d4 100644
--- a/src/api/projectMembers.js
+++ b/src/api/projectMembers.js
@@ -5,7 +5,7 @@ import { TC_API_URL, PROJECTS_API_URL, CONNECT_MESSAGE_API_URL } from '../config
 export function getMembersById (userIds) {
   const _userIdArr = _.map(userIds, _id => `userId:${_id}`)
   // only requesting certain member attributes
-  const fields = 'userId,handle,photoURL,firstName,lastName,maxRating,details,email'
+  const fields = 'userId,handle,photoURL,firstName,lastName,details,email'
   const query = _userIdArr.join(' OR ')
   const url = `${TC_API_URL}/v3/members/_search/?fields=`
     + encodeURIComponent(fields)
diff --git a/src/components/User/UserAvatar.jsx b/src/components/User/UserAvatar.jsx
deleted file mode 100644
index 88e6ed456..000000000
--- a/src/components/User/UserAvatar.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import LevelDesignatorIcon from '../../assets/LevelDesignatorIcon'
-import { memberLevelByRating } from '../../helpers'
-
-require('./UserAvatar.scss')
-
-const UserAvatar = ({ showLevel, rating, photoURL }) => {
-  let levelIcon
-
-  if (showLevel) {
-    levelIcon = <LevelDesignatorIcon level={memberLevelByRating(rating)} height={'17px'} width={'17px'}/>
-  }
-
-  let backgroundImageUrl = `url(${require('./default-avatar.svg')})`
-
-  if (photoURL)
-    backgroundImageUrl = `url(${photoURL}), ${backgroundImageUrl}`
-
-  // Delete -r when taking member search back out of the angular app
-  // Renamed to -r to avoid naming collisions
-  return (
-    <div className="user-avatar" style={{ backgroundImage: backgroundImageUrl }}>
-      {levelIcon}
-    </div>
-  )
-}
-
-
-UserAvatar.propTypes = {
-  showLevel: PropTypes.bool,
-  rating   : PropTypes.number,
-  photoURL : PropTypes.string
-}
-
-export default UserAvatar
diff --git a/src/components/User/UserWithName.jsx b/src/components/User/UserWithName.jsx
index 27b7e3e65..e4702bff6 100644
--- a/src/components/User/UserWithName.jsx
+++ b/src/components/User/UserWithName.jsx
@@ -1,15 +1,18 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { DOMAIN } from '../../config/constants'
-import UserAvatar from './UserAvatar'
+import { Avatar } from 'appirio-tech-react-components'
 require('./UserWithName.scss')
 
-const UserWithName = ({ handle, firstName, lastName, photoURL, maxRating={rating: 0}, showLevel=false }) => {
+const UserWithName = ({ handle, firstName, lastName, photoURL }) => {
   const url = `//www.${DOMAIN}/members/${handle}/`
   return (
     <div className="user-block">
       <a href={url} target="_blank" rel="noopener noreferrer" className="photo">
-        <UserAvatar rating={maxRating.rating} showLevel={showLevel} photoURL={photoURL} />
+        <Avatar
+          avatarUrl={photoURL}
+          userName={firstName + ' ' + lastName}
+        />
       </a>
       <span className="txt-box">
         <a href={url} target="_blank" rel="noopener noreferrer" className="link-black">{firstName} {lastName}</a>
@@ -24,8 +27,6 @@ UserWithName.propTypes = {
   firstName : PropTypes.string.isRequired,
   lastName  : PropTypes.string.isRequired,
   photoURL  : PropTypes.string,
-  maxRating : PropTypes.object,
-  showLevel : PropTypes.bool
 }
 
 export default UserWithName