IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Connections: Fix route-guards (#62771)

Browse Source 
* fix: use case-sensitive routes for Connections

The reason to do this is to have the backend route-guards work properly.
(The backend route guards are case-sensitive, thus if the FE would serve
the case-insensitive version, then the backend route guards could be bypassed.)

* tests: update the tests
This commit is contained in:
Levente Balogh 2023-02-03 09:00:30 +01:00 committed by GitHub
parent de97ac7128
commit cf650c9349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/connections/Connections.test.tsx
View File

@ -103,9 +103,7 @@ describe('Connections', () => {
renderPage(ROUTES.ConnectData, store);
// We expect not to see the text that would be rendered by the core "Connect data" page
// (Instead we expect to see the default route "Datasources")
expect(await screen.findByText('Datasources')).toBeVisible();
expect(await screen.findByText('Manage your existing datasource connections')).toBeVisible();
expect(screen.queryByText('Data sources')).not.toBeInTheDocument();
expect(screen.queryByText('No results matching your query were found.')).not.toBeInTheDocument();
});
});

22
public/app/features/connections/Connections.tsx
View File

@ -29,21 +29,25 @@ export default function Connections() {
}}
>
<Switch>
<Route exact path={ROUTES.Base} component={() => <Redirect to={ROUTES.ConnectData} />} />
{/* Redirect to "Connect data" by default */}
<Route exact sensitive path={ROUTES.Base} component={() => <Redirect to={ROUTES.ConnectData} />} />
<Route
exact
sensitive
path={ROUTES.YourConnections}
component={() => <NavLandingPage navId="connections-your-connections" />}
/>
<Route exact path={ROUTES.DataSources} component={DataSourcesListPage} />
<Route exact path={ROUTES.DataSourcesDetails} component={DataSourceDetailsPage} />
<Route exact path={ROUTES.DataSourcesNew} component={NewDataSourcePage} />
<Route exact path={ROUTES.DataSourcesEdit} component={EditDataSourcePage} />
<Route exact path={ROUTES.DataSourcesDashboards} component={DataSourceDashboardsPage} />
{!isConnectDataPageOverriden && <Route path={ROUTES.ConnectData} component={ConnectDataPage} />}
<Route exact sensitive path={ROUTES.DataSources} component={DataSourcesListPage} />
<Route exact sensitive path={ROUTES.DataSourcesDetails} component={DataSourceDetailsPage} />
<Route exact sensitive path={ROUTES.DataSourcesNew} component={NewDataSourcePage} />
<Route exact sensitive path={ROUTES.DataSourcesEdit} component={EditDataSourcePage} />
<Route exact sensitive path={ROUTES.DataSourcesDashboards} component={DataSourceDashboardsPage} />
{/* Default page */}
<Route component={DataSourcesListPage} />
{/* "Connect data" page - we don't register a route in case a plugin already registers a standalone page for it */}
{!isConnectDataPageOverriden && <Route exact sensitive path={ROUTES.ConnectData} component={ConnectDataPage} />}
{/* Not found */}
<Route component={() => <Redirect to="/notfound" />} />
</Switch>
</DataSourcesRoutesContext.Provider>
);