From 83fbf52aac51fa6cc0c16eed9b48529b26fb489c Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peter.hlmbrg@gmail.com>
Date: Tue, 15 Jan 2019 17:33:42 +0000
Subject: [PATCH] fixing imports, minor fix on mapping row

---
 .../src/components/FormGroup/FormGroup.tsx    |  2 +-
 .../grafana-ui/src/components/Label/Label.tsx |  2 +-
 .../SharedPreferences/SharedPreferences.tsx   |  3 +--
 .../datasources/settings/BasicSettings.tsx    |  2 +-
 public/app/features/teams/TeamSettings.tsx    |  2 +-
 public/app/plugins/panel/gauge/MappingRow.tsx | 19 +++++++++----------
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/grafana-ui/src/components/FormGroup/FormGroup.tsx b/packages/grafana-ui/src/components/FormGroup/FormGroup.tsx
index ac761fa5d2c..a0088032079 100644
--- a/packages/grafana-ui/src/components/FormGroup/FormGroup.tsx
+++ b/packages/grafana-ui/src/components/FormGroup/FormGroup.tsx
@@ -1,7 +1,7 @@
 import React, { SFC } from 'react';
 import { Label } from '..';
 
-interface Props {
+export interface Props {
   label: string;
   inputProps: {};
   labelWidth?: number;
diff --git a/packages/grafana-ui/src/components/Label/Label.tsx b/packages/grafana-ui/src/components/Label/Label.tsx
index 5d60efa056a..b31ed45e32a 100644
--- a/packages/grafana-ui/src/components/Label/Label.tsx
+++ b/packages/grafana-ui/src/components/Label/Label.tsx
@@ -1,5 +1,5 @@
 import React, { SFC, ReactNode } from 'react';
-import { Tooltip } from '@grafana/ui';
+import { Tooltip } from '..';
 
 interface Props {
   tooltip?: string;
diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
index ca933332db9..0b11d32b668 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
@@ -1,7 +1,6 @@
 import React, { PureComponent } from 'react';
 
-import { Label } from '../../../../../packages/grafana-ui/src/components/Label/Label';
-import { Select } from '@grafana/ui';
+import { Label, Select } from '@grafana/ui';
 import { getBackendSrv, BackendSrv } from 'app/core/services/backend_srv';
 
 import { DashboardSearchHit } from 'app/types';
diff --git a/public/app/features/datasources/settings/BasicSettings.tsx b/public/app/features/datasources/settings/BasicSettings.tsx
index 55dc9b54211..21a548a5045 100644
--- a/public/app/features/datasources/settings/BasicSettings.tsx
+++ b/public/app/features/datasources/settings/BasicSettings.tsx
@@ -1,5 +1,5 @@
 import React, { SFC } from 'react';
-import { Label } from '../../../../../packages/grafana-ui/src/components/Label/Label';
+import { Label } from '@grafana/ui';
 import { Switch } from '../../../core/components/Switch/Switch';
 
 export interface Props {
diff --git a/public/app/features/teams/TeamSettings.tsx b/public/app/features/teams/TeamSettings.tsx
index 3424f39d22c..22815dbb7ec 100644
--- a/public/app/features/teams/TeamSettings.tsx
+++ b/public/app/features/teams/TeamSettings.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { Label } from '../../../../packages/grafana-ui/src/components/Label/Label';
+import { Label } from '@grafana/ui';
 import { SharedPreferences } from 'app/core/components/SharedPreferences/SharedPreferences';
 import { updateTeam } from './state/actions';
 import { getRouteParamsId } from 'app/core/selectors/location';
diff --git a/public/app/plugins/panel/gauge/MappingRow.tsx b/public/app/plugins/panel/gauge/MappingRow.tsx
index b05da5514aa..91dff549677 100644
--- a/public/app/plugins/panel/gauge/MappingRow.tsx
+++ b/public/app/plugins/panel/gauge/MappingRow.tsx
@@ -81,16 +81,15 @@ export default class MappingRow extends PureComponent<Props, State> {
             }}
             inputWidth={8}
           />
-          <FormGroup
-            label="Text"
-            labelWidth={4}
-            inputProps={{
-              onBlur: () => this.updateMapping,
-              onChange: event => this.onMappingTextChange(event),
-              value: text,
-            }}
-            inputWidth={10}
-          />
+          <div className="gf-form gf-form--grow">
+            <Label width={4}>Text</Label>
+            <input
+              className="gf-form-input"
+              onBlur={this.updateMapping}
+              value={text}
+              onChange={this.onMappingTextChange}
+            />
+          </div>
         </>
       );
     }