Readded time label, removed labeling TODO. Refs #2

d-velop · Dec 27, 2023 · 2a70c19 · 2a70c19
1 parent bedbeda
commit 2a70c19
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/pkg/plugin/datasource.go b/pkg/plugin/datasource.go
@@ -143,7 +143,12 @@ func (ds *ODataSource) query(clientInstance ODataClient, query backend.DataQuery
 
 	if qm.TimeProperty != nil {
 		log.DefaultLogger.Debug("Time property configured", "name", qm.TimeProperty.Name)
-		field := data.NewField(qm.TimeProperty.Name, nil, odata.ToArray(qm.TimeProperty.Type))
+		labels, err := data.LabelsFromString("time=" + qm.TimeProperty.Name)
+		if err != nil {
+			response.Error = err
+			return response
+		}
+		field := data.NewField(qm.TimeProperty.Name, labels, odata.ToArray(qm.TimeProperty.Type))
 		frame.Fields = append(frame.Fields, field)
 	}
 	for _, prop := range qm.Properties {

diff --git a/pkg/plugin/datasource_query_test.go b/pkg/plugin/datasource_query_test.go
@@ -94,7 +94,7 @@ func TestQuery(t *testing.T) {
 				),
 			),
 			expected: aDataResponse(withBaseFrame("defaultTestFrame",
-				withTimeField("time"),
+				withTimeField("time", true),
 				withField("int32", []*int32{}),
 				withField("boolean", []*bool{}),
 				withField("string", []*string{}),
@@ -126,7 +126,7 @@ func TestQuery(t *testing.T) {
 					withProp("time", "2022-01-02T00:00:00Z")),
 			),
 			expected: aDataResponse(withBaseFrame("defaultTestFrame",
-				withTimeField("time"),
+				withTimeField("time", false),
 				withField("int32", []*int32{}),
 				withField("boolean", []*bool{}),
 				withField("string", []*string{}),
@@ -175,7 +175,7 @@ func TestQuery(t *testing.T) {
 					withProp("otherTimePropName", "2022-01-02T00:00:00Z")),
 			),
 			expected: aDataResponse(withBaseFrame("defaultTestFrame",
-				withTimeField("time"),
+				withTimeField("time", false),
 				withField("int32", []*int32{}),
 				withField("boolean", []*bool{}),
 				withField("string", []*string{}),

diff --git a/pkg/plugin/odata/functions.go b/pkg/plugin/odata/functions.go
@@ -7,7 +7,6 @@ import (
 
 // ToArray maps OData property types to Grafana Field type
 func ToArray(propertyType string) interface{} {
-	// TODO: Add field labels here?
 	switch propertyType {
 	case EdmBoolean:
 		return []*bool{}

diff --git a/pkg/plugin/testdata_test.go b/pkg/plugin/testdata_test.go
@@ -147,9 +147,10 @@ func withErrorResponse(err error) func(n *backend.DataResponse) {
 func withDefaultTestFrame(builders ...func(*data.Frame)) func(n *backend.DataResponse) {
 	return func(dataResponse *backend.DataResponse) {
 		var frame = aDataFrame("defaultTestFrame", builders...)
+		timeLabel, _ := data.LabelsFromString("time=time")
 		frame.Fields = append(
 			frame.Fields,
-			data.NewField("time", nil, []*time.Time{}),
+			data.NewField("time", timeLabel, []*time.Time{}),
 			data.NewField("int32", nil, []*int32{}),
 			data.NewField("boolean", nil, []*bool{}),
 			data.NewField("string", nil, []*string{}),
@@ -174,9 +175,13 @@ func withBaseFrame(name string, builders ...func(*data.Frame)) func(n *backend.D
 	}
 }
 
-func withTimeField(name string) func(n *data.Frame) {
+func withTimeField(name string, withLabels bool) func(n *data.Frame) {
 	return func(frame *data.Frame) {
-		frame.Fields = append(frame.Fields, data.NewField(name, nil, []*time.Time{}))
+		var labels data.Labels = nil
+		if withLabels {
+			labels, _ = data.LabelsFromString("time=" + name)
+		}
+		frame.Fields = append(frame.Fields, data.NewField(name, labels, []*time.Time{}))
 	}
 }