Skip to content
Merged
Changes from 2 commits
Commits
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
27 changes: 21 additions & 6 deletions app/views/RoomInfoView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,14 @@ class RoomInfoView extends React.Component {
}
};

parseRoles = roleArray =>
Promise.all(
roleArray.map(async role => {
const description = await this.getRoleDescription(role);
return description;
})
);

loadUser = async () => {
const { room, roomUser } = this.state;

Expand All @@ -189,19 +197,26 @@ class RoomInfoView extends React.Component {
const { user } = result;
const { roles } = user;
if (roles && roles.length) {
user.parsedRoles = await Promise.all(
roles.map(async role => {
const description = await this.getRoleDescription(role);
return description;
})
);
user.parsedRoles = await this.parseRoles(roles);
}

this.setState({ roomUser: user });
}
} catch {
// do nothing
}
} else {
try {
const { roles } = roomUser;
if (roles && roles.length) {
const parsedRoles = await this.parseRoles(roles);
this.setState({ roomUser: { ...roomUser, parsedRoles } });
} else {
this.setState({ roomUser });
}
} catch (e) {
// do nothing
}
}
};

Expand Down