Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-14903: Adds messaging to group members dropdown. #2729

Merged
merged 4 commits into from
May 3, 2019
Merged

MM-14903: Adds messaging to group members dropdown. #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c44c34
MM-14903: Adds message to member dropdown.
mkraft Apr 30, 2019
ebc4fad
MM-14903: Updates snapshot.
mkraft Apr 30, 2019
9d98144
MM-14903: Adds translation.
mkraft Apr 30, 2019
02e532d
MM-14903: Change translation order.
mkraft Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 114 additions & 0 deletions components/popover_list_members/__snapshots__/popover_list_members.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,120 @@ exports[`components/PopoverListMembers should match snapshot with archived chann
</div>
`;

exports[`components/PopoverListMembers should match snapshot with group-constrained channel 1`] = `
<div
className="channel-header__icon wide "
id="channelMember"
>
<OverlayTrigger
defaultOverlayShown={false}
delayShow={400}
overlay={
<Tooltip
bsClass="tooltip"
id="channelMembersTooltip"
placement="right"
>
<FormattedMessage
defaultMessage="Members"
id="channel_header.channelMembers"
values={Object {}}
/>
</Tooltip>
}
placement="bottom"
trigger={
Array [
"hover",
"focus",
]
}
>
<div
className="member-popover__trigger"
id="member_popover"
onClick={[Function]}
>
<span
className="icon__text"
id="channelMemberCountText"
>
2
</span>
<MemberIcon
aria-hidden="true"
className="icon icon__members"
id="channelMemberIcon"
/>
</div>
</OverlayTrigger>
<Overlay
animation={[Function]}
onHide={[Function]}
placement="bottom"
rootClose={true}
show={false}
target={[Function]}
>
<Popover
bsClass="popover"
className="member-list__popover"
id="member-list-popover"
placement="right"
>
<div
className="more-modal__header"
>
<FormattedMessage
defaultMessage="Channel Members"
id="members_popover.title"
values={Object {}}
/>
<div
className="subhead"
>
<FormattedMessage
defaultMessage="Members managed by linked groups."
id="channel_header.groupConstrained"
values={Object {}}
/>
</div>
</div>
<div
className="more-modal__body"
>
<div
className="more-modal__list"
>
<PopoverListMembersItem
key="member_id_1"
onItemClick={[Function]}
showMessageIcon={true}
status="online"
user={
Object {
"id": "member_id_1",
}
}
/>
<PopoverListMembersItem
key="member_id_2"
onItemClick={[Function]}
showMessageIcon={true}
status="offline"
user={
Object {
"id": "member_id_2",
}
}
/>
</div>
</div>
</Popover>
</Overlay>
</div>
`;

exports[`components/PopoverListMembers should match state when showChannelInviteModal is called 1`] = `
<div
className="channel-header__icon wide "
Expand Down
6 changes: 6 additions & 0 deletions components/popover_list_members/popover_list_members.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,12 @@ export default class PopoverListMembers extends React.Component {
>
<div className='more-modal__header'>
{title}
{this.props.channel.group_constrained && <div className='subhead'>
<FormattedMessage
id='channel_header.groupConstrained'
defaultMessage='Members managed by linked groups.'
/>
</div>}
</div>
<div className='more-modal__body'>
<div className='more-modal__list'>
Expand Down
10 changes: 10 additions & 0 deletions components/popover_list_members/popover_list_members.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,14 @@ describe('components/PopoverListMembers', () => {

expect(wrapper).toMatchSnapshot();
});

test('should match snapshot with group-constrained channel', () => {
const props = {...baseProps, channel: {...channel, group_constrained: true}};

const wrapper = shallow(
<PopoverListMembers {...props}/>
);

expect(wrapper).toMatchSnapshot();
});
});
1 change: 1 addition & 0 deletions i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,7 @@
"channel_header.delete": "Archive Channel",
"channel_header.directchannel.you": "{displayname} (you) ",
"channel_header.flagged": "Flagged Posts",
"channel_header.groupConstrained": "Members managed by linked groups.",
"channel_header.leave": "Leave Channel",
"channel_header.manageMembers": "Manage Members",
"channel_header.menuAriaLabel": "Channel Menu",
Expand Down
8 changes: 8 additions & 0 deletions sass/components/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,14 @@
span {
font-weight: 600;
}

.subhead {
font-size: 12px;
opacity: 0.6;
span {
font-weight: normal;
}
}
}

.more-modal__button {
Expand Down