From 578a755cb408179b3c689938eb9818ef40dce882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Wed, 5 May 2021 10:17:14 +0200
Subject: [PATCH] Fix data source picker width issue (#33720)

* Fix data source picker width issue

* Use theme.spacing
---
 .../DataSourceHttpSettings.tsx                | 10 +--
 .../src/components/TagsInput/TagsInput.tsx    | 41 +++++------
 .../core/components/TraceToLogsSettings.tsx   | 70 ++++++++++---------
 .../configuration/ExemplarSetting.tsx         |  1 +
 4 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
index 88bbaa2f050..1af74c3d27a 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
@@ -125,14 +125,14 @@ export const DataSourceHttpSettings: React.FC<HttpSettingsProps> = (props) => {
         <h3 className="page-heading">HTTP</h3>
         <div className="gf-form-group">
           <div className="gf-form">
-            <FormField label="URL" labelWidth={11} tooltip={urlTooltip} inputEl={urlInput} />
+            <FormField label="URL" labelWidth={13} tooltip={urlTooltip} inputEl={urlInput} />
           </div>
 
           {showAccessOptions && (
             <>
               <div className="gf-form-inline">
                 <div className="gf-form">
-                  <FormField label="Access" labelWidth={11} inputWidth={20} inputEl={accessSelect} />
+                  <FormField label="Access" labelWidth={13} inputWidth={20} inputEl={accessSelect} />
                 </div>
                 <div className="gf-form">
                   <label
@@ -151,13 +151,14 @@ export const DataSourceHttpSettings: React.FC<HttpSettingsProps> = (props) => {
             <div className="gf-form-group">
               <div className="gf-form">
                 <InlineFormLabel
-                  width={11}
+                  width={13}
                   tooltip="Grafana proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source."
                 >
                   Whitelisted Cookies
                 </InlineFormLabel>
                 <TagsInput
                   tags={dataSourceConfig.jsonData.keepCookies}
+                  width={40}
                   onChange={(cookies) =>
                     onSettingsChange({ jsonData: { ...dataSourceConfig.jsonData, keepCookies: cookies } })
                   }
@@ -166,7 +167,8 @@ export const DataSourceHttpSettings: React.FC<HttpSettingsProps> = (props) => {
               <div className="gf-form">
                 <FormField
                   label="Timeout"
-                  labelWidth={11}
+                  labelWidth={13}
+                  inputWidth={20}
                   tooltip="HTTP request timeout in seconds"
                   value={dataSourceConfig.jsonData.timeout}
                   onChange={(event) => {
diff --git a/packages/grafana-ui/src/components/TagsInput/TagsInput.tsx b/packages/grafana-ui/src/components/TagsInput/TagsInput.tsx
index 8f12c666233..46c0d7b7576 100644
--- a/packages/grafana-ui/src/components/TagsInput/TagsInput.tsx
+++ b/packages/grafana-ui/src/components/TagsInput/TagsInput.tsx
@@ -1,8 +1,8 @@
 import React, { ChangeEvent, KeyboardEvent, FC, useState } from 'react';
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
 import { Button } from '../Button';
 import { TagItem } from './TagItem';
-import { useStyles } from '../../themes/ThemeContext';
+import { useStyles, useTheme2 } from '../../themes/ThemeContext';
 import { GrafanaTheme } from '@grafana/data';
 import { Input } from '../Input/Input';
 
@@ -10,11 +10,13 @@ export interface Props {
   placeholder?: string;
   tags?: string[];
   onChange: (tags: string[]) => void;
+  width?: number;
 }
 
-export const TagsInput: FC<Props> = ({ placeholder = 'New tag (enter key to add)', tags = [], onChange }) => {
+export const TagsInput: FC<Props> = ({ placeholder = 'New tag (enter key to add)', tags = [], onChange, width }) => {
   const [newTagName, setNewName] = useState('');
   const styles = useStyles(getStyles);
+  const theme = useTheme2();
 
   const onNameChange = (event: ChangeEvent<HTMLInputElement>) => {
     setNewName(event.target.value);
@@ -39,27 +41,26 @@ export const TagsInput: FC<Props> = ({ placeholder = 'New tag (enter key to add)
   };
 
   return (
-    <div className={styles.wrapper}>
-      <div className={styles.tags}>
+    <div className={cx(styles.wrapper, width ? css({ width: theme.spacing(width) }) : '')}>
+      <div className={tags?.length ? styles.tags : undefined}>
         {tags?.map((tag: string, index: number) => {
           return <TagItem key={`${tag}-${index}`} name={tag} onRemove={onRemove} />;
         })}
       </div>
-      <div>
-        <Input
-          placeholder={placeholder}
-          onChange={onNameChange}
-          value={newTagName}
-          onKeyUp={onKeyboardAdd}
-          suffix={
-            newTagName.length > 0 && (
-              <Button fill="text" className={styles.addButtonStyle} onClick={onAdd} size="md">
-                Add
-              </Button>
-            )
-          }
-        />
-      </div>
+
+      <Input
+        placeholder={placeholder}
+        onChange={onNameChange}
+        value={newTagName}
+        onKeyUp={onKeyboardAdd}
+        suffix={
+          newTagName.length > 0 && (
+            <Button fill="text" className={styles.addButtonStyle} onClick={onAdd} size="md">
+              Add
+            </Button>
+          )
+        }
+      />
     </div>
   );
 };
diff --git a/public/app/core/components/TraceToLogsSettings.tsx b/public/app/core/components/TraceToLogsSettings.tsx
index ea8edd01384..dc1c35a1ad9 100644
--- a/public/app/core/components/TraceToLogsSettings.tsx
+++ b/public/app/core/components/TraceToLogsSettings.tsx
@@ -1,3 +1,4 @@
+import { css } from '@emotion/css';
 import {
   DataSourceJsonData,
   DataSourcePluginOptionsEditorProps,
@@ -5,8 +6,7 @@ import {
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
 import { DataSourcePicker } from '@grafana/runtime';
-import { InlineFormLabel, TagsInput, useStyles } from '@grafana/ui';
-import { css } from '@emotion/css';
+import { InlineField, InlineFieldRow, TagsInput, useStyles } from '@grafana/ui';
 import React from 'react';
 
 export interface TraceToLogsOptions {
@@ -24,43 +24,49 @@ export function TraceToLogsSettings({ options, onOptionsChange }: Props) {
   const styles = useStyles(getStyles);
 
   return (
-    <>
+    <div className={css({ width: '100%' })}>
       <h3 className="page-heading">Trace to logs</h3>
 
       <div className={styles.infoText}>
         Trace to logs let&apos;s you navigate from a trace span to the selected data source&apos;s log.
       </div>
 
-      <div className="gf-form">
-        <InlineFormLabel tooltip="The data source the trace is going to navigate to">Data source</InlineFormLabel>
-        <DataSourcePicker
-          pluginId="loki"
-          current={options.jsonData.tracesToLogs?.datasourceUid}
-          noDefault={true}
-          onChange={(ds) =>
-            updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToLogs', {
-              datasourceUid: ds.uid,
-              tags: options.jsonData.tracesToLogs?.tags,
-            })
-          }
-        />
-      </div>
+      <InlineFieldRow>
+        <InlineField tooltip="The data source the trace is going to navigate to" label="Data source" labelWidth={26}>
+          <DataSourcePicker
+            pluginId="loki"
+            current={options.jsonData.tracesToLogs?.datasourceUid}
+            noDefault={true}
+            width={40}
+            onChange={(ds) =>
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToLogs', {
+                datasourceUid: ds.uid,
+                tags: options.jsonData.tracesToLogs?.tags,
+              })
+            }
+          />
+        </InlineField>
+      </InlineFieldRow>
 
-      <div className="gf-form">
-        <InlineFormLabel tooltip="Tags that will be used in the Loki query. Default tags: 'cluster', 'hostname', 'namespace', 'pod'">
-          Tags
-        </InlineFormLabel>
-        <TagsInput
-          tags={options.jsonData.tracesToLogs?.tags}
-          onChange={(tags) =>
-            updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToLogs', {
-              datasourceUid: options.jsonData.tracesToLogs?.datasourceUid,
-              tags: tags,
-            })
-          }
-        />
-      </div>
-    </>
+      <InlineFieldRow>
+        <InlineField
+          tooltip="Tags that will be used in the Loki query. Default tags: 'cluster', 'hostname', 'namespace', 'pod'"
+          label="Tags"
+          labelWidth={26}
+        >
+          <TagsInput
+            tags={options.jsonData.tracesToLogs?.tags}
+            width={40}
+            onChange={(tags) =>
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'tracesToLogs', {
+                datasourceUid: options.jsonData.tracesToLogs?.datasourceUid,
+                tags: tags,
+              })
+            }
+          />
+        </InlineField>
+      </InlineFieldRow>
+    </div>
   );
 }
 
diff --git a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
index 804c02f1cd6..8ca47048e64 100644
--- a/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
@@ -43,6 +43,7 @@ export default function ExemplarSetting({ value, onChange, onDelete }: Props) {
             tracing={true}
             current={value.datasourceUid}
             noDefault={true}
+            width={40}
             onChange={(ds) =>
               onChange({
                 datasourceUid: ds.uid,