Merge branch 'main' into sync-settings

elastic · Jul 10, 2023 · 70a82de · 70a82de
2 parents 83e77a8 + 57fa6ae
commit 70a82de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...lution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx b/...lution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
@@ -12,7 +12,6 @@ import {
   EuiButton,
   EuiButtonEmpty,
   EuiLoadingSpinner,
-  EuiBottomBar,
   EuiSpacer,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
@@ -21,6 +20,7 @@ import { useDispatch } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import type { ApplicationStart } from '@kbn/core/public';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
 import { useShowEditableFormFields, usePolicyDetailsSelector } from '../../policy_hooks';
 import {
   policyDetails,
@@ -159,7 +159,7 @@ export const PolicyFormLayout = React.memo(() => {
       )}
       <PolicyDetailsForm />
       <EuiSpacer size="xxl" />
-      <EuiBottomBar paddingSize="s">
+      <KibanaPageTemplate.BottomBar paddingSize="s">
         <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
@@ -190,7 +190,7 @@ export const PolicyFormLayout = React.memo(() => {
             </EuiFlexItem>
           )}
         </EuiFlexGroup>
-      </EuiBottomBar>
+      </KibanaPageTemplate.BottomBar>
     </>
   );
 });

diff --git a/x-pack/test/security_solution_endpoint/apps/integrations/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/integrations/policy_details.ts
@@ -72,6 +72,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         );
       });
 
+      it('should not hide the side navigation', async () => {
+        await testSubjects.scrollIntoView('solutionSideNavItemLink-get_started');
+        // ensure center of button is visible and not hidden by sticky bottom bar
+        await testSubjects.click('solutionSideNavItemLink-administration', 1000, 15);
+        // test cleanup: go back to policy details page
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
+      });
+
       it('and the show advanced settings button is clicked', async () => {
         await testSubjects.missingOrFail('advancedPolicyPanel');