diff --git a/pkg/tests/apis/dashboard/dashboards_test.go b/pkg/tests/apis/dashboard/dashboards_test.go index 7980b6475b2..fe6b59bc7b4 100644 --- a/pkg/tests/apis/dashboard/dashboards_test.go +++ b/pkg/tests/apis/dashboard/dashboards_test.go @@ -1,7 +1,6 @@ package dashboards import ( - "fmt" "testing" "github.com/stretchr/testify/require" @@ -48,7 +47,7 @@ func TestIntegrationDashboardsApp(t *testing.T) { t.Run("Check discovery client", func(t *testing.T) { disco := helper.GetGroupVersionInfoJSON("dashboard.grafana.app") - fmt.Printf("%s", string(disco)) + // fmt.Printf("%s", disco) require.JSONEq(t, `[ { diff --git a/pkg/tests/apis/datasource/testdata_test.go b/pkg/tests/apis/datasource/testdata_test.go index 328cf81e352..da3283ec8e3 100644 --- a/pkg/tests/apis/datasource/testdata_test.go +++ b/pkg/tests/apis/datasource/testdata_test.go @@ -42,7 +42,7 @@ func TestIntegrationTestDatasource(t *testing.T) { t.Run("Check discovery client", func(t *testing.T) { disco := helper.GetGroupVersionInfoJSON("testdata.datasource.grafana.app") - // fmt.Printf("%s", string(disco)) + // fmt.Printf("%s", disco) require.JSONEq(t, `[ { diff --git a/pkg/tests/apis/playlist/playlist_test.go b/pkg/tests/apis/playlist/playlist_test.go index fd4a0939732..1083dde313b 100644 --- a/pkg/tests/apis/playlist/playlist_test.go +++ b/pkg/tests/apis/playlist/playlist_test.go @@ -47,7 +47,7 @@ func TestIntegrationPlaylist(t *testing.T) { // The accepted verbs will change when dual write is enabled disco := h.GetGroupVersionInfoJSON("playlist.grafana.app") - // fmt.Printf("%s", string(disco)) + // fmt.Printf("%s", disco) require.JSONEq(t, `[ { "version": "v0alpha1", diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx index 67be7d0fcde..a456c924de0 100644 --- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx +++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx @@ -356,7 +356,7 @@ export class DashboardScene extends SceneObjectBase { public onRestore = async (version: DecoratedRevisionModel): Promise => { const versionRsp = await getHistorySrv().restoreDashboard(version.uid, version.version); - + const rev = (versionRsp as SaveDashboardResponseDTO).version; if (!Number.isInteger(version)) { return false; diff --git a/public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts index 9ccf740be39..1721a2dcb5d 100644 --- a/public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts +++ b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts @@ -21,10 +21,9 @@ export type DecoratedRevisionModel = VersionModel & { checked: boolean; createdDateString: string; ageString: string; - data?: Dashboard + data?: Dashboard; }; - export interface HistorySrv { getHistoryList(dashboardUID: string, options: HistoryListOpts): Promise; getDashboardVersion(dashboardUID: string, version: number | string): Promise; // Just the spec (for now) diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx index 4a9b88d0708..c61c131902d 100644 --- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx +++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx @@ -3,11 +3,12 @@ import * as React from 'react'; import { Spinner, HorizontalGroup } from '@grafana/ui'; import { Page } from 'app/core/components/Page/Page'; +import { VersionHistoryHeader, VersionsHistoryButtons } from 'app/features/dashboard-scene/settings/version-history'; import { - VersionHistoryHeader, - VersionsHistoryButtons, -} from 'app/features/dashboard-scene/settings/version-history'; -import { DecoratedRevisionModel, VersionModel, getHistorySrv } from 'app/features/dashboard-scene/settings/version-history/HistorySrv'; + DecoratedRevisionModel, + VersionModel, + getHistorySrv, +} from 'app/features/dashboard-scene/settings/version-history/HistorySrv'; import { VersionHistoryComparison } from '../VersionHistory/VersionHistoryComparison'; import { VersionHistoryTable } from '../VersionHistory/VersionHistoryTable';