Skip to content

Commit d44f26d

Browse files
d-ritawillemarcel
andauthored
Display "no members" message if team is empty (#4337)
* Add no members + no managers message to empty team lists * build locales Co-authored-by: Wille Marcel <[email protected]>
1 parent ff2a217 commit d44f26d

File tree

3 files changed

+43
-21
lines changed

3 files changed

+43
-21
lines changed

frontend/src/components/teamsAndOrgs/messages.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ export default defineMessages({
1616
id: 'management.fields.managers',
1717
defaultMessage: 'Managers',
1818
},
19+
noManagers: {
20+
id: 'management.fields.managers.empty',
21+
defaultMessage: 'There are no managers yet.',
22+
},
1923
manage: {
2024
id: 'management.link.manage',
2125
defaultMessage: 'Manage {entity}',
@@ -32,6 +36,10 @@ export default defineMessages({
3236
id: 'management.members',
3337
defaultMessage: 'Members',
3438
},
39+
noMembers: {
40+
id: 'management.members.empty',
41+
defaultMessage: 'There are no members yet.',
42+
},
3543
mappingTeams: {
3644
id: 'management.teams.mapping',
3745
defaultMessage: 'Mapping teams',

frontend/src/components/teamsAndOrgs/teams.js

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -299,30 +299,42 @@ export function TeamSideBar({ team, members, managers, requestedToJoin }: Object
299299
<h4>
300300
<FormattedMessage {...messages.managers} />
301301
</h4>
302-
<div className="cf db mt3">
303-
{managers.map((user, n) => (
304-
<UserAvatar
305-
key={n}
306-
username={user.username}
307-
picture={user.pictureUrl}
308-
size="large"
309-
colorClasses="white bg-blue-grey mv1"
310-
/>
311-
))}
312-
</div>
302+
{managers.length === 0 ? (
303+
<span className="f6 blue-grey">
304+
<FormattedMessage {...messages.noManagers} />
305+
</span>
306+
) : (
307+
<div className="cf db mt3">
308+
{managers.map((user, n) => (
309+
<UserAvatar
310+
key={n}
311+
username={user.username}
312+
picture={user.pictureUrl}
313+
size="large"
314+
colorClasses="white bg-blue-grey mv1"
315+
/>
316+
))}
317+
</div>
318+
)}
313319
<h4>
314320
<FormattedMessage {...messages.members} />
315321
</h4>
316-
<div className="cf db mt3">
317-
{members.map((user, n) => (
318-
<UserAvatar
319-
key={n}
320-
username={user.username}
321-
picture={user.pictureUrl}
322-
colorClasses="white bg-blue-grey mv1"
323-
/>
324-
))}
325-
</div>
322+
{members.length === 0 ? (
323+
<span className="f6 blue-grey">
324+
<FormattedMessage {...messages.noMembers} />
325+
</span>
326+
) : (
327+
<div className="cf db mt3">
328+
{members.map((user, n) => (
329+
<UserAvatar
330+
key={n}
331+
username={user.username}
332+
picture={user.pictureUrl}
333+
colorClasses="white bg-blue-grey mv1"
334+
/>
335+
))}
336+
</div>
337+
)}
326338
<div className="cf db mt3">
327339
{requestedToJoin && (
328340
<span className="red pr5-ns">

frontend/src/locales/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,10 +668,12 @@
668668
"management.messages.notAllowed": "You are not allowed to manage organizations.",
669669
"management.messages.imageUpload.error": "The image upload failed.",
670670
"management.fields.managers": "Managers",
671+
"management.fields.managers.empty": "There are no managers yet.",
671672
"management.link.manage": "Manage {entity}",
672673
"management.link.edit.team": "Edit team",
673674
"management.members.edit": "Edit",
674675
"management.members": "Members",
676+
"management.members.empty": "There are no members yet.",
675677
"management.teams.mapping": "Mapping teams",
676678
"management.teams.validation": "Validation teams",
677679
"management.teams.members": "Team members",

0 commit comments

Comments
 (0)