From 3dd00c4699b2041b93cec145c8ebb325a683cd87 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 28 May 2021 13:02:11 +0300
Subject: [PATCH] Convert frames to wide format if possible

---
 pkg/datasource/response_handler.go  |  4 ++--
 src/datasource-zabbix/datasource.ts | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkg/datasource/response_handler.go b/pkg/datasource/response_handler.go
index 06f96f9..7d9e10e 100644
--- a/pkg/datasource/response_handler.go
+++ b/pkg/datasource/response_handler.go
@@ -103,8 +103,8 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData) *data.Frame {
 	timeFileld.Name = data.TimeSeriesTimeFieldName
 	seriesName := series.Meta.Name
 	valueField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
-	valueField.Name = seriesName
-	frame := data.NewFrame("", timeFileld, valueField)
+	valueField.Name = data.TimeSeriesValueFieldName
+	frame := data.NewFrame(seriesName, timeFileld, valueField)
 
 	for _, point := range series.TS {
 		timeFileld.Append(point.Time)
diff --git a/src/datasource-zabbix/datasource.ts b/src/datasource-zabbix/datasource.ts
index c05d1c7..b02bb6d 100644
--- a/src/datasource-zabbix/datasource.ts
+++ b/src/datasource-zabbix/datasource.ts
@@ -252,6 +252,10 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
           const resp = toDataQueryResponse(rsp);
           this.sortByRefId(resp);
           this.applyFrontendFunctions(resp, request);
+          if (responseHandler.isConvertibleToWide(resp.data)) {
+            console.log('Converting response to the wide format');
+            resp.data = responseHandler.convertToWide(resp.data);
+          }
           return resp;
         }),
         catchError((err) => {
@@ -388,12 +392,7 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
 
       // Apply alias functions
       const aliasFunctions = bindFunctionDefs(target.functions, 'Alias');
-      for (let fieldIndex = 0; fieldIndex < frame.fields.length; fieldIndex++) {
-        const field = frame.fields[fieldIndex];
-        if (field.type !== FieldType.time) {
-          utils.sequence(aliasFunctions)(field);
-        }
-      }
+      utils.sequence(aliasFunctions)(frame);
     }
     return response;
   }