Query settings debug

grafadruid · Dec 30, 2020 · 93c97a6 · 93c97a6
1 parent c01b949
commit 93c97a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/pkg/druid.go b/pkg/druid.go
@@ -289,9 +289,15 @@ func (ds *druidDatasource) prepareQuery(qry []byte, s *druidInstanceSettings) (d
 	if err != nil {
 		return nil, nil, err
 	}
-	q.Builder["context"] = ds.mergeQueryContexts(
-		ds.prepareQueryContext(s.queryContextParameters),
-		ds.prepareQueryContext(q.Settings["contextParameters"].([]interface{})))
+
+	if queryContextParameters, ok := q.Settings["contextParameters"]; ok {
+		q.Builder["context"] = ds.mergeQueryContexts(
+			ds.prepareQueryContext(s.queryContextParameters),
+			ds.prepareQueryContext(queryContextParameters.([]interface{})))
+	} else {
+		q.Builder["context"] = ds.prepareQueryContext(s.queryContextParameters)
+	}
+
 	jsonQuery, err := json.Marshal(q.Builder)
 
 	if err != nil {
@@ -307,9 +313,11 @@ func (ds *druidDatasource) prepareQuery(qry []byte, s *druidInstanceSettings) (d
 
 func (ds *druidDatasource) prepareQueryContext(parameters []interface{}) map[string]interface{} {
 	ctx := make(map[string]interface{})
-	for _, parameter := range parameters {
-		p := parameter.(map[string]interface{})
-		ctx[p["name"].(string)] = p["value"]
+	if parameters != nil {
+		for _, parameter := range parameters {
+			p := parameter.(map[string]interface{})
+			ctx[p["name"].(string)] = p["value"]
+		}
 	}
 	return ctx
 }
@@ -786,7 +794,7 @@ func (ds *druidDatasource) prepareResponse(resp *druidResponse, settings map[str
 		}
 		frame.Fields = append(frame.Fields, data.NewField(c.Name, nil, ff))
 	}
-	if settings["format"].(string) == "wide" && len(frame.Fields) > 0 {
+	if format, ok := settings["format"]; ok && format.(string) == "wide" && len(frame.Fields) > 0 {
 		f, err := data.LongToWide(frame, nil)
 		if err == nil {
 			frame = f

diff --git a/src/configuration/QuerySettings/DruidQueryFormatSettings.tsx b/src/configuration/QuerySettings/DruidQueryFormatSettings.tsx
@@ -10,13 +10,13 @@ export class DruidQueryFormatSettings extends PureComponent<QuerySettingsProps>
     const { settings } = this.props.options;
 
     if (settings.format === undefined) {
-      settings.format = 'wide';
+      settings.format = 'long';
     }
   }
 
   selectOptions: Array<SelectableValue<string>> = [
-    { label: 'Wide', value: 'wide' },
     { label: 'Long', value: 'long' },
+    { label: 'Wide', value: 'wide' },
   ];
 
   selectOptionByValue = (value?: string): SelectableValue<string> | undefined => {