Merge branch '8.5' of github.com:elastic/kibana into backport/8.5/pr-…

…141239
elastic · Sep 22, 2022 · 7680503 · 7680503
2 parents 685eb7c + f99ae3a
commit 7680503
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 42 deletions.
diff --git a/x-pack/plugins/security_solution/public/timelines/components/edit_data_provider/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/edit_data_provider/index.tsx
@@ -36,8 +36,7 @@ import {
 import * as i18n from './translations';
 
 const EDIT_DATA_PROVIDER_WIDTH = 400;
-const FIELD_COMBO_BOX_WIDTH = 195;
-const OPERATOR_COMBO_BOX_WIDTH = 160;
+const OPERATOR_COMBO_BOX_WIDTH = 152;
 const SAVE_CLASS_NAME = 'edit-data-provider-save';
 const VALUE_INPUT_CLASS_NAME = 'edit-data-provider-value';
 
@@ -189,25 +188,29 @@ export const StatefulEditDataProvider = React.memo<Props>(
     return (
       <EuiPanel paddingSize="s">
         <EuiFlexGroup direction="column" gutterSize="none">
+          <EuiFlexItem grow={true}>
+            <EuiFormRow label={i18n.FIELD}>
+              <EuiComboBox
+                autoFocus
+                data-test-subj="field"
+                isClearable={false}
+                onChange={onFieldSelected}
+                options={getCategorizedFieldNames(browserFields)}
+                placeholder={i18n.FIELD_PLACEHOLDER}
+                selectedOptions={updatedField}
+                singleSelection={{ asPlainText: true }}
+                fullWidth={true}
+              />
+            </EuiFormRow>
+          </EuiFlexItem>
+
           <EuiFlexItem grow={false}>
-            <EuiFlexGroup gutterSize="s" direction="row" justifyContent="spaceBetween">
-              <EuiFlexItem grow={false}>
-                <EuiFormRow label={i18n.FIELD}>
-                  <EuiComboBox
-                    autoFocus
-                    data-test-subj="field"
-                    isClearable={false}
-                    onChange={onFieldSelected}
-                    options={getCategorizedFieldNames(browserFields)}
-                    placeholder={i18n.FIELD_PLACEHOLDER}
-                    selectedOptions={updatedField}
-                    singleSelection={{ asPlainText: true }}
-                    style={{ width: `${FIELD_COMBO_BOX_WIDTH}px` }}
-                  />
-                </EuiFormRow>
-              </EuiFlexItem>
+            <EuiSpacer size="m" />
+          </EuiFlexItem>
 
-              <EuiFlexItem grow={false}>
+          <EuiFlexItem grow={true}>
+            <EuiFlexGroup gutterSize="s" direction="row" justifyContent="spaceBetween">
+              <EuiFlexItem grow={true}>
                 <EuiFormRow label={i18n.OPERATOR}>
                   <EuiComboBox
                     data-test-subj="operator"
@@ -217,38 +220,33 @@ export const StatefulEditDataProvider = React.memo<Props>(
                     placeholder={i18n.SELECT_AN_OPERATOR}
                     selectedOptions={updatedOperator}
                     singleSelection={{ asPlainText: true }}
-                    style={{ width: `${OPERATOR_COMBO_BOX_WIDTH}px` }}
+                    style={{ minWidth: OPERATOR_COMBO_BOX_WIDTH }}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
+              {type !== DataProviderType.template &&
+              updatedOperator.length > 0 &&
+              updatedOperator[0].label !== i18n.EXISTS &&
+              updatedOperator[0].label !== i18n.DOES_NOT_EXIST ? (
+                <EuiFlexItem grow={false}>
+                  <EuiFormRow label={i18n.VALUE_LABEL}>
+                    <EuiFieldText
+                      className={VALUE_INPUT_CLASS_NAME}
+                      onChange={onValueChange}
+                      placeholder={i18n.VALUE}
+                      value={sanatizeValue(updatedValue)}
+                      isInvalid={isValueFieldInvalid}
+                    />
+                  </EuiFormRow>
+                </EuiFlexItem>
+              ) : null}
             </EuiFlexGroup>
           </EuiFlexItem>
 
           <EuiFlexItem grow={false}>
             <EuiSpacer size="m" />
           </EuiFlexItem>
 
-          {type !== DataProviderType.template &&
-          updatedOperator.length > 0 &&
-          updatedOperator[0].label !== i18n.EXISTS &&
-          updatedOperator[0].label !== i18n.DOES_NOT_EXIST ? (
-            <EuiFlexItem grow={false}>
-              <EuiFormRow label={i18n.VALUE_LABEL}>
-                <EuiFieldText
-                  className={VALUE_INPUT_CLASS_NAME}
-                  onChange={onValueChange}
-                  placeholder={i18n.VALUE}
-                  value={sanatizeValue(updatedValue)}
-                  isInvalid={isValueFieldInvalid}
-                />
-              </EuiFormRow>
-            </EuiFlexItem>
-          ) : null}
-
-          <EuiFlexItem grow={false}>
-            <EuiSpacer size="m" />
-          </EuiFlexItem>
-
           <EuiFlexItem grow={false}>
             <EuiFlexGroup justifyContent="flexEnd" gutterSize="none">
               <EuiFlexItem grow={false}>

diff --git a/...olution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx b/...olution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import styled from 'styled-components';
 import { pick } from 'lodash/fp';
 import React, { useCallback, useMemo, useState } from 'react';
 import type { EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
@@ -33,6 +34,10 @@ interface AddDataProviderPopoverProps {
   timelineId: string;
 }
 
+const AddFieldPopoverContainer = styled.div`
+  min-width: 350px;
+`;
+
 const AddDataProviderPopoverComponent: React.FC<AddDataProviderPopoverProps> = ({
   browserFields,
   timelineId,
@@ -205,7 +210,7 @@ const AddDataProviderPopoverComponent: React.FC<AddDataProviderPopoverProps> = (
       panelPaddingSize="none"
       repositionOnScroll
     >
-      {content}
+      <AddFieldPopoverContainer>{content}</AddFieldPopoverContainer>
     </EuiPopover>
   );
 };