From 654db452cd33554c718769df185d81476a914b44 Mon Sep 17 00:00:00 2001
From: "lean.dev" <34773040+leandro-deveikis@users.noreply.github.com>
Date: Fri, 21 Oct 2022 12:06:39 -0300
Subject: [PATCH] Public Dashboards: Fixing annotations validations for public
 dashboards (#57455)

---
 .../state/DashboardQueryRunner/AnnotationsWorker.ts      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts b/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts
index 11ddb34a344..1c7bd84cbcb 100644
--- a/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts
+++ b/public/app/features/query/state/DashboardQueryRunner/AnnotationsWorker.ts
@@ -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 !== '';
-  }
 }