gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(ui): Fix crash when viewing an invalid certificate (#43681)

Browse Source 
* fix: remove empty object literal creation causing #43224

* fix: initialize userByName selector using empty object from initialState to keep the same reference instead

* fix(lang): added translation for invalid certificate
This commit is contained in:
Lim Shang Yi
2021-10-07 03:05:05 +08:00
committed by GitHub
parent 7824f13f5f
commit df8dc9b9c6
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/i18n/locales/english/translations.json
View File

@ -463,7 +463,8 @@
"no-account": "No {{website}} account associated", "no-account": "No {{website}} account associated",
"unlink-success": "You've successfully unlinked your {{website}}", "unlink-success": "You've successfully unlinked your {{website}}",
"provide-username": "Check if you have provided a username and a report", "provide-username": "Check if you have provided a username and a report",
"report-sent": "A report was sent to the team with {{email}} in copy" "report-sent": "A report was sent to the team with {{email}} in copy",
"certificate-missing": "The certification you tried to view does not exist"
}, },
"validation": { "validation": {
"max-characters": "There is a maximum limit of 288 characters, you have {{charsLeft}} left", "max-characters": "There is a maximum limit of 288 characters, you have {{charsLeft}} left",

3
client/src/client-only-routes/show-certification.tsx
View File

@ -27,6 +27,7 @@ import {
} from '../redux'; } from '../redux';
import { UserType } from '../redux/prop-types'; import { UserType } from '../redux/prop-types';
import { certMap } from '../resources/cert-and-project-map'; import { certMap } from '../resources/cert-and-project-map';
import certificateMissingMessage from '../utils/certificate-missing-message';
import reallyWeirdErrorMessage from '../utils/really-weird-error-message'; import reallyWeirdErrorMessage from '../utils/really-weird-error-message';
import standardErrorMessage from '../utils/standard-error-message'; import standardErrorMessage from '../utils/standard-error-message';
@ -205,7 +206,7 @@ const ShowCertification = (props: IShowCertificationProps): JSX.Element => {
} = props; } = props;
if (!isValidCert) { if (!isValidCert) {
createFlashMessage(standardErrorMessage); createFlashMessage(certificateMissingMessage);
return <RedirectHome />; return <RedirectHome />;
} }

5
client/src/redux/index.js
View File

@ -229,8 +229,9 @@ export const shouldRequestDonationSelector = state => {
export const userByNameSelector = username => state => { export const userByNameSelector = username => state => {
const { user } = state[ns]; const { user } = state[ns];
// TODO: Why return a string or empty objet literal? // return initial state empty user empty object instead of empty
return username in user ? user[username] : {}; // object litteral to prevent components from re-rendering unnecessarily
return user[username] ?? initialState.user;
}; };
export const certificatesByNameSelector = username => state => { export const certificatesByNameSelector = username => state => {

6
client/src/utils/certificate-missing-message.ts Normal file
View File

@ -0,0 +1,6 @@
const certificateMissingErrorMessage = {
type: 'danger',
message: 'flash.certificate-missing'
};
export default certificateMissingErrorMessage;