imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show "Invited" section in the user list

Browse source
This commit is contained in:
Luke Barnard 2017-10-16 16:38:32 +01:00
parent bbf3550865
commit 008e8d4f54
1 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/components/views/groups/GroupMemberList.js
View file

@ -36,6 +36,7 @@ export default withMatrixClient(React.createClass({
return { return {
fetching: false, fetching: false,
members: null, members: null,
invited_members: null,
truncateAt: INITIAL_LOAD_NUM_MEMBERS, truncateAt: INITIAL_LOAD_NUM_MEMBERS,
}; };
}, },
@ -58,6 +59,18 @@ export default withMatrixClient(React.createClass({
this.setState({fetching: false}); this.setState({fetching: false});
console.error("Failed to get group member list: " + e); console.error("Failed to get group member list: " + e);
}); });
this.props.matrixClient.getGroupInvitedUsers(this.props.groupId).then((result) => {
this.setState({
invited_members: result.chunk.map((apiMember) => {
return groupMemberFromApiObject(apiMember);
}),
fetching: false,
});
}).catch((e) => {
this.setState({fetching: false});
console.error("Failed to get group invited member list: " + e);
});
}, },
_createOverflowTile: function(overflowCount, totalCount) { _createOverflowTile: function(overflowCount, totalCount) {
@ -83,11 +96,9 @@ export default withMatrixClient(React.createClass({
this.setState({ searchQuery: ev.target.value }); this.setState({ searchQuery: ev.target.value });
}, },
makeGroupMemberTiles: function(query) { makeGroupMemberTiles: function(query, memberList) {
const GroupMemberTile = sdk.getComponent("groups.GroupMemberTile"); const GroupMemberTile = sdk.getComponent("groups.GroupMemberTile");
query = (query || "").toLowerCase(); query = (query || "").toLowerCase();
let memberList = this.state.members;
if (query) { if (query) {
memberList = memberList.filter((m) => { memberList = memberList.filter((m) => {
const matchesName = m.displayname.toLowerCase().indexOf(query) !== -1; const matchesName = m.displayname.toLowerCase().indexOf(query) !== -1;
@ -143,11 +154,22 @@ export default withMatrixClient(React.createClass({
return ( return (
<div className="mx_MemberList"> <div className="mx_MemberList">
{ inputBox } { inputBox }
<GeminiScrollbar autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper"> <GeminiScrollbar autoshow={true} className="mx_MemberList_outerWrapper">
<div className="mx_MemberList_joined">
<TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAt} <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAt}
createOverflowElement={this._createOverflowTile}> createOverflowElement={this._createOverflowTile}>
{ this.makeGroupMemberTiles(this.state.searchQuery) } { this.makeGroupMemberTiles(this.state.searchQuery, this.state.members) }
</TruncatedList> </TruncatedList>
</div>
<div className="mx_MemberList_invited">
<h2>{ _t("Invited") }</h2>
<div className="mx_MemberList_wrapper">
<TruncatedList truncateAt={this.state.truncateAt}
createOverflowElement={this._createOverflowTile}>
{ this.makeGroupMemberTiles(this.state.searchQuery, this.state.invited_members) }
</TruncatedList>
</div>
</div>
</GeminiScrollbar> </GeminiScrollbar>
</div> </div>
); );