Merge pull request #30 from NeedleInAJayStack/feature/eval-colDis

Sets field display name to id dis if present

Author: NeedleInAJayStack

pkg/plugin/datasource.go

@@ -477,7 +477,7 @@ func dataFrameFromGrid(grid haystack.Grid) (*data.Frame, error) {
 
 		// Set Grafana field info from Haystack grid info
 		config := &data.FieldConfig{}
-		config.DisplayName = col.Name()
+		config.DisplayName = disFromGrid(grid, col)
 		config.Unit = unitFromGrid(grid, col)
 		field.Config = config
 		fields = append(fields, field)
@@ -494,6 +494,21 @@ func dataFrameFromGrid(grid haystack.Grid) (*data.Frame, error) {
 	return frame, nil
 }
 
+// disFromGrid returns the display name of a column in a haystack grid
+func disFromGrid(grid haystack.Grid, col haystack.Col) string {
+	// If column has 'id' meta, use the Ref name
+	id := col.Meta().Get("id")
+	if id != nil {
+		switch id := id.(type) {
+		case haystack.Ref:
+			return id.Dis()
+		default:
+			return col.Name()
+		}
+	}
+	return col.Name()
+}
+
 // unitFromGrid returns the unit of a column in a haystack grid
 // It is expected that the column is from the grid
 // The unit is determined in the following order:

pkg/plugin/datasource_test.go

@@ -43,6 +43,34 @@ func TestQueryData_Eval(t *testing.T) {
 	}
 }
 
+func TestQueryData_Eval_Dis(t *testing.T) {
+	response := haystack.NewGridBuilder()
+	response.AddCol("a", map[string]haystack.Val{"id": haystack.NewRef("abc", "dis")})
+	response.AddRow([]haystack.Val{haystack.NewStr("a")})
+
+	client := &testHaystackClient{
+		evalResponse: response.ToGrid(),
+	}
+
+	actual := getResponse(
+		client,
+		&QueryModel{
+			Type: "eval",
+			Eval: "test()",
+		},
+		t,
+	)
+
+	aVal := "a"
+	expected := data.NewFrame("",
+		data.NewField("a", nil, []*string{&aVal}).SetConfig(&data.FieldConfig{DisplayName: "dis"}),
+	)
+
+	if !cmp.Equal(actual, expected, data.FrameTestCompareOptions()...) {
+		t.Error(cmp.Diff(actual, expected, data.FrameTestCompareOptions()...))
+	}
+}
+
 func TestQueryData_HisRead(t *testing.T) {
 	response := haystack.NewGridBuilder()
 	response.AddCol("ts", map[string]haystack.Val{})