opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 14:52:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix export tab not including variables when exporting externally
This commit is contained in:
Oscar Kilhed
2024-04-09 20:39:30 +02:00
committed by GitHub
parent 66c0fd4dcc
commit 96abe65fe4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/features/dashboard-scene/sharing/ShareExportTab.tsx
View File

@ -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 && (