From b57802e61fe0d80d840224980c4eeeb100b9f1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 4 May 2020 12:14:32 +0200 Subject: [PATCH] NewPanelEdit: Copy untransformed result from source panel (#24211) --- public/app/features/dashboard/state/PanelModel.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts index fcd988ac060..042b256726c 100644 --- a/public/app/features/dashboard/state/PanelModel.ts +++ b/public/app/features/dashboard/state/PanelModel.ts @@ -18,11 +18,8 @@ import { ScopedVars, } from '@grafana/data'; import { EDIT_PANEL_ID } from 'app/core/constants'; - import config from 'app/core/config'; - import { PanelQueryRunner } from './PanelQueryRunner'; -import { take } from 'rxjs/operators'; export const panelAdded = eventFactory('panel-added'); export const panelRemoved = eventFactory('panel-removed'); @@ -426,10 +423,10 @@ export class PanelModel implements DataConfigSource { const sourceQueryRunner = this.getQueryRunner(); // pipe last result to new clone query runner - sourceQueryRunner - .getData() - .pipe(take(1)) - .subscribe(val => clone.getQueryRunner().pipeDataToSubject(val)); + const lastResult = sourceQueryRunner.getLastResult(); + if (lastResult) { + clone.getQueryRunner().pipeDataToSubject(lastResult); + } return clone; }