EPMRPP-98421 || Fix missing avatar icons on "Organization Users" page

reportportal · Jan 14, 2025 · 33251fc · 33251fc
1 parent 03aaaf8
commit 33251fc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 36 deletions.
diff --git a/app/src/common/urls.js b/app/src/common/urls.js
@@ -35,8 +35,6 @@ export const URLS = {
   apiDocs: (apiType) => `${apiType}/api-docs`,
 
   dataPhoto: (at, loadThumbnail) => `${urlBase}data/photo${getQueryParams({ at, loadThumbnail })}`,
-  dataUserPhoto: (projectKey, login, loadThumbnail) =>
-    `${urlBase}data/${projectKey}/userphoto${getQueryParams({ login, loadThumbnail })}`,
   userAvatar: (userId, thumbnail = false) =>
     `${urlCommonBase}users/${userId}/avatar${getQueryParams({ thumbnail })}`,
 

diff --git a/app/src/pages/inside/common/userAvatar/index.js b/app/src/pages/inside/common/userAvatar/index.js
@@ -15,4 +15,3 @@
  */
 
 export { UserAvatar } from './userAvatar';
-export { UserAvatarWithNewApi } from './userAvatarWithNewApi';
diff --git a/app/src/pages/inside/common/userAvatar/userAvatar.jsx b/app/src/pages/inside/common/userAvatar/userAvatar.jsx
@@ -24,10 +24,8 @@ import styles from './userAvatar.scss';
 
 const cx = classNames.bind(styles);
 
-export const UserAvatar = ({ className, userId, projectKey, isNewApi, thumbnail }) => {
-  const src = isNewApi
-    ? URLS.userAvatar(userId, thumbnail)
-    : URLS.dataUserPhoto(projectKey, userId, true);
+export const UserAvatar = ({ className, userId, thumbnail }) => {
+  const src = URLS.userAvatar(userId, thumbnail);
 
   return (
     <div className={cx('user-avatar', className)}>
@@ -45,14 +43,10 @@ export const UserAvatar = ({ className, userId, projectKey, isNewApi, thumbnail
 UserAvatar.propTypes = {
   className: PropTypes.string,
   userId: PropTypes.string.isRequired,
-  projectKey: PropTypes.string,
-  isNewApi: PropTypes.bool,
   thumbnail: PropTypes.bool,
 };
 
 UserAvatar.defaultProps = {
   className: '',
-  projectKey: '',
-  isNewApi: false,
   thumbnail: false,
 };
diff --git a/app/src/pages/inside/common/userAvatar/userAvatarWithNewApi.jsx b/app/src/pages/inside/common/userAvatar/userAvatarWithNewApi.jsx
diff --git a/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx b/app/src/pages/instance/allUsersPage/allUsersListTable/allUsersListTable.jsx
@@ -21,7 +21,7 @@ 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 { UserAvatarWithNewApi } from 'pages/inside/common/userAvatar';
+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';
@@ -90,7 +90,7 @@ const AllUsersListTableComponent = ({
                 user={user}
                 badges={memberBadges}
                 userAvatar={({ className, userId: avatarUserId }) => (
-                  <UserAvatarWithNewApi thumbnail className={className} userId={avatarUserId} />
+                  <UserAvatar thumbnail className={className} userId={avatarUserId} />
                 )}
               />
             ),

diff --git a/...anization/organizationUsersPage/organizationUsersListTable/organizationUsersListTable.jsx b/...anization/organizationUsersPage/organizationUsersListTable/organizationUsersListTable.jsx
@@ -39,7 +39,7 @@ import {
 } from 'controllers/organization/users';
 import { SORTING_KEY } from 'controllers/organization/projects';
 import { UserNameCell } from 'pages/common/membersPage/userNameCell/userNameCell';
-import { UserAvatarWithNewApi } from 'pages/inside/common/userAvatar';
+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';
@@ -106,7 +106,7 @@ const OrgTeamListTableWrapped = ({
                   user={user}
                   badges={memberBadges}
                   userAvatar={({ className, userId: avatarUserId }) => (
-                    <UserAvatarWithNewApi thumbnail className={className} userId={avatarUserId} />
+                    <UserAvatar thumbnail className={className} userId={avatarUserId} />
                   )}
                 />
               ),

diff --git a/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.jsx b/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.jsx
@@ -22,7 +22,7 @@ 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 { UserAvatarWithNewApi } from 'pages/inside/common/userAvatar';
+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';
@@ -95,7 +95,7 @@ const ProjectTeamListTableWrapped = ({
                   user={user}
                   badges={memberBadges}
                   userAvatar={({ className, userId: avatarUserId }) => (
-                    <UserAvatarWithNewApi thumbnail className={className} userId={avatarUserId} />
+                    <UserAvatar thumbnail className={className} userId={avatarUserId} />
                   )}
                 />
               ),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@
		*/

		export { UserAvatar } from './userAvatar';
		export { UserAvatarWithNewApi } from './userAvatarWithNewApi';