From 16c6d79dd6131d6827bdd1584cf7a97423e4272e Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Tue, 30 Oct 2018 09:43:08 +0100
Subject: [PATCH] stackdriver: use standard naming convention for selects

---
 ...MetricTypeSelector.tsx => MetricTypePicker.tsx} |  4 ++--
 .../{ServiceSelector.tsx => ServicePicker.tsx}     |  4 ++--
 .../components/TemplateQueryComponent.tsx          | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename public/app/plugins/datasource/stackdriver/components/{MetricTypeSelector.tsx => MetricTypePicker.tsx} (91%)
 rename public/app/plugins/datasource/stackdriver/components/{ServiceSelector.tsx => ServicePicker.tsx} (91%)

diff --git a/public/app/plugins/datasource/stackdriver/components/MetricTypeSelector.tsx b/public/app/plugins/datasource/stackdriver/components/MetricTypePicker.tsx
similarity index 91%
rename from public/app/plugins/datasource/stackdriver/components/MetricTypeSelector.tsx
rename to public/app/plugins/datasource/stackdriver/components/MetricTypePicker.tsx
index 530512defcb..6c6917b6d78 100644
--- a/public/app/plugins/datasource/stackdriver/components/MetricTypeSelector.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/MetricTypePicker.tsx
@@ -7,7 +7,7 @@ interface Props {
   metricDescriptors: any[];
 }
 
-const MetricTypeSelector: SFC<Props> = props => {
+const MetricTypePicker: SFC<Props> = props => {
   const filterMetricTypes = () => {
     if (!props.selectedService) {
       return [];
@@ -35,4 +35,4 @@ const MetricTypeSelector: SFC<Props> = props => {
   );
 };
 
-export default MetricTypeSelector;
+export default MetricTypePicker;
diff --git a/public/app/plugins/datasource/stackdriver/components/ServiceSelector.tsx b/public/app/plugins/datasource/stackdriver/components/ServicePicker.tsx
similarity index 91%
rename from public/app/plugins/datasource/stackdriver/components/ServiceSelector.tsx
rename to public/app/plugins/datasource/stackdriver/components/ServicePicker.tsx
index 6bb29a46a6a..ec6c0d9cde8 100644
--- a/public/app/plugins/datasource/stackdriver/components/ServiceSelector.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/ServicePicker.tsx
@@ -6,7 +6,7 @@ interface Props {
   metricDescriptors: any[];
 }
 
-const ServiceSelector: SFC<Props> = props => {
+const ServicePicker: SFC<Props> = props => {
   const extractServices = () => {
     return extractServicesFromMetricDescriptors(props.metricDescriptors).map(m => ({
       value: m.service,
@@ -30,4 +30,4 @@ const ServiceSelector: SFC<Props> = props => {
   );
 };
 
-export default ServiceSelector;
+export default ServicePicker;
diff --git a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
index 429abb4a5a0..ed03de9dbac 100644
--- a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
-import ServiceSelector from './ServiceSelector';
-import MetricTypeSelector from './MetricTypeSelector';
+import ServicePicker from './ServicePicker';
+import MetricTypePicker from './MetricTypePicker';
 import SimpleDropdown from './SimpleDropdown';
 import { TemplateQueryProps } from 'app/types/plugins';
 import defaultsDeep from 'lodash/defaultsDeep';
@@ -113,7 +113,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
     switch (queryType) {
       case MetricFindQueryTypes.MetricTypes:
         return (
-          <ServiceSelector metricDescriptors={this.state.metricDescriptors} onServiceChange={this.onServiceChange} />
+          <ServicePicker metricDescriptors={this.state.metricDescriptors} onServiceChange={this.onServiceChange} />
         );
       case MetricFindQueryTypes.MetricLabels:
       case MetricFindQueryTypes.ResourceLabels:
@@ -121,8 +121,8 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
         const dropdown = this.getDropdown(queryType);
         return (
           <React.Fragment>
-            <ServiceSelector metricDescriptors={this.state.metricDescriptors} onServiceChange={this.onServiceChange} />
-            <MetricTypeSelector
+            <ServicePicker metricDescriptors={this.state.metricDescriptors} onServiceChange={this.onServiceChange} />
+            <MetricTypePicker
               selectedService={this.state.service}
               metricDescriptors={this.state.metricDescriptors}
               onMetricTypeChange={this.onMetricTypeChange}
@@ -134,8 +134,8 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
       case MetricFindQueryTypes.Aggregations:
         return (
           <React.Fragment>
-            <ServiceSelector metricDescriptors={this.state.metricDescriptors} onServiceChange={this.onServiceChange} />
-            <MetricTypeSelector
+            <ServicePicker metricDescriptors={this.state.metricDescriptors} onServiceChange={this.onServiceChange} />
+            <MetricTypePicker
               selectedService={this.state.service}
               metricDescriptors={this.state.metricDescriptors}
               onMetricTypeChange={this.onMetricTypeChange}