[v11.0.x] Dashboard scenes: Fix export tab not including variables when exporting externally (#85824)

Dashboard scenes: Fix export tab not including variables when exporting externally (#85807)

Fix export tab not including variables when exporting externally

(cherry picked from commit 96abe65fe4)

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-04-10 08:25:36 +02:00
committed by GitHub
co-authored by Oscar Kilhed
parent 8f0cae0111
commit 2599f9985f
@@ -11,12 +11,11 @@ import { shareDashboardType } from 'app/features/dashboard/components/ShareModal
import { DashboardModel } from 'app/features/dashboard/state';
import { transformSceneToSaveModel } from '../serialization/transformSceneToSaveModel';
import { getVariablesCompatibility } from '../utils/getVariablesCompatibility';
import { DashboardInteractions } from '../utils/interactions';
import { SceneShareTabState } from './types';
const exportExternallyTranslation = t('share-modal.export.share-externally-label', `Export for sharing externally`);
interface ShareExportTabState extends SceneShareTabState {
isSharingExternally?: boolean;
isViewingJSON?: boolean;
@@ -61,7 +60,13 @@ export class ShareExportTab extends SceneObjectBase<ShareExportTabState> {
const saveModel = transformSceneToSaveModel(dashboardRef.resolve());
const exportable = isSharingExternally
? await this._exporter.makeExportable(new DashboardModel(saveModel))
? await this._exporter.makeExportable(
new DashboardModel(saveModel, undefined, {
getVariablesFromState: () => {
return getVariablesCompatibility(window.__grafanaSceneContext);
},
})
)
: saveModel;
return exportable;
@@ -100,6 +105,8 @@ function ShareExportTabRenderer({ model }: SceneComponentProps<ShareExportTab>)
return '';
}, [isViewingJSON]);
const exportExternallyTranslation = t('share-modal.export.share-externally-label', `Export for sharing externally`);
return (
<>
{!isViewingJSON && (