From 727472a3cbeb7c8ff3277c7ed4ffbf8d3c04d201 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Mon, 29 Oct 2018 17:42:15 +0100
Subject: [PATCH] stackdriver: refactor TemplateQueryComponent

---
 .../components/TemplateQueryComponent.tsx     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
index 2ddc1b1fae2..4eeb706b538 100644
--- a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
@@ -20,14 +20,14 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
   ];
 
   defaults = {
-    type: undefined,
+    type: '',
     metricDescriptors: [],
-    service: undefined,
-    metricType: undefined,
+    service: '',
+    metricType: '',
     metricLabels: [],
     resourceLabels: [],
-    metricLabelKey: undefined,
-    resourceLabelKey: undefined,
+    metricLabelKey: '',
+    resourceLabelKey: '',
   };
 
   constructor(props: TemplateQueryProps) {
@@ -45,10 +45,6 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
     this.setState({ metricDescriptors });
   }
 
-  isLabelQuery(queryType) {
-    return [MetricFindQueryTypes.MetricLabels, MetricFindQueryTypes.ResourceLabels].indexOf(queryType) !== -1;
-  }
-
   async loadTimeSeriesData() {
     const refId = 'StackdriverTemplateQueryComponent';
     const response = await this.props.datasource.getLabels(this.state.metricType, refId);
@@ -88,7 +84,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
     this.props.onChange(queryModel);
   }
 
-  switchMetaType(queryType) {
+  getDropdown(queryType) {
     switch (queryType) {
       case MetricFindQueryTypes.ResourceLabels:
         return (
@@ -113,7 +109,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
     }
   }
 
-  renderSwitch(queryType) {
+  renderQueryTypeSwitch(queryType) {
     switch (queryType) {
       case MetricFindQueryTypes.MetricTypes:
         return (
@@ -122,7 +118,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
       case MetricFindQueryTypes.MetricLabels:
       case MetricFindQueryTypes.ResourceLabels:
       case MetricFindQueryTypes.ResourceTypes:
-        const dropdown = this.switchMetaType(queryType);
+        const dropdown = this.getDropdown(queryType);
         return (
           <React.Fragment>
             <ServiceSelector metricDescriptors={this.state.metricDescriptors} onServiceChange={this.onServiceChange} />
@@ -151,6 +147,10 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
     }
   }
 
+  isLabelQuery(queryType) {
+    return [MetricFindQueryTypes.MetricLabels, MetricFindQueryTypes.ResourceLabels].indexOf(queryType) !== -1;
+  }
+
   render() {
     return (
       <React.Fragment>
@@ -166,7 +166,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
             </select>
           </div>
         </div>
-        {this.renderSwitch(this.state.type)}
+        {this.renderQueryTypeSwitch(this.state.type)}
       </React.Fragment>
     );
   }