Chore: Refactor isSharedDashboardQuery to narrow type natrually (#42312)

This commit is contained in:
Josh Hunt 2021-11-26 10:53:08 +00:00 committed by GitHub
parent 170da29173
commit 879cdcd0c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions

View File

@ -6,8 +6,8 @@ describe('SharedQueryRunner', () => {
expect(isSharedDashboardQuery('-- Dashboard --')).toBe(true);
expect(isSharedDashboardQuery('')).toBe(false);
expect(isSharedDashboardQuery((undefined as unknown) as string | DataSourceApi)).toBe(false);
expect(isSharedDashboardQuery((null as unknown) as string | DataSourceApi)).toBe(false);
expect(isSharedDashboardQuery((undefined as unknown) as null)).toBe(false);
expect(isSharedDashboardQuery(null)).toBe(false);
const ds = {
meta: {

View File

@ -17,11 +17,16 @@ export function isSharedDashboardQuery(datasource: string | DataSourceRef | Data
// default datasource
return false;
}
if (datasource === SHARED_DASHBOARD_QUERY || (datasource as any)?.uid === SHARED_DASHBOARD_QUERY) {
return true;
if (typeof datasource === 'string') {
return datasource === SHARED_DASHBOARD_QUERY;
}
const ds = datasource as DataSourceApi;
return ds.meta && ds.meta.name === SHARED_DASHBOARD_QUERY;
if ('meta' in datasource) {
return datasource.meta.name === SHARED_DASHBOARD_QUERY || datasource.uid === SHARED_DASHBOARD_QUERY;
}
return datasource.uid === SHARED_DASHBOARD_QUERY;
}
export function runSharedRequest(options: QueryRunnerOptions): Observable<PanelData> {