MM-59326: Remove deprecated overlay and use withTooltip in edit section of ip filtering in admin console (#27648)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
27dfeddfff
Коммит
a0a79b4575
@@ -10,8 +10,7 @@ import {
|
||||
} from '@mattermost/compass-icons/components';
|
||||
import type {AllowedIPRange} from '@mattermost/types/config';
|
||||
|
||||
import OverlayTrigger from 'components/overlay_trigger';
|
||||
import Tooltip from 'components/tooltip';
|
||||
import WithTooltip from 'components/with_tooltip';
|
||||
|
||||
type EditTableRowProps = {
|
||||
allowedIPRange: AllowedIPRange;
|
||||
@@ -33,8 +32,6 @@ const EditTableRow = ({
|
||||
hoveredRow,
|
||||
}: EditTableRowProps) => {
|
||||
const {formatMessage} = useIntl();
|
||||
const editTooltip = <Tooltip id='edit-tooltip'>{formatMessage({id: 'admin.ip_filtering.edit', defaultMessage: 'Edit'})}</Tooltip>;
|
||||
const deleteTooltip = <Tooltip id='delete-tooltip'>{formatMessage({id: 'admin.ip_filtering.delete', defaultMessage: 'Delete'})}</Tooltip>;
|
||||
return (
|
||||
<div
|
||||
className='Row'
|
||||
@@ -46,9 +43,10 @@ const EditTableRow = ({
|
||||
<div className='Actions'>
|
||||
{hoveredRow === index && (
|
||||
<>
|
||||
<OverlayTrigger
|
||||
<WithTooltip
|
||||
id='edit-tooltip'
|
||||
placement='top'
|
||||
overlay={editTooltip}
|
||||
title={formatMessage({id: 'admin.ip_filtering.edit', defaultMessage: 'Edit'})}
|
||||
>
|
||||
<div
|
||||
className='edit'
|
||||
@@ -58,10 +56,11 @@ const EditTableRow = ({
|
||||
>
|
||||
<PencilOutlineIcon size={20}/>
|
||||
</div>
|
||||
</OverlayTrigger>
|
||||
<OverlayTrigger
|
||||
</WithTooltip>
|
||||
<WithTooltip
|
||||
id='delete-tooltip'
|
||||
placement='top'
|
||||
overlay={deleteTooltip}
|
||||
title={formatMessage({id: 'admin.ip_filtering.delete', defaultMessage: 'Delete'})}
|
||||
>
|
||||
<div
|
||||
className='delete'
|
||||
@@ -74,7 +73,7 @@ const EditTableRow = ({
|
||||
color='red'
|
||||
/>
|
||||
</div>
|
||||
</OverlayTrigger>
|
||||
</WithTooltip>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
Ссылка в новой задаче
Block a user