Skip to content

Commit

Permalink
Reinstate errorElement for main route. Fixes #1716
Browse files Browse the repository at this point in the history
  • Loading branch information
johnaohara committed May 21, 2024
1 parent a723c2e commit cdad3f6
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions horreum-web/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
Nav,
NavItem,
NavList,
Page, PageSidebar, PageSidebarBody, Sidebar, SidebarContent, SidebarPanel, SkipToContent, ToggleGroup, Toolbar, ToolbarContent, ToolbarGroup, ToolbarItem
Page, PageSidebar, PageSidebarBody, SkipToContent, Toolbar, ToolbarContent, ToolbarGroup, ToolbarItem
} from '@patternfly/react-core';

import {
Expand All @@ -22,7 +22,7 @@ import {
} from "react-router-dom"

import {Provider, useSelector} from "react-redux"
import {isAdminSelector, isAuthenticatedSelector, isManagerSelector, LoginLogout, userProfileSelector} from "./auth"
import {isAdminSelector, LoginLogout} from "./auth"
import {initKeycloak} from "./keycloak"
import {UserProfileLink, UserSettings} from "./domain/user/UserSettings"

Expand All @@ -44,35 +44,26 @@ import NotFound from "./404"

import About from "./About"
import ContextProvider from "./context/appContext";
import {ONLY_MY_OWN, Team} from "./components/TeamSelect";
import {PageHeader, PageHeaderTools} from "@patternfly/react-core/deprecated";
import TableReportConfigPage from "./domain/reports/TableReportConfigPage";
import TableReportPage from "./domain/reports/TableReportPage";

const router = createBrowserRouter(
createRoutesFromElements(
<Route element={<Main/>}>
<Route element={<Main/>} errorElement={<NotFound/>}>
<Route index element={<AllTests/>}/>
<Route path="/test" element={<AllTests/>}/>
<Route path="/test/:testId" element={<Test/>}/>
<Route path="/test/:testId/reports/table/config/:configId" element={<TableReportConfigPage/>}/>
<Route path="/test/:testId/reports/table/:id" element={<TableReportPage/>}/>

{/*<Route path="/run/list/:testId" element={<RunList/>}/>*/}
{/*<Route path="/run/dataset/list/:testId" element={<TestDatasets/>}/>*/}
<Route path="/run/:id" element={<Run/>}/>
<Route path="/dataset/comparison" element={<DatasetComparison/>}/>

<Route path="/schema" element={<SchemaList/>}/>
<Route path="/schema/:schemaId" element={<Schema/>}/>

{/*<Route path="/changes" element={<Changes testID={1}/>}/>*/}

{/*<Route path="/reports" element={<Reports testId={1}/>}/>*/}

<Route path="/admin" element={<Admin/>}/>
<Route path="/usersettings" element={<UserSettings/>}/>
<Route element={<NotFound/>}/>
</Route>
)
);
Expand Down

0 comments on commit cdad3f6

Please sign in to comment.