fix: show username on cert if name is private (#40897)

Co-authored-by: Shaun Hamilton <51722130+ShaunSHamilton@users.noreply.github.com>
This commit is contained in:
Tom
2021-02-04 02:00:48 -06:00
committed by GitHub
parent ea1c132868
commit 30ff9b1202
2 changed files with 20 additions and 4 deletions

View File

@ -423,7 +423,7 @@ function createShowCert(app) {
] ]
}); });
} }
const { isLocked, showCerts } = user.profileUI; const { isLocked, showCerts, showName } = user.profileUI;
if (!user.name) { if (!user.name) {
return res.json({ return res.json({
@ -512,6 +512,16 @@ function createShowCert(app) {
} }
const { username, name } = user; const { username, name } = user;
if (!showName) {
return res.json({
certTitle,
username,
date: completedDate,
completionTime
});
}
return res.json({ return res.json({
certTitle, certTitle,
username, username,

View File

@ -75,6 +75,9 @@ const propTypes = {
) )
}) })
), ),
profileUI: PropTypes.shape({
showName: PropTypes.bool
}),
username: PropTypes.string username: PropTypes.string
}), }),
userFetchState: PropTypes.shape({ userFetchState: PropTypes.shape({
@ -230,13 +233,16 @@ const ShowCertification = props => {
const { const {
date, date,
name: userFullName, name: userFullName = null,
username, username,
certTitle, certTitle,
completionTime completionTime
} = cert; } = cert;
const { user } = props; const { user } = props;
const displayName = userFullName ?? username;
const certDate = new Date(date); const certDate = new Date(date);
const certYear = certDate.getFullYear(); const certYear = certDate.getFullYear();
const certMonth = certDate.getMonth(); const certMonth = certDate.getMonth();
@ -328,7 +334,7 @@ const ShowCertification = props => {
<div className='information-container'> <div className='information-container'>
<h3>This certifies that</h3> <h3>This certifies that</h3>
<h1> <h1>
<strong>{userFullName}</strong> <strong>{displayName}</strong>
</h1> </h1>
<h3>has successfully completed the freeCodeCamp.org</h3> <h3>has successfully completed the freeCodeCamp.org</h3>
<h1> <h1>
@ -362,7 +368,7 @@ const ShowCertification = props => {
</Grid> </Grid>
{signedInUserName === username ? shareCertBtns : ''} {signedInUserName === username ? shareCertBtns : ''}
<Spacer size={2} /> <Spacer size={2} />
<ShowProjectLinks user={user} name={userFullName} certName={certTitle} /> <ShowProjectLinks user={user} name={displayName} certName={certTitle} />
</div> </div>
); );
}; };