OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify render of TagPanel - remove sorting

pull/21833/head
Luke Barnard 2017-12-06 14:17:26 +00:00
parent 4af7def20e
commit 35a108eecc
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/structures/TagPanel.js
View File

@ -32,7 +32,7 @@ const TagPanel = React.createClass({
getInitialState() { getInitialState() {
return { return {
joinedGroupProfiles: [], orderedGroupTagProfiles: [],
selectedTags: [], selectedTags: [],
}; };
}, },
@ -53,8 +53,13 @@ const TagPanel = React.createClass({
if (this.unmounted) { if (this.unmounted) {
return; return;
} }
this.setState({
orderedTags: TagOrderStore.getOrderedTags(), const orderedTags = TagOrderStore.getOrderedTags() || TagOrderStore.getAllTags();
const orderedGroupTags = orderedTags.filter((t) => t[0] === '+');
Promise.all(orderedGroupTags.map(
(groupId) => FlairStore.getGroupProfileCached(this.context.matrixClient, groupId),
)).then((orderedGroupTagProfiles) => {
this.setState({orderedGroupTagProfiles});
}); });
}); });
@ -84,16 +89,13 @@ const TagPanel = React.createClass({
}, },
async _fetchJoinedRooms() { async _fetchJoinedRooms() {
// This could be done by anything with a matrix client (, see TagOrderStore).
const joinedGroupResponse = await this.context.matrixClient.getJoinedGroups(); const joinedGroupResponse = await this.context.matrixClient.getJoinedGroups();
const joinedGroupIds = joinedGroupResponse.groups; const joinedGroupIds = joinedGroupResponse.groups;
const joinedGroupProfiles = await Promise.all(joinedGroupIds.map(
(groupId) => FlairStore.getGroupProfileCached(this.context.matrixClient, groupId),
));
dis.dispatch({ dis.dispatch({
action: 'all_tags', action: 'all_tags',
tags: joinedGroupIds, tags: joinedGroupIds,
}); });
this.setState({joinedGroupProfiles});
}, },
render() { render() {
@ -101,13 +103,7 @@ const TagPanel = React.createClass({
const TintableSvg = sdk.getComponent('elements.TintableSvg'); const TintableSvg = sdk.getComponent('elements.TintableSvg');
const DNDTagTile = sdk.getComponent('elements.DNDTagTile'); const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
const orderedGroupProfiles = this.state.orderedTags ? const tags = this.state.orderedGroupTagProfiles.map((groupProfile, index) => {
this.state.joinedGroupProfiles.sort((a, b) =>
this.state.orderedTags.indexOf(a.groupId) -
this.state.orderedTags.indexOf(b.groupId),
) : this.state.joinedGroupProfiles;
const tags = orderedGroupProfiles.map((groupProfile, index) => {
return <DNDTagTile return <DNDTagTile
key={groupProfile.groupId + '_' + index} key={groupProfile.groupId + '_' + index}
groupProfile={groupProfile} groupProfile={groupProfile}