Add a + next to direct message on sidebar to open 'Direct Messages' modal (#7159)
* Add a + next to direct message on sidebar to open 'Direct Messages' modal * Change + cick to display direct message modal without group message.
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
12a9180807
Коммит
1ce079d2d0
@@ -700,6 +700,18 @@ export default class Sidebar extends React.Component {
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const createDirectMessageTooltip = (
|
||||||
|
<Tooltip
|
||||||
|
id='new-group-tooltip'
|
||||||
|
className='hidden-xs'
|
||||||
|
>
|
||||||
|
<FormattedMessage
|
||||||
|
id='sidebar.createDirectMessage'
|
||||||
|
defaultMessage='Create new direct message'
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
|
||||||
const above = (
|
const above = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='sidebar.unreads'
|
id='sidebar.unreads'
|
||||||
@@ -757,6 +769,23 @@ export default class Sidebar extends React.Component {
|
|||||||
createPublicChannelIcon = null;
|
createPublicChannelIcon = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const createDirectMessageIcon = (
|
||||||
|
<OverlayTrigger
|
||||||
|
className='hidden-xs'
|
||||||
|
delayShow={500}
|
||||||
|
placement='top'
|
||||||
|
overlay={createDirectMessageTooltip}
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
className='add-channel-btn'
|
||||||
|
href='#'
|
||||||
|
onClick={this.handleOpenMoreDirectChannelsModal}
|
||||||
|
>
|
||||||
|
{'+'}
|
||||||
|
</a>
|
||||||
|
</OverlayTrigger>
|
||||||
|
);
|
||||||
|
|
||||||
if (!ChannelUtils.showCreateOption(Constants.PRIVATE_CHANNEL, isTeamAdmin, isSystemAdmin)) {
|
if (!ChannelUtils.showCreateOption(Constants.PRIVATE_CHANNEL, isTeamAdmin, isSystemAdmin)) {
|
||||||
createPrivateChannelIcon = null;
|
createPrivateChannelIcon = null;
|
||||||
}
|
}
|
||||||
@@ -894,6 +923,7 @@ export default class Sidebar extends React.Component {
|
|||||||
id='sidebar.direct'
|
id='sidebar.direct'
|
||||||
defaultMessage='DIRECT MESSAGES'
|
defaultMessage='DIRECT MESSAGES'
|
||||||
/>
|
/>
|
||||||
|
{createDirectMessageIcon}
|
||||||
</h4>
|
</h4>
|
||||||
</li>
|
</li>
|
||||||
{directMessageItems}
|
{directMessageItems}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user