Skip to content

Commit

Permalink
Merge pull request #180 from grafana/mckn/adx_time_series_mode
Browse files Browse the repository at this point in the history
Bugfix: fixing so we properly select ADX time series option when editor is in raw mode.
  • Loading branch information
mckn committed Oct 22, 2020
2 parents ca773c8 + c40ec54 commit a710e2d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
- Added support for decimal data type.
- Removed global query limit to prevent data being truncated.
- Improved the visual query builder to make it easier to add aggregations to a query.
- Bugfix: fixing so we properly select ADX time series option when editor is in raw mode.

## [3.1.0]

Expand Down
4 changes: 2 additions & 2 deletions src/components/RawQueryEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class RawQueryEditor extends PureComponent<RawQueryEditorProps, State> {
state: State = {};

onRawQueryChange = (kql: string) => {
const resultFormat = selectResultFormat(this.props.query.resultFormat);
const resultFormat = selectResultFormat(this.props.query.resultFormat, true);

this.props.onChange({
...this.props.query,
Expand All @@ -56,7 +56,7 @@ export class RawQueryEditor extends PureComponent<RawQueryEditorProps, State> {
render() {
const { query, datasource, lastQueryError, lastQuery, timeNotASC, schema } = this.props;
const { showLastQuery, showHelp } = this.state;
const resultFormat = selectResultFormat(query.resultFormat);
const resultFormat = selectResultFormat(query.resultFormat, true);

const styles = getStyles();

Expand Down

0 comments on commit a710e2d

Please sign in to comment.