Update Avatar to use not userDipslayNameAsString function

This commit is contained in:
Jenni Nurmi 2019-02-08 09:53:57 +02:00
parent fb5e0ec73b
commit ccbbc1a290
3 changed files with 19 additions and 5 deletions

View file

@ -6,7 +6,7 @@ import { propTypes } from '../../util/types';
import {
ensureUser,
ensureCurrentUser,
userDisplayName,
userDisplayNameAsString,
userAbbreviatedName,
} from '../../util/data';
import { ResponsiveImage, IconBannedUser, NamedLink } from '../../components/';
@ -34,14 +34,26 @@ export const AvatarComponent = props => {
const avatarUser = userIsCurrentUser ? ensureCurrentUser(user) : ensureUser(user);
const isBannedUser = avatarUser.attributes.banned;
const isDeletedUser = avatarUser.attributes.deleted;
const bannedUserDisplayName = intl.formatMessage({
id: 'Avatar.bannedUserDisplayName',
});
const bannedUserAbbreviatedName = '';
const displayName = userDisplayName(avatarUser, bannedUserDisplayName);
const abbreviatedName = userAbbreviatedName(avatarUser, bannedUserAbbreviatedName);
const deletedUserDisplayName = intl.formatMessage({
id: 'Avatar.deletedUserDisplayName',
});
const defaultUserDisplayName = isBannedUser
? bannedUserDisplayName
: isDeletedUser
? deletedUserDisplayName
: '';
const defaultUserAbbreviatedName = '';
const displayName = userDisplayNameAsString(avatarUser, defaultUserDisplayName);
const abbreviatedName = userAbbreviatedName(avatarUser, defaultUserAbbreviatedName);
const rootProps = { className: classes, title: displayName };
const linkProps = avatarUser.id
? { name: 'ProfilePage', params: { id: avatarUser.id.uuid } }
@ -49,7 +61,7 @@ export const AvatarComponent = props => {
const hasProfileImage = avatarUser.profileImage && avatarUser.profileImage.id;
const profileLinkEnabled = !disableProfileLink;
if (isBannedUser) {
if (isBannedUser || isDeletedUser) {
return (
<div {...rootProps}>
<IconBannedUser className={css.bannedUserIcon} />

View file

@ -109,6 +109,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
>
<div
className=""
title=""
>
<span />
</div>

View file

@ -37,6 +37,7 @@
"AuthenticationPage.verifyEmailText": "Thanks for signing up! There's one quick step left. To be able to contact you, we need you to verify your email address. Please click the link we sent to {email}.",
"AuthenticationPage.verifyEmailTitle": "{name}, check your inbox to verify your email",
"Avatar.bannedUserDisplayName": "Banned user",
"Avatar.deletedUserDisplayName": "Deleted user",
"BookingBreakdown.bookingPeriod": "{bookingStart} {bookingEnd}",
"BookingBreakdown.commission": "Saunatime fee *",
"BookingBreakdown.commissionFeeNote": "* The fee helps us run the platform and provide the best possible service to you!",