Skip to content

Commit a6b2679

Browse files
author
puranban
committed
Fix username display on user group dashboard table
1 parent 071d187 commit a6b2679

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

community-dashboard/app/components/MemberItem/index.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Link, generatePath } from 'react-router-dom';
3-
import { isDefined } from '@togglecorp/fujs';
3+
import { isDefined, isFalsyString, isNotDefined } from '@togglecorp/fujs';
44

55
import NumberOutput from '#components/NumberOutput';
66
import routes from '#base/configs/routes';
@@ -27,14 +27,17 @@ function MemberItem(props: Props) {
2727
{ userId: member.userId },
2828
);
2929

30+
// NOTE: OSM user does not have username stored
31+
const memberName = isFalsyString(member.username) ? member.userId : member.username;
32+
3033
return (
3134
<div className={styles.member}>
3235
<div className={styles.memberName}>
3336
<Link
3437
className={styles.link}
3538
to={path}
3639
>
37-
{member.username}
40+
{memberName}
3841
</Link>
3942
{!member.isActive && (
4043
<div className={styles.inactive}>

community-dashboard/app/views/UserGroupDashboard/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ const USER_MEMBERSHIPS_EXPORT = gql`
137137
type UserGroupMember = NonNullable<NonNullable<NonNullable<UserGroupStatsQuery['userGroup']>['userMemberships']>['items']>[number];
138138

139139
function memberKeySelector(member: UserGroupMember) {
140-
return member.username;
140+
return member.userId;
141141
}
142142

143143
interface DateRangeValue {

0 commit comments

Comments
 (0)