IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle enterprise data source tab refreshes (#37567)

Browse Source
This commit is contained in:
Todd Treece
2021-09-14 09:24:18 -04:00
committed by GitHub
parent f5ecf5c2d9
commit 9b20a24989
3 changed files with 93 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/datasources/state/actions.ts
View File

@@ -138,7 +138,7 @@ export function loadDataSource(uid: string): ThunkResult<void> {
/**
* Get data source by uid or id, if old id detected handles redirect
*/
async function getDataSourceUsingUidOrId(uid: string): Promise<DataSourceSettings> {
export async function getDataSourceUsingUidOrId(uid: string | number): Promise<DataSourceSettings> {
// Try first with uid api
try {
const byUid = await lastValueFrom(
@@ -157,7 +157,7 @@ async function getDataSourceUsingUidOrId(uid: string): Promise<DataSourceSetting
}
// try lookup by old db id
const id = parseInt(uid, 10);
const id = typeof uid === 'string' ? parseInt(uid, 10) : uid;
if (!Number.isNaN(id)) {
const response = await lastValueFrom(
getBackendSrv().fetch<DataSourceSettings>({
@@ -167,6 +167,12 @@ async function getDataSourceUsingUidOrId(uid: string): Promise<DataSourceSetting
})
);
// If the uid is a number, then this is a refresh on one of the settings tabs
// and we can return the response data
if (response.ok && typeof uid === 'number' && response.data.id === uid) {
return response.data;
}
// Not ideal to do a full page reload here but so tricky to handle this
// otherwise We can update the location using react router, but need to
// fully reload the route as the nav model page index is not matching with