diff options
| author | Lena <lena.becker-3@mni.thm.de> | 2021-03-02 20:15:39 +0100 |
|---|---|---|
| committer | Sascha <GlancingMind@outlook.com> | 2021-03-15 16:35:14 +0100 |
| commit | 46d38aa53fa925a2335fdf6c3b0b6f47d05dce94 (patch) | |
| tree | 907fcdf81ebdb5d424d0c51512fce6810fb7c5d2 | |
| parent | ec8a9b20696da25bf1781dd190e7ec6a8fbf5687 (diff) | |
| download | git-bug-46d38aa53fa925a2335fdf6c3b0b6f47d05dce94.tar.gz | |
Route instead of Redirect from empty bug to 404 after a hint from GM #10
| -rw-r--r-- | return-404-page.patch | 37 | ||||
| -rw-r--r-- | webui/src/App.tsx | 1 | ||||
| -rw-r--r-- | webui/src/pages/bug/BugQuery.tsx | 6 |
3 files changed, 41 insertions, 3 deletions
diff --git a/return-404-page.patch b/return-404-page.patch new file mode 100644 index 00000000..e512d622 --- /dev/null +++ b/return-404-page.patch @@ -0,0 +1,37 @@ +diff --git a/webui/src/App.tsx b/webui/src/App.tsx +index 3e8f71e..4fd0993 100644 +--- a/webui/src/App.tsx ++++ b/webui/src/App.tsx +@@ -11,7 +11,6 @@ export default function App() { + <Layout> + <Switch> + <Route path="/" exact component={ListPage} /> +- <Route path="/404bug" exact component={NotFoundPage} /> + <Route path="/bug/:id" exact component={BugPage} /> + <Route component={NotFoundPage} /> + </Switch> +diff --git a/webui/src/pages/bug/BugQuery.tsx b/webui/src/pages/bug/BugQuery.tsx +index ade64e9..5d459c4 100644 +--- a/webui/src/pages/bug/BugQuery.tsx ++++ b/webui/src/pages/bug/BugQuery.tsx +@@ -1,8 +1,10 @@ + import React from 'react'; +-import { Redirect, RouteComponentProps } from 'react-router-dom'; ++import { RouteComponentProps } from 'react-router-dom'; + + import CircularProgress from '@material-ui/core/CircularProgress'; + ++import NotFoundPage from '../notfound/NotFoundPage'; ++ + import Bug from './Bug'; + import { useGetBugQuery } from './BugQuery.generated'; + +@@ -15,7 +17,7 @@ const BugQuery: React.FC<Props> = ({ match }: Props) => { + variables: { id: match.params.id }, + }); + if (loading) return <CircularProgress />; +- if (!data?.repository?.bug) return <Redirect to="/404bug" />; ++ if (!data?.repository?.bug) return <NotFoundPage />; + if (error) return <p>Error: {error}</p>; + return <Bug bug={data.repository.bug} />; + }; diff --git a/webui/src/App.tsx b/webui/src/App.tsx index e0580b1d..4c81913c 100644 --- a/webui/src/App.tsx +++ b/webui/src/App.tsx @@ -13,7 +13,6 @@ export default function App() { <Switch> <Route path="/" exact component={ListPage} /> <Route path="/new" exact component={NewBugPage} /> - <Route path="/404bug" exact component={NotFoundPage} /> <Route path="/bug/:id" exact component={BugPage} /> <Route component={NotFoundPage} /> </Switch> diff --git a/webui/src/pages/bug/BugQuery.tsx b/webui/src/pages/bug/BugQuery.tsx index ade64e9d..5d459c42 100644 --- a/webui/src/pages/bug/BugQuery.tsx +++ b/webui/src/pages/bug/BugQuery.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { Redirect, RouteComponentProps } from 'react-router-dom'; +import { RouteComponentProps } from 'react-router-dom'; import CircularProgress from '@material-ui/core/CircularProgress'; +import NotFoundPage from '../notfound/NotFoundPage'; + import Bug from './Bug'; import { useGetBugQuery } from './BugQuery.generated'; @@ -15,7 +17,7 @@ const BugQuery: React.FC<Props> = ({ match }: Props) => { variables: { id: match.params.id }, }); if (loading) return <CircularProgress />; - if (!data?.repository?.bug) return <Redirect to="/404bug" />; + if (!data?.repository?.bug) return <NotFoundPage />; if (error) return <p>Error: {error}</p>; return <Bug bug={data.repository.bug} />; }; |