GH-4658 Show profile popover when clicking on username or profile picture in DMs (#4705)
* GH-4658 Show profile popover when clicking on username or profile picture at top of Direct Message channel * enable popover on username
Этот коммит содержится в:
коммит произвёл
enahum
родитель
a793eb8651
Коммит
bd67c1f227
@@ -12,6 +12,7 @@ import TeamStore from 'stores/team_store.jsx';
|
|||||||
import Constants from 'utils/constants.jsx';
|
import Constants from 'utils/constants.jsx';
|
||||||
import * as GlobalActions from 'actions/global_actions.jsx';
|
import * as GlobalActions from 'actions/global_actions.jsx';
|
||||||
import Client from 'client/web_client.jsx';
|
import Client from 'client/web_client.jsx';
|
||||||
|
import ProfilePicture from 'components/profile_picture.jsx';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import {FormattedMessage, FormattedHTMLMessage, FormattedDate} from 'react-intl';
|
import {FormattedMessage, FormattedHTMLMessage, FormattedDate} from 'react-intl';
|
||||||
@@ -46,18 +47,18 @@ export function createDMIntroMessage(channel, centeredIntro) {
|
|||||||
return (
|
return (
|
||||||
<div className={'channel-intro ' + centeredIntro}>
|
<div className={'channel-intro ' + centeredIntro}>
|
||||||
<div className='post-profile-img__container channel-intro-img'>
|
<div className='post-profile-img__container channel-intro-img'>
|
||||||
<img
|
<ProfilePicture
|
||||||
className='post-profile-img'
|
|
||||||
src={Client.getUsersRoute() + '/' + teammate.id + '/image?time=' + teammate.update_at}
|
src={Client.getUsersRoute() + '/' + teammate.id + '/image?time=' + teammate.update_at}
|
||||||
height='50'
|
|
||||||
width='50'
|
width='50'
|
||||||
|
height='50'
|
||||||
|
user={teammate}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className='channel-intro-profile'>
|
<div className='channel-intro-profile'>
|
||||||
<strong>
|
<strong>
|
||||||
<UserProfile
|
<UserProfile
|
||||||
user={teammate}
|
user={teammate}
|
||||||
disablePopover={true}
|
disablePopover={false}
|
||||||
/>
|
/>
|
||||||
</strong>
|
</strong>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user