Skip to content

Commit

Permalink
EPMRPP-91927 || Code review fixes - 4
Browse files Browse the repository at this point in the history
  • Loading branch information
iso9000t committed Dec 23, 2024
1 parent c2fb84e commit 0c5c9cf
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
1 change: 1 addition & 0 deletions app/src/pages/inside/common/userAvatar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
*/

export { UserAvatar } from './userAvatar';
export { UserAvatarWithNewApi } from './userAvatarWithNewApi';
19 changes: 19 additions & 0 deletions app/src/pages/inside/common/userAvatar/userAvatarWithNewApi.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*!
* Copyright 2024 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { UserAvatar } from './userAvatar';

export const UserAvatarWithNewApi = (props) => <UserAvatar {...props} isNewApi />;
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ 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 { UserAvatarWithNewApi } from 'pages/inside/common/userAvatar';
import { userInfoSelector } from 'controllers/user';
import { getRoleBadgesData } from 'common/utils/permissions/getRoleTitle';
import { NAMESPACE } from 'controllers/instance/allUsers/constants';
import { UserNameCell } from 'pages/common/membersPage/userNameCell/userNameCell';

import {
DEFAULT_PAGE_SIZE,
DEFAULT_PAGINATION,
Expand Down Expand Up @@ -85,11 +86,7 @@ const AllUsersListTableComponent = ({
fullName: {
content: user.fullName,
component: (
<UserNameCell
user={user}
badges={memberBadges}
userAvatar={(props) => <UserAvatar {...props} isNewApi />}
/>
<UserNameCell user={user} badges={memberBadges} userAvatar={UserAvatarWithNewApi} />
),
},
email: user.email,
Expand Down

0 comments on commit 0c5c9cf

Please sign in to comment.