3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-31 01:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

add front end support for optional first paragraph of markdown on err… (#3546)

Browse source 
add front end support for optional first paragraph of markdown on error messgage
This commit is contained in:
Nathan Hayfield 2022-08-11 15:45:08 +02:00 • committed by GitHub
parent f87e138eab
commit 9fc43930bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ui/package.json
View file

@ -30,6 +30,7 @@
"@mui/icons-material": "^5.3.1", "@mui/icons-material": "^5.3.1",
"@mui/material": "^5.4.0", "@mui/material": "^5.4.0",
"luxon": "^2.3.0", "luxon": "^2.3.0",
"markdown-to-jsx": "^7.1.7",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-feather": "^2.0.9" "react-feather": "^2.0.9"

8
ui/src/components/ErrorPage.tsx
View file

@ -8,6 +8,7 @@ import Paper from "@mui/material/Paper";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import React, { FC } from "react"; import React, { FC } from "react";
import Markdown from "markdown-to-jsx";
export type ErrorPageProps = { export type ErrorPageProps = {
data: ErrorPageData; data: ErrorPageData;
@ -26,6 +27,13 @@ export const ErrorPage: FC<ErrorPageProps> = ({ data }) => {
{data?.error || "Internal Server Error"} {data?.error || "Internal Server Error"}
</Alert> </Alert>
</Box> </Box>
{!!data?.errorMessageFirstParagraph && (
<Box sx={{p: 4}}>
<Markdown>
{data.errorMessageFirstParagraph}
</Markdown>
</Box>
)}
{data?.requestId ? ( {data?.requestId ? (
<SectionFooter> <SectionFooter>
<Typography variant="caption"> <Typography variant="caption">

1
ui/src/types/index.ts
View file

@ -96,6 +96,7 @@ export type ErrorPageData = BasePageData & {
requestId?: string; requestId?: string;
status?: number; status?: number;
statusText?: string; statusText?: string;
errorMessageFirstParagraph?: string;
}; };
export type UserInfoData = { export type UserInfoData = {

5
ui/yarn.lock
View file

@ -1873,6 +1873,11 @@ make-error@^1.1.1:
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
markdown-to-jsx@^7.1.7:
version "7.1.7"
resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.7.tgz#a5f22102fb12241c8cea1ca6a4050bb76b23a25d"
integrity sha512-VI3TyyHlGkO8uFle0IOibzpO1c1iJDcXcS/zBrQrXQQvJ2tpdwVzVZ7XdKsyRz1NdRmre4dqQkMZzUHaKIG/1w==
merge2@^1.3.0, merge2@^1.4.1: merge2@^1.3.0, merge2@^1.4.1:
version "1.4.1" version "1.4.1"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"