A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix: Unified handling of `HttpErrorContent` and `RouteErrorBoundary`
haitaood80d34419d66
diff --git a/ui/src/components/HttpErrorContent/index.tsx b/ui/src/components/HttpErrorContent/index.tsxindex 28307d8a..abbb976c 100644--- a/ui/src/components/HttpErrorContent/index.tsx+++ b/ui/src/components/HttpErrorContent/index.tsx@@ -1,4 +1,4 @@-import { memo } from 'react';+import { memo, useEffect } from 'react';import { Link } from 'react-router-dom';import { useTranslation } from 'react-i18next';@@ -6,13 +6,28 @@ import { usePageTags } from '@/hooks';const Index = ({ httpCode = '', errMsg = '' }) => {const { t } = useTranslation('translation', { keyPrefix: 'page_error' });+ useEffect(() => {+ // auto height of container+ const pageWrap = document.querySelector('.page-wrap');+ if (pageWrap) {+ // @ts-ignore+ pageWrap.style.display = 'contents';+ }++ return () => {+ if (pageWrap) {+ // @ts-ignore+ pageWrap.style.display = 'block';+ }+ };+ }, []);usePageTags({title: t(`http_${httpCode}`, { keyPrefix: 'page_title' }),});return (- <>+ <div className="d-flex flex-column flex-shrink-1 flex-grow-1 justify-content-center align-items-center"><divclassName="mb-4 text-secondary"style={{ fontSize: '120px', lineHeight: 1.2 }}>@@ -27,7 +42,7 @@ const Index = ({ httpCode = '', errMsg = '' }) => {{t('back_home')}</Link></div>- </>+ </div>);};diff --git a/ui/src/pages/404/index.jsx b/ui/src/pages/404/index.jsxindex 0f088abc..5c174055 100644--- a/ui/src/pages/404/index.jsx+++ b/ui/src/pages/404/index.jsx@@ -1,27 +1,8 @@-/* eslint-disable import/no-unresolved */-import { useEffect } from 'react';-import { Container } from 'react-bootstrap';-+// eslint-disable-next-line import/no-unresolvedimport { HttpErrorContent } from '@/components';const Index = () => {- useEffect(() => {- // auto height of container- const pageWrap = document.querySelector('.page-wrap');- pageWrap.style.display = 'contents';-- return () => {- pageWrap.style.display = 'block';- };- }, []);-- return (- <Container- className="d-flex flex-column justify-content-center align-items-center"- style={{ flex: 1 }}>- <HttpErrorContent httpCode="404" />- </Container>- );+ return <HttpErrorContent httpCode="404" />;};export default Index;diff --git a/ui/src/pages/50X/index.jsx b/ui/src/pages/50X/index.jsxindex fe142ad6..ca036d9b 100644--- a/ui/src/pages/50X/index.jsx+++ b/ui/src/pages/50X/index.jsx@@ -1,27 +1,8 @@-/* eslint-disable import/no-unresolved */-import { useEffect } from 'react';-import { Container } from 'react-bootstrap';-+// eslint-disable-next-line import/no-unresolvedimport { HttpErrorContent } from '@/components';const Index = () => {- useEffect(() => {- // auto height of container- const pageWrap = document.querySelector('.page-wrap');- pageWrap.style.display = 'contents';-- return () => {- pageWrap.style.display = 'block';- };- }, []);-- return (- <Container- className="d-flex flex-column justify-content-center align-items-center"- style={{ flex: 1 }}>- <HttpErrorContent httpCode="50X" />- </Container>- );+ return <HttpErrorContent httpCode="50X" />;};export default Index;diff --git a/ui/src/pages/Layout/index.tsx b/ui/src/pages/Layout/index.tsxindex e3eff8f8..97a682f2 100644--- a/ui/src/pages/Layout/index.tsx+++ b/ui/src/pages/Layout/index.tsx@@ -42,14 +42,9 @@ const Layout: FC = () => {{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events */}<divclassName="position-relative page-wrap"- style={{ display: httpStatusCode ? 'contents' : 'block' }}onClick={imgViewer.checkClickForImgView}>{httpStatusCode ? (- <div- className="d-flex flex-column justify-content-center align-items-center"- style={{ flex: 1 }}>- <HttpErrorContent httpCode={httpStatusCode} />- </div>+ <HttpErrorContent httpCode={httpStatusCode} />) : (<Outlet />)}diff --git a/ui/src/router/RouteErrorBoundary.tsx b/ui/src/router/RouteErrorBoundary.tsxindex d70683e3..2fe5b1fa 100644--- a/ui/src/router/RouteErrorBoundary.tsx+++ b/ui/src/router/RouteErrorBoundary.tsx@@ -1,8 +1,7 @@-import Error50X from '@/pages/50X';-// import Page404 from '@/pages/404';+import { HttpErrorContent } from '@/components';-const Index = () => {- return <Error50X />;+const Index = ({ errCode = '50X', errMsg = '' }) => {+ return <HttpErrorContent httpCode={errCode} errMsg={errMsg} />;};export default Index;diff --git a/ui/src/router/RouteGuard.tsx b/ui/src/router/RouteGuard.tsxindex 823977e1..153bca51 100644--- a/ui/src/router/RouteGuard.tsx+++ b/ui/src/router/RouteGuard.tsx@@ -3,7 +3,8 @@ import { useLocation, useNavigate, useLoaderData } from 'react-router-dom';import { floppyNavigation } from '@/utils';import { TGuardFunc } from '@/utils/guard';-import { errorCodeStore } from '@/stores';++import RouteErrorBoundary from './RouteErrorBoundary';const RouteGuard: FC<{children: ReactNode;@@ -20,20 +21,14 @@ const RouteGuard: FC<{page,});- const { update: updateHttpError } = errorCodeStore();- const handleGuardError = () => {- const err = gr.error;- let errCode = err?.code;- if (errCode && typeof errCode !== 'string') {- errCode = errCode.toString();- }- if (errCode === '403' || errCode === '404' || errCode === '50X') {- updateHttpError(errCode, err?.msg);- }- };- useEffect(() => {- handleGuardError();- }, [gr.error]);+ let guardError;+ const errCode = gr.error?.code;+ if (errCode === '403' || errCode === '404' || errCode === '50X') {+ guardError = {+ code: errCode,+ msg: gr.error?.msg,+ };+ }const handleGuardRedirect = () => {const redirectUrl = gr.redirect;if (redirectUrl) {@@ -47,8 +42,10 @@ const RouteGuard: FC<{}, [location]);return (<>- {/* Route Guard */}{gr.ok ? children : null}+ {!gr.ok && guardError ? (+ <RouteErrorBoundary errCode={guardError.code} />+ ) : null}</>);};