From b4a8496b0600451439204d7ed768ebd4dc3600e6 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 29 Aug 2022 16:03:34 +0200
Subject: [PATCH] QueryEditorRow: filter data on mount (#54260) (#54392)

This works correctly on initial dashboard load. However, when an action
is taken that triggers a "re-mount", e.g. opening the options pane on
the right side of the page, the `data` prop becomes undefined.

(cherry picked from commit 87375f570d9b0b2717211cbd28d1c098e9b02326)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
---
 public/app/features/query/components/QueryEditorRow.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index 3229f5de665..360c2ffa24c 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -82,6 +82,10 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
   };
 
   componentDidMount() {
+    const { data, query } = this.props;
+    const dataFilteredByRefId = filterPanelDataToQuery(data, query.refId);
+    this.setState({ data: dataFilteredByRefId });
+
     this.loadDatasource();
   }