Merge pull request #14767 from grafana/14667-edit-panel

fix: When loki is default data source, datasource is passed as undefi…
2019-01-08 15:29:53 +01:00
parent 8e8b759b21 bf478a40b1
commit 6f6825c53a
1 changed files with 1 additions and 1 deletions
@@ -94,7 +94,7 @@ export class QueryOptions extends PureComponent<Props, State> {

  renderOptions() {
    const { datasource, panel } = this.props;
-    const { queryOptions } = datasource.meta;
+    const queryOptions = datasource && datasource.meta ? datasource.meta.queryOptions : undefined;

    if (!queryOptions) {
      return null;