Skip to content

Commit 7cf0150

Browse files
committed
Filter the guilds based on inclusion of the currently selected member.
1 parent 661855b commit 7cf0150

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

web-ui/src/pages/MemberProfilePage.jsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,25 @@ const MemberProfilePage = () => {
8787
useEffect(() => {
8888
async function getTeamsAndGuilds() {
8989
if (memberId) {
90-
let teamRes = await getTeamByMember(memberId, csrf);
91-
let teamData =
90+
const teamRes = await getTeamByMember(memberId, csrf);
91+
const teamData =
9292
teamRes.payload && teamRes.payload.status === 200
9393
? teamRes.payload.data
9494
: null;
95-
let memberTeams = teamData && !teamRes.error ? teamData : [];
96-
memberTeams.sort((a, b) => a.name.localeCompare(b.name));
97-
setTeams(memberTeams);
95+
const memberTeams = teamData && !teamRes.error ? teamData : [];
96+
setTeams(memberTeams.sort((a, b) => a.name.localeCompare(b.name)));
9897

99-
let guildRes = await getGuildsForMember(memberId, csrf);
100-
let guildData =
98+
const guildRes = await getGuildsForMember(memberId, csrf);
99+
const guildData =
101100
guildRes.payload && guildRes.payload.status === 200
102101
? guildRes.payload.data
103102
: null;
104-
let memberGuilds = guildData && !guildRes.error ? guildData : [];
105-
memberGuilds.sort((a, b) => a.name.localeCompare(b.name));
106-
setGuilds(memberGuilds);
103+
const memberGuilds = guildData && !guildRes.error ?
104+
guildData.filter((guild) =>
105+
guild.guildMembers.some((member) => member.memberId == memberId)
106+
)
107+
: [];
108+
setGuilds(memberGuilds.sort((a, b) => a.name.localeCompare(b.name)));
107109
}
108110
}
109111

0 commit comments

Comments
 (0)