Merge pull request #15793 from grafana/hugoh/bug-can-not-use-testdatasource-in-v6

Update datasource in componentDidUpdate so that datasource is correct in state
2019-03-05 15:06:44 +01:00
parent ef59af5e38 09b036dc93
commit 6da87a17ef
1 changed files with 9 additions and 3 deletions
@@ -64,6 +64,14 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
    await loadDataSource(pageId);
  }

+  componentDidUpdate(prevProps: Props) {
+    const { dataSource } = this.props;
+
+    if (prevProps.dataSource !== dataSource) {
+      this.setState({ dataSource });
+    }
+  }
+
  onSubmit = async (evt: React.FormEvent<HTMLFormElement>) => {
    evt.preventDefault();

@@ -95,9 +103,7 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
  };

  onModelChange = (dataSource: DataSourceSettings) => {
-    this.setState({
-      dataSource: dataSource,
-    });
+    this.setState({ dataSource });
  };

  isReadOnly() {