EPMRPP-98421 || Code review fixes - 1

reportportal · Jan 14, 2025 · 2793e15 · 2793e15
1 parent 33251fc
commit 2793e15
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 43 deletions.
diff --git a/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx b/app/src/pages/common/membersPage/userNameCell/userNameCell.jsx
@@ -20,16 +20,17 @@ import classNames from 'classnames/bind';
 import { Tooltip } from '@reportportal/ui-kit';
 import { ADMIN_TYPE } from 'common/utils/permissions/constants';
 import { messages } from 'pages/common/users/membersListTable/messages';
+import { UserAvatar } from 'pages/inside/common/userAvatar';
 import styles from './userNameCell.scss';
 
 const cx = classNames.bind(styles);
 
-export const UserNameCell = ({ user, badges, userAvatar: UserAvatar }) => {
+export const UserNameCell = ({ user, badges }) => {
   const { formatMessage } = useIntl();
 
   return (
     <div className={cx('user-name-cell')}>
-      <UserAvatar className={cx('user-avatar')} userId={user.id} />
+      <UserAvatar className={cx('user-avatar')} userId={user.id} thumbnail />
       <div className={cx('full-name')}>{user.fullName}</div>
       <div className={cx('badges')}>
         {badges.map(({ title, type }) => {
@@ -68,7 +69,6 @@ UserNameCell.propTypes = {
       type: PropTypes.string.isRequired,
     }),
   ),
-  userAvatar: PropTypes.elementType.isRequired,
 };
 
 UserNameCell.defaultProps = {

diff --git a/app/src/pages/inside/profilePage/personalInfoBlock/personalInfoBlock.jsx b/app/src/pages/inside/profilePage/personalInfoBlock/personalInfoBlock.jsx
@@ -81,8 +81,8 @@ const messages = defineMessages({
 
 @connect(
   (state) => ({
-    userId: userInfoSelector(state).userId,
-    currentUserId: userInfoSelector(state).id,
+    userLogin: userInfoSelector(state).userId,
+    userId: userInfoSelector(state).id,
     accountType: userInfoSelector(state).accountType,
     isDemoInstance: isDemoInstanceSelector(state),
   }),
@@ -96,8 +96,8 @@ const messages = defineMessages({
 @track()
 export class PersonalInfoBlock extends Component {
   static propTypes = {
-    userId: PropTypes.string,
-    currentUserId: PropTypes.number,
+    userLogin: PropTypes.string,
+    userId: PropTypes.number,
     accountType: PropTypes.string,
     intl: PropTypes.object.isRequired,
     showModalAction: PropTypes.func.isRequired,
@@ -110,14 +110,14 @@ export class PersonalInfoBlock extends Component {
     isDemoInstance: PropTypes.bool,
   };
   static defaultProps = {
-    userId: '',
-    currentUserId: null,
+    userLogin: '',
+    userId: null,
     accountType: '',
     isDemoInstance: false,
   };
 
   state = {
-    avatarSource: URLS.userAvatar(this.props.currentUserId, false),
+    avatarSource: URLS.userAvatar(this.props.userId, false),
     forceUpdateInProgress: false,
   };
 
@@ -193,9 +193,9 @@ export class PersonalInfoBlock extends Component {
   };
 
   render() {
-    const { intl, accountType, userId, isDemoInstance } = this.props;
+    const { intl, accountType, userLogin, isDemoInstance } = this.props;
     const { forceUpdateInProgress } = this.state;
-    const isDefaultUser = userId === DEFAULT_USER_ID;
+    const isDefaultUser = userLogin === DEFAULT_USER_ID;
     const isChangePasswordDisabled = isDemoInstance && isDefaultUser;
     return (
       <div className={cx('personal-info-block')}>
@@ -211,7 +211,7 @@ export class PersonalInfoBlock extends Component {
               />
             </div>
             <div className={cx('info')}>
-              <UserInfo accountType={accountType} userId={userId} />
+              <UserInfo accountType={accountType} userId={userLogin} />
               {accountType === INTERNAL && (
                 <PhotoControls
                   accountType={accountType}

diff --git a/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx b/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx
@@ -21,7 +21,6 @@ import { useDispatch, useSelector } from 'react-redux';
 import classNames from 'classnames/bind';
 import { AbsRelTime } from 'components/main/absRelTime';
 import { MeatballMenuIcon, Popover } from '@reportportal/ui-kit';
-import { UserAvatar } from 'pages/inside/common/userAvatar';
 import { userInfoSelector } from 'controllers/user';
 import { getRoleBadgesData } from 'common/utils/permissions/getRoleTitle';
 import { NAMESPACE } from 'controllers/instance/allUsers/constants';
@@ -85,15 +84,7 @@ const AllUsersListTableComponent = ({
           id: user.id,
           fullName: {
             content: user.fullName,
-            component: (
-              <UserNameCell
-                user={user}
-                badges={memberBadges}
-                userAvatar={({ className, userId: avatarUserId }) => (
-                  <UserAvatar thumbnail className={className} userId={avatarUserId} />
-                )}
-              />
-            ),
+            component: <UserNameCell user={user} badges={memberBadges} />,
           },
           email: user.email,
           lastLogin: {

diff --git a/...anization/organizationUsersPage/organizationUsersListTable/organizationUsersListTable.jsx b/...anization/organizationUsersPage/organizationUsersListTable/organizationUsersListTable.jsx
@@ -39,7 +39,6 @@ import {
 } from 'controllers/organization/users';
 import { SORTING_KEY } from 'controllers/organization/projects';
 import { UserNameCell } from 'pages/common/membersPage/userNameCell/userNameCell';
-import { UserAvatar } from 'pages/inside/common/userAvatar';
 import { MembersListTable } from '../../../common/users/membersListTable';
 import { messages } from '../../../common/users/membersListTable/messages';
 import styles from './organizationUsersListTable.scss';
@@ -101,15 +100,7 @@ const OrgTeamListTableWrapped = ({
             id,
             fullName: {
               content: fullName,
-              component: (
-                <UserNameCell
-                  user={user}
-                  badges={memberBadges}
-                  userAvatar={({ className, userId: avatarUserId }) => (
-                    <UserAvatar thumbnail className={className} userId={avatarUserId} />
-                  )}
-                />
-              ),
+              component: <UserNameCell user={user} badges={memberBadges} />,
             },
             email,
             lastLogin: {

diff --git a/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.jsx b/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.jsx
@@ -22,7 +22,6 @@ import { useDispatch, useSelector } from 'react-redux';
 import { activeProjectKeySelector, userIdSelector } from 'controllers/user';
 import { AbsRelTime } from 'components/main/absRelTime';
 import { MeatballMenuIcon, Popover } from '@reportportal/ui-kit';
-import { UserAvatar } from 'pages/inside/common/userAvatar';
 import { urlOrganizationSlugSelector, userRolesSelector } from 'controllers/pages';
 import { SORTING_ASC, withSortingURL } from 'controllers/sorting';
 import { DEFAULT_SORT_COLUMN, NAMESPACE } from 'controllers/members/constants';
@@ -90,15 +89,7 @@ const ProjectTeamListTableWrapped = ({
             id,
             fullName: {
               content: fullName,
-              component: (
-                <UserNameCell
-                  user={user}
-                  badges={memberBadges}
-                  userAvatar={({ className, userId: avatarUserId }) => (
-                    <UserAvatar thumbnail className={className} userId={avatarUserId} />
-                  )}
-                />
-              ),
+              component: <UserNameCell user={user} badges={memberBadges} />,
             },
             email,
             lastLogin: {