fixed broken evaluation of series alias

bump version to 0.4.2

Author: oberschlauberger

dist/datasource.js

@@ -32,12 +32,12 @@ var ApmDatasource = /** @class */ (function () {
                     var dataFrequency = "" || query.temporalResolution;
                     //fix to support migration of dashboards created with previous versions of the data source plugin
                     //@ts-ignore
-                    if (query.aggregatedSeriesAlias !== undefined) {
+                    if (query.seriesAlias === undefined && query.aggregatedSeriesAlias !== undefined) {
                         //@ts-ignore
                         query.seriesAlias = query.aggregatedSeriesAlias;
                     }
-                    var aggregationMode_1 = query.aggregationMode === undefined ? "" : query.aggregationMode;
-                    var seriesAlias_1 = query.seriesAlias === undefined ? "none" : query.seriesAlias;
+                    var aggregationMode_1 = query.aggregationMode === undefined ? "none" : query.aggregationMode;
+                    var seriesAlias_1 = query.seriesAlias === undefined ? "" : query.seriesAlias;
                     var aliasRegex_1 = query.aliasRegex === undefined ? "" : query.aliasRegex;
                     if (!(agentRegex && metricRegex && dataFrequency)) {
                         resolve();

dist/plugin.json

@@ -25,8 +25,8 @@
         "url": "https://github.com/oberschlauberger/ca-apm-grafana-datasource/blob/master/LICENSE.md"
       }
     ],
-    "version": "0.4.1",
-    "updated": "2019-08-19"
+    "version": "0.4.2",
+    "updated": "2019-10-21"
   },
 
   "dependencies": {

src/datasource.ts

@@ -41,13 +41,13 @@ export class ApmDatasource {
 
                     //fix to support migration of dashboards created with previous versions of the data source plugin
                     //@ts-ignore
-                    if (query.aggregatedSeriesAlias !== undefined) {
+                    if (query.seriesAlias === undefined && query.aggregatedSeriesAlias !== undefined) {
                         //@ts-ignore
                         query.seriesAlias = query.aggregatedSeriesAlias;
                     }
 
-                    const aggregationMode = query.aggregationMode === undefined ? "" : query.aggregationMode;
-                    const seriesAlias = query.seriesAlias === undefined ? "none" : query.seriesAlias;
+                    const aggregationMode = query.aggregationMode === undefined ? "none" : query.aggregationMode;
+                    const seriesAlias = query.seriesAlias === undefined ? "" : query.seriesAlias;
                     const aliasRegex = query.aliasRegex === undefined ? "" : query.aliasRegex;
 
                     if (!(agentRegex && metricRegex && dataFrequency)) {

src/plugin.json

@@ -25,8 +25,8 @@
         "url": "https://github.com/oberschlauberger/ca-apm-grafana-datasource/blob/master/LICENSE.md"
       }
     ],
-    "version": "0.4.1",
-    "updated": "2019-08-19"
+    "version": "0.4.2",
+    "updated": "2019-10-21"
   },
 
   "dependencies": {