Commit afc227de authored by Axel Bocciarelli's avatar Axel Bocciarelli

Merge branch 'fix-routes' into 'master'

Fix router switch

Closes #406

See merge request !439
parents 868122d9 81b51936
Pipeline #32575 passed with stages
in 8 minutes and 18 seconds
......@@ -134,44 +134,41 @@ function App() {
{isSampleTrackingEnabled && (
<Route exact path="/addresses" component={AddressesPage} />
)}
<LoadingBoundary message="Loading investigation..." spacedOut>
<Route
exact
path="/investigation/:investigationId/datasets"
render={({ match }) =>
UI.investigationContainer.isDatasetListVisible ? (
<DatasetsPage />
) : (
<Redirect
to={`/investigation/${match.params.investigationId}/events`}
/>
)
}
/>
<Route
exact
path="/investigation/:investigationId/events/tagManager"
component={EventTagPage}
/>
<Route
exact
path="/investigation/:investigationId/events"
component={EventsPage}
/>
{isSampleTrackingEnabled && (
<Route path="/investigation">
<LoadingBoundary message="Loading investigation..." spacedOut>
<Route
exact
path="/investigation/:investigationId/shipping"
component={ShippingPage}
path="/investigation/:investigationId/datasets"
render={({ match }) =>
UI.investigationContainer.isDatasetListVisible ? (
<DatasetsPage />
) : (
<Redirect
to={`/investigation/${match.params.investigationId}/events`}
/>
)
}
/>
)}
<Route
exact
path="/investigation/:investigationId/parcel/:parcelId"
component={ParcelPage}
/>
</LoadingBoundary>
<Route path="/investigation/:investigationId/events/tagManager">
<EventTagPage />
</Route>
<Route path="/investigation/:investigationId/events">
<EventsPage />
</Route>
{isSampleTrackingEnabled && (
<Route path="/investigation/:investigationId/shipping">
<ShippingPage />
</Route>
)}
<Route path="/investigation/:investigationId/parcel/:parcelId">
<ParcelPage />
</Route>
</LoadingBoundary>
</Route>
<Route exact path="/selection" component={SelectionPage} />
<Route exact path="/selection/mint" component={MintSelectionPage} />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment