QueryGroup: Fix infinite loop in edit mode (#67273)

2 years ago · a62cb96089
parent d51e63520c
commit a62cb96089
1 changed files with 2 additions and 1 deletions
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@ -99,7 +99,8 @@ export class QueryGroup extends PureComponent<Props, State> {
  async componentDidUpdate() {
    const { options } = this.props;

-    if (this.state.dataSource && options.dataSource.uid !== this.state.dataSource?.uid) {
+    const currentDS = await getDataSourceSrv().get(options.dataSource);
+    if (this.state.dataSource && currentDS.uid !== this.state.dataSource?.uid) {
      this.setNewQueriesAndDatasource(options);
    }
  }