From dea450c5c49a1eec905ff7806260a437a59b33d5 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Wed, 7 Jul 2021 15:49:26 -0700
Subject: [PATCH] [Enterprise Search] Fix beta notification in sidebar
 (#104763)

* Fix beta notification to use flex instead of absolute positioning

- probably should have done that from the start

* Remove now-unnecessary `betaNotification*` classes/wrappers
---
 .../applications/shared/layout/beta.scss       | 18 +++++++-----------
 .../applications/shared/layout/beta.test.tsx   |  2 --
 .../public/applications/shared/layout/beta.tsx |  7 +------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss
index 6ba90cba381c..677767c190f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.scss
@@ -7,18 +7,14 @@
 
 @include euiBreakpoint('m', 'l', 'xl') {
   .kbnPageTemplateSolutionNav {
-    position: relative;
-    min-height: 100%;
-
-    // Nested to override EUI specificity
-    .betaNotificationSideNavItem {
-      margin-top: $euiSizeL;
-    }
+    display: flex;
+    flex-direction: column;
   }
-
-  .betaNotificationWrapper {
-    position: absolute;
-    bottom: 3px; // Without this 3px buffer, the popover won't render to the right
+  .euiSideNav__content {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
   }
 }
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.test.tsx
index 99b42b6f915e..4e4c7f4edbba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.test.tsx
@@ -107,7 +107,6 @@ describe('appendBetaNotificationItem', () => {
         {
           id: 'beta',
           name: '',
-          className: 'betaNotificationSideNavItem',
           renderItem: expect.any(Function),
         },
       ],
@@ -118,7 +117,6 @@ describe('appendBetaNotificationItem', () => {
     const SideNavItem = (mockSideNav.items[2] as any).renderItem;
     const wrapper = shallow(<SideNavItem />);
 
-    expect(wrapper.hasClass('betaNotificationWrapper')).toBe(true);
     expect(wrapper.find(BetaNotification)).toHaveLength(1);
   });
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.tsx
index 46aa0a0af9e8..1f4c8328cc87 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/beta.tsx
@@ -98,12 +98,7 @@ export const appendBetaNotificationItem = (sideNav: KibanaPageTemplateProps['sol
     sideNav.items.push({
       id: 'beta',
       name: '',
-      className: 'betaNotificationSideNavItem',
-      renderItem: () => (
-        <div className="betaNotificationWrapper">
-          <BetaNotification />
-        </div>
-      ),
+      renderItem: () => <BetaNotification />,
     });
   }
 };