File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed
Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change 11import React from 'react' ;
22import { Link , generatePath } from 'react-router-dom' ;
3- import { isDefined } from '@togglecorp/fujs' ;
3+ import { isDefined , isFalsyString , isNotDefined } from '@togglecorp/fujs' ;
44
55import NumberOutput from '#components/NumberOutput' ;
66import 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 } >
Original file line number Diff line number Diff line change @@ -137,7 +137,7 @@ const USER_MEMBERSHIPS_EXPORT = gql`
137137type UserGroupMember = NonNullable < NonNullable < NonNullable < UserGroupStatsQuery [ 'userGroup' ] > [ 'userMemberships' ] > [ 'items' ] > [ number ] ;
138138
139139function memberKeySelector ( member : UserGroupMember ) {
140- return member . username ;
140+ return member . userId ;
141141}
142142
143143interface DateRangeValue {
You can’t perform that action at this time.
0 commit comments