Merge branch 'main' into schemav2-bring-back-reverts

grafana · dprokop · Jul 30, 2025 · Jul 16, 2025 · Jul 16, 2025 · Jul 16, 2025
commit 5aa647e66881d04d0a6e0d66dfe1e7b21c160960
@@ -4,6 +4,12 @@ import { DataSourceInstanceSettings, DataSourceRef, PanelPluginMeta, TypedVariab
 import { Dashboard, DashboardCursorSync, ThresholdsMode } from '@grafana/schema';
 import { DatasourceVariableKind, QueryVariableKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
 import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2_examples';
+import {
+  DatasourceVariableKind,
+  LibraryPanelKind,
+  PanelKind,
+  QueryVariableKind,
+} from '@grafana/schema/dist/esm/schema/dashboard/v2';
 import config from 'app/core/config';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { createAdHocVariableAdapter } from 'app/features/variables/adhoc/adapter';

@@ -10,7 +10,9 @@ import {
   AnnotationQueryKind,
   QueryVariableKind,
   LibraryPanelRef,
+  LibraryPanelKind
 } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { notifyApp } from 'app/core/actions';
 import config from 'app/core/config';
 import { createErrorNotification } from 'app/core/copy/appNotification';
 import { buildPanelKind } from 'app/features/dashboard/api/ResponseTransformers';

@@ -4,7 +4,7 @@ import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
 import { Dashboard } from '@grafana/schema/dist/esm/index.gen';
 import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
-import { Alert, Label, RadioButtonGroup, Stack, Switch, TextLink } from '@grafana/ui';
+import { Alert, Label, RadioButtonGroup, Stack, Switch } from '@grafana/ui';
 import { DashboardJson } from 'app/features/manage-dashboards/types';
 
 import { ExportableResource } from '../ShareExportTab';

@@ -1,7 +1,11 @@
 import { config } from '@grafana/runtime';
 import { SceneTimeRange } from '@grafana/scenes';
 import { Dashboard } from '@grafana/schema/dist/esm/index.gen';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { 
+    Spec as DashboardV2Spec,
+    defaultQueryGroupKind,
+    defaultVizConfigSpec
+} from '@grafana/schema/dist/esm/schema/dashboard/v2';
 import * as ResponseTransformers from 'app/features/dashboard/api/ResponseTransformers';
 import { DashboardJson } from 'app/features/manage-dashboards/types';
 import { DashboardDataDTO } from 'app/types/dashboard';
@@ -436,10 +440,19 @@ describe('ShareExportTab', () => {
       overlay: tab,
     });
 
-    scene.serializer.getSaveModel = jest.fn(() => mockV2Dashboard);
-    scene.serializer.makeExportableExternally = jest.fn(() => Promise.resolve(mockV2Dashboard));
-    scene.serializer.apiVersion = 'dashboard.grafana.app/v2alpha2';
-    scene.getInitialSaveModel = jest.fn(() => mockV2Dashboard);
+    // Set up the scene based on current version
+    const currentDashboard = version === 'v1' ? mockV1Dashboard : mockV2Dashboard;
+    const initialSaveModel = initialSaveModelVersion === 'v1' ? mockV1Dashboard : mockV2Dashboard;
+    const apiVersion = version === 'v1' ? 'dashboard.grafana.app/v1beta1' : 'dashboard.grafana.app/v2alpha2';
+
+    scene.serializer.getSaveModel = jest.fn(() => currentDashboard);
+    scene.serializer.makeExportableExternally = jest.fn(() =>
+      Promise.resolve(
+        version === 'v1' ? ({ ...mockV1Dashboard, panels: mockV1Dashboard.panels } as DashboardJson) : mockV2Dashboard
+      )
+    );
+    scene.serializer.apiVersion = apiVersion;
+    scene.getInitialSaveModel = jest.fn(() => initialSaveModel);
 
     return tab;
   }