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

Public Dashboards: Fixing annotations validations for public dashboards (#57455)

Browse Source
This commit is contained in:
lean.dev 2022-10-21 12:06:39 -03:00 committed by GitHub
parent 07ac388e8b
commit 654db452cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts
View File

@ -4,10 +4,10 @@ import { catchError, filter, finalize, map, mergeAll, mergeMap, reduce, takeUnti
import { AnnotationQuery, DataSourceApi } from '@grafana/data';
import { getDataSourceSrv } from '@grafana/runtime';
import { getConfig } from 'app/core/config';
import { AnnotationQueryFinished, AnnotationQueryStarted } from '../../../../types/events';
import { PUBLIC_DATASOURCE, PublicDashboardDataSource } from '../../../dashboard/services/PublicDashboardDataSource';
import { DashboardModel } from '../../../dashboard/state';
import { AnnotationsQueryRunner } from './AnnotationsQueryRunner';
import { getDashboardQueryRunner } from './DashboardQueryRunner';
@ -47,7 +47,8 @@ export class AnnotationsWorker implements DashboardQueryRunnerWorker {
}
const observables = annotations.map((annotation) => {
let datasourceObservable;
if (dashboard.meta.publicDashboardAccessToken !== '') {
if (getConfig().isPublicDashboardView) {
const pubdashDatasource = new PublicDashboardDataSource(PUBLIC_DATASOURCE);
datasourceObservable = of(pubdashDatasource).pipe(catchError(handleDatasourceSrvError));
} else {
@ -109,8 +110,4 @@ export class AnnotationsWorker implements DashboardQueryRunnerWorker {
private static getAnnotationsToProcessFilter(annotation: AnnotationQuery): boolean {
return annotation.enable && !Boolean(annotation.snapshotData);
}
publicDashboardViewMode(dashboard: DashboardModel): boolean {
return dashboard.meta.publicDashboardAccessToken !== undefined && dashboard.meta.publicDashboardAccessToken !== '';
}
}