From cd58dc9964cc225ad49944e0d5f2f349b30c4d17 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <wylieconlon@gmail.com>
Date: Thu, 18 Feb 2021 12:27:14 -0500
Subject: [PATCH] [Discover] Always show the "hide missing fields" toggle

---
 .../sidebar/discover_field_search.test.tsx    |  7 ++
 .../sidebar/discover_field_search.tsx         | 70 +++++++++----------
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx
index 797a6c9697c351..ff4b70dfcc7db7 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx
@@ -99,6 +99,13 @@ describe('DiscoverFieldSearch', () => {
     expect(badge.text()).toEqual('0');
   });
 
+  test('missing switch appears with new fields api', () => {
+    const component = mountComponent({ ...defaultProps, useNewFieldsApi: true });
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    expect(findTestSubject(component, 'missingSwitch').exists()).toBeTruthy();
+  });
+
   test('change in filters triggers onChange', () => {
     const onChange = jest.fn();
     const component = mountComponent({ ...defaultProps, ...{ onChange } });
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx
index 8fb90bfea3a950..6e5806cb849c65 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx
@@ -262,46 +262,44 @@ export function DiscoverFieldSearch({
   };
 
   const footer = () => {
-    if (!showUnmappedFields && useNewFieldsApi) {
-      return null;
-    }
     return (
       <EuiPopoverFooter>
+        <EuiSwitch
+          label={i18n.translate('discover.fieldChooser.filter.hideMissingFieldsLabel', {
+            defaultMessage: 'Hide missing fields',
+          })}
+          checked={values.missing}
+          onChange={handleMissingChange}
+          data-test-subj="missingSwitch"
+        />
         {showUnmappedFields ? (
-          <EuiFlexGroup>
-            <EuiFlexItem component="span">
-              <EuiSwitch
-                label={i18n.translate('discover.fieldChooser.filter.showUnmappedFields', {
-                  defaultMessage: 'Show unmapped fields',
-                })}
-                checked={values.unmappedFields}
-                onChange={handleUnmappedFieldsChange}
-                data-test-subj="unmappedFieldsSwitch"
-              />
-            </EuiFlexItem>
-            <EuiFlexItem component="span" grow={false}>
-              <EuiToolTip
-                position="right"
-                content={i18n.translate('discover.fieldChooser.filter.unmappedFieldsWarning', {
-                  defaultMessage:
-                    'Unmapped fields will be deprecated and removed in a future release.',
-                })}
-              >
-                <EuiIcon type="alert" />
-              </EuiToolTip>
-            </EuiFlexItem>
-          </EuiFlexGroup>
+          <>
+            <EuiSpacer size="m" />
+            <EuiFlexGroup>
+              <EuiFlexItem component="span">
+                <EuiSwitch
+                  label={i18n.translate('discover.fieldChooser.filter.showUnmappedFields', {
+                    defaultMessage: 'Show unmapped fields',
+                  })}
+                  checked={values.unmappedFields}
+                  onChange={handleUnmappedFieldsChange}
+                  data-test-subj="unmappedFieldsSwitch"
+                />
+              </EuiFlexItem>
+              <EuiFlexItem component="span" grow={false}>
+                <EuiToolTip
+                  position="right"
+                  content={i18n.translate('discover.fieldChooser.filter.unmappedFieldsWarning', {
+                    defaultMessage:
+                      'Unmapped fields will be deprecated and removed in a future release.',
+                  })}
+                >
+                  <EuiIcon type="alert" />
+                </EuiToolTip>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </>
         ) : null}
-        {useNewFieldsApi ? null : (
-          <EuiSwitch
-            label={i18n.translate('discover.fieldChooser.filter.hideMissingFieldsLabel', {
-              defaultMessage: 'Hide missing fields',
-            })}
-            checked={values.missing}
-            onChange={handleMissingChange}
-            data-test-subj="missingSwitch"
-          />
-        )}
       </EuiPopoverFooter>
     );
   };