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

Dashboard: Fixes issue with compatability of old DashboardModel.annotations (#97328)

Browse Source 
* Dashboard: Fixes issue with compatability of old DashboardModel.annotations

* let's lint this thing

---------

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
This commit is contained in:
Torkel Ödegaard 2024-12-05 12:50:21 +01:00 committed by GitHub
parent 3e96431bd6
commit 53cdbd8a2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts
View File

@ -1,18 +1,12 @@
import { TimeRangeUpdatedEvent } from '@grafana/runtime'; import { TimeRangeUpdatedEvent } from '@grafana/runtime';
import { import { behaviors, SceneQueryRunner, SceneTimeRange, VizPanel, SceneDataTransformer } from '@grafana/scenes';
behaviors,
SceneQueryRunner,
SceneTimeRange,
VizPanel,
SceneDataTransformer,
SceneDataLayerSet,
} from '@grafana/scenes';
import { DashboardCursorSync } from '@grafana/schema'; import { DashboardCursorSync } from '@grafana/schema';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard'; import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { AlertStatesDataLayer } from '../scene/AlertStatesDataLayer'; import { AlertStatesDataLayer } from '../scene/AlertStatesDataLayer';
import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer'; import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
import { DashboardControls } from '../scene/DashboardControls'; import { DashboardControls } from '../scene/DashboardControls';
import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
import { DashboardScene } from '../scene/DashboardScene'; import { DashboardScene } from '../scene/DashboardScene';
import { DefaultGridLayoutManager } from '../scene/layout-default/DefaultGridLayoutManager'; import { DefaultGridLayoutManager } from '../scene/layout-default/DefaultGridLayoutManager';
import { NEW_LINK } from '../settings/links/utils'; import { NEW_LINK } from '../settings/links/utils';
@ -150,8 +144,8 @@ function setup() {
weekStart: 'friday', weekStart: 'friday',
timeZone: 'America/New_York', timeZone: 'America/New_York',
}), }),
$data: new SceneDataLayerSet({ $data: new DashboardDataLayerSet({
layers: [ annotationLayers: [
new DashboardAnnotationsDataLayer({ new DashboardAnnotationsDataLayer({
key: `annotations-test`, key: `annotations-test`,
query: { query: {

7
public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts
View File

@ -2,8 +2,9 @@ import { Subscription } from 'rxjs';
import { AnnotationQuery, DashboardCursorSync, dateTimeFormat, DateTimeInput, EventBusSrv } from '@grafana/data'; import { AnnotationQuery, DashboardCursorSync, dateTimeFormat, DateTimeInput, EventBusSrv } from '@grafana/data';
import { TimeRangeUpdatedEvent } from '@grafana/runtime'; import { TimeRangeUpdatedEvent } from '@grafana/runtime';
import { behaviors, SceneDataLayerSet, sceneGraph, SceneObject, VizPanel } from '@grafana/scenes'; import { behaviors, sceneGraph, SceneObject, VizPanel } from '@grafana/scenes';
import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
import { DashboardScene } from '../scene/DashboardScene'; import { DashboardScene } from '../scene/DashboardScene';
import { dataLayersToAnnotations } from '../serialization/dataLayersToAnnotations'; import { dataLayersToAnnotations } from '../serialization/dataLayersToAnnotations';
@ -104,8 +105,8 @@ export class DashboardModelCompatibilityWrapper {
public get annotations(): { list: AnnotationQuery[] } { public get annotations(): { list: AnnotationQuery[] } {
const annotations: { list: AnnotationQuery[] } = { list: [] }; const annotations: { list: AnnotationQuery[] } = { list: [] };
if (this._scene.state.$data instanceof SceneDataLayerSet) { if (this._scene.state.$data instanceof DashboardDataLayerSet) {
annotations.list = dataLayersToAnnotations(this._scene.state.$data.state.layers); annotations.list = dataLayersToAnnotations(this._scene.state.$data.state.annotationLayers);
} }
return annotations; return annotations;