diff --git a/app/src/common/urls.js b/app/src/common/urls.js index 990721b5b8..6cd92adeb3 100644 --- a/app/src/common/urls.js +++ b/app/src/common/urls.js @@ -37,6 +37,7 @@ export const URLS = { dataPhoto: (at, loadThumbnail) => `${urlBase}data/photo${getQueryParams({ at, loadThumbnail })}`, dataUserPhoto: (projectKey, login, loadThumbnail) => `${urlBase}data/${projectKey}/userphoto${getQueryParams({ login, loadThumbnail })}`, + userAvatar: (userId) => `${urlCommonBase}users/${userId}/avatar`, dashboard: (projectKey, id) => `${urlBase}${projectKey}/dashboard/${id}`, dashboards: (projectKey, params) => diff --git a/app/src/pages/instance/allUsersPage/allUsersHeader/allUsersHeader.jsx b/app/src/pages/instance/allUsersPage/allUsersHeader/allUsersHeader.jsx index 698a291120..7616ea5629 100644 --- a/app/src/pages/instance/allUsersPage/allUsersHeader/allUsersHeader.jsx +++ b/app/src/pages/instance/allUsersPage/allUsersHeader/allUsersHeader.jsx @@ -1,13 +1,26 @@ +/* + * 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 React from 'react'; import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import { defineMessages, useIntl } from 'react-intl'; import classNames from 'classnames/bind'; -import { GhostButton } from 'components/buttons/ghostButton'; -import { MeatballMenuIcon, FilterOutlineIcon, Button } from '@reportportal/ui-kit'; -import { SearchField } from 'components/fields/searchField'; +import { MeatballMenuIcon, FilterOutlineIcon, Button, SearchIcon } from '@reportportal/ui-kit'; import { ssoUsersOnlySelector } from 'controllers/appInfo'; -import ExportIcon from 'common/img/export-inline.svg'; import styles from './allUsersHeader.scss'; const cx = classNames.bind(styles); @@ -31,7 +44,7 @@ const messages = defineMessages({ }, }); -export const AllUsersHeader = ({ isLoading, searchValue, setSearchValue, onExport, onInvite }) => { +export const AllUsersHeader = ({ onInvite }) => { const { formatMessage } = useIntl(); const ssoUsersOnly = useSelector(ssoUsersOnlySelector); @@ -41,18 +54,10 @@ export const AllUsersHeader = ({ isLoading, searchValue, setSearchValue, onExpor {formatMessage(messages.allUsersTitle)}
- + - - {formatMessage(messages.export)} - {!ssoUsersOnly && (