-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SFR-2239: Remove error codes from error page #536
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,68 +14,67 @@ import { FeedbackContext } from "../context/FeedbackContext"; | |
|
||
const ERROR_PERSISTS = " if the error persists."; | ||
|
||
const getNotificationText = (statusCode) => { | ||
return `You are asking for help or information about a page error (error code ${statusCode})`; | ||
}; | ||
|
||
const errorMap = { | ||
500: { | ||
overline: "error 500", | ||
heading: "Something went wrong on our end.", | ||
subText: "We encountered an error while trying to load the page. ", | ||
tryText: "Try refreshing the page or ", | ||
}, | ||
404: { | ||
overline: "error 404", | ||
heading: "We couldn't find that page.", | ||
subText: | ||
"The page you were looking for doesn't exist or may have moved elsewhere. ", | ||
tryText: "Try a different URL or ", | ||
}, | ||
400: { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. May want to consider having a default error map. |
||
overline: "error 400", | ||
heading: "There was an unexpected error.", | ||
subText: "We couldn't process your request at this time. ", | ||
tryText: "Try again later or ", | ||
}, | ||
}; | ||
|
||
const Error = ({ statusCode }) => { | ||
const { onOpen, isError, setNotificationText, setIsError } = | ||
const { onOpen, isError, setIsError, setStatusCode } = | ||
useContext(FeedbackContext); | ||
|
||
useEffect(() => { | ||
if (!isError) { | ||
setIsError(true); | ||
setNotificationText(getNotificationText(statusCode)); | ||
setStatusCode(statusCode); | ||
} | ||
}, [isError, setIsError, setNotificationText, statusCode]); | ||
}, [isError, setIsError, setStatusCode, statusCode]); | ||
|
||
// default to 400 messages for unexpected error codes | ||
const errorValues = errorMap[statusCode] | ||
? errorMap[statusCode] | ||
: errorMap[400]; | ||
|
||
return ( | ||
<Layout> | ||
<Flex | ||
alignItems="center" | ||
flexDir="column" | ||
paddingLeft="l" | ||
paddingRight="l" | ||
textAlign="center" | ||
role="alert" | ||
> | ||
<Image | ||
src="/images/error-img.png" | ||
alt="" | ||
marginBottom="xl" | ||
marginTop="xxxl" | ||
marginTop={{ base: "xl", md: "xxxl" }} | ||
width={100} | ||
/> | ||
<Text size="overline1">{errorMap[statusCode].overline}</Text> | ||
<Heading marginTop="s" marginBottom="s"> | ||
{errorMap[statusCode].heading} | ||
{errorValues.heading} | ||
</Heading> | ||
<Box> | ||
<Text noSpace display={{ base: "inline", md: "block" }}> | ||
{errorMap[statusCode].subText} | ||
{errorValues.subText} | ||
</Text> | ||
<Text noSpace display="inline"> | ||
{errorMap[statusCode].tryText} | ||
{errorValues.tryText} | ||
</Text> | ||
<Button | ||
buttonType="text" | ||
|
@@ -89,7 +88,11 @@ const Error = ({ statusCode }) => { | |
</Button> | ||
{ERROR_PERSISTS} | ||
</Box> | ||
<Box width="fit-content" marginTop="xxl" marginBottom="xxxl"> | ||
<Box | ||
width="fit-content" | ||
marginTop={{ base: "xl", md: "xxl" }} | ||
marginBottom={{ base: "xxl", md: "xxxl" }} | ||
> | ||
<Link to="/" linkType="buttonPrimary"> | ||
Back to Digital Research Books | ||
</Link> | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice - looks good!