influxdb: influxql: more robust resultformat-handling (#39330)

pkg/tsdb/influxdb/model_parser.go

@@ -25,11 +25,6 @@ func (qp *InfluxdbQueryParser) Parse(query backend.DataQuery) (*Query, error) {
 
 	measurement := model.Get("measurement").MustString("")
 
-	resultFormat, err := model.Get("resultFormat").String()
-	if err != nil {
-		return nil, err
-	}
-
 	tags, err := qp.parseTags(model)
 	if err != nil {
 		return nil, err
@@ -57,7 +52,6 @@ func (qp *InfluxdbQueryParser) Parse(query backend.DataQuery) (*Query, error) {
 	return &Query{
 		Measurement: measurement,
 		Policy:      policy,
-		ResultFormat: resultFormat,
 		GroupBy:     groupBys,
 		Tags:        tags,
 		Selects:     selects,

pkg/tsdb/influxdb/models.go

@@ -5,7 +5,6 @@ import "time"
 type Query struct {
 	Measurement string
 	Policy      string
-	ResultFormat string
 	Tags        []*Tag
 	GroupBy     []*QueryPart
 	Selects     []*Select

public/app/plugins/datasource/influxdb/components/RawInfluxQLEditor.tsx

@@ -20,11 +20,14 @@ export const RawInfluxQLEditor = ({ query, onChange, onRunQuery }: Props): JSX.E
   const aliasElementId = useUniqueId();
   const selectElementId = useUniqueId();
 
+  const resultFormat = query.resultFormat ?? DEFAULT_RESULT_FORMAT;
+
   const applyDelayedChangesAndRunQuery = () => {
     onChange({
       ...query,
       query: currentQuery,
       alias: currentAlias,
+      resultFormat,
     });
     onRunQuery();
   };
@@ -51,7 +54,7 @@ export const RawInfluxQLEditor = ({ query, onChange, onRunQuery }: Props): JSX.E
             onChange({ ...query, resultFormat: v.value });
             onRunQuery();
           }}
-          value={query.resultFormat ?? DEFAULT_RESULT_FORMAT}
+          value={resultFormat}
           options={RESULT_FORMATS}
         />
         <InlineFormLabel htmlFor={aliasElementId}>Alias by</InlineFormLabel>