From 3e4229d30939adb18cc41c19a7478a2b4a50cde3 Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Wed, 20 Sep 2023 10:08:58 -0400 Subject: [PATCH 1/5] Fix EuiBottomBar in serverless --- src/core/public/styles/_base.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss index 8b6fa71ce50fd..4be6567f154a7 100644 --- a/src/core/public/styles/_base.scss +++ b/src/core/public/styles/_base.scss @@ -26,6 +26,11 @@ margin-left: 320px; // Hard-coded for now -- @cchaos } +// For serverless +body.euiBody--hasFlyout[style*="padding-left: 248px"] .euiBottomBar { + margin-left: 248px; // Hard-coded for serverless +} + // Temporary fix for EuiPageHeader with a bottom border but no tabs or padding // Will fix in EUI -- @cchaos .euiPageHeader--bottomBorder:not(.euiPageHeader--tabsAtBottom):not([class*='euiPageHeader--padding']) { From 0c4470908ee47512fcb8f0d4dd36a23a669ef70d Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Wed, 20 Sep 2023 10:58:37 -0400 Subject: [PATCH 2/5] Fix linting --- src/core/public/styles/_base.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss index 4be6567f154a7..c01826cc8ecfe 100644 --- a/src/core/public/styles/_base.scss +++ b/src/core/public/styles/_base.scss @@ -26,9 +26,8 @@ margin-left: 320px; // Hard-coded for now -- @cchaos } -// For serverless -body.euiBody--hasFlyout[style*="padding-left: 248px"] .euiBottomBar { - margin-left: 248px; // Hard-coded for serverless +.euiBody--hasFlyout[style*='padding-left: 248px'] .euiBottomBar { + margin-left: 248px; // Hard-coded for serverless sideNav } // Temporary fix for EuiPageHeader with a bottom border but no tabs or padding From 11a4e7eadca6b4d5c44ff0c7111fd0a71a0485d7 Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Thu, 28 Sep 2023 09:35:37 -0400 Subject: [PATCH 3/5] Add tests --- .../src/ui/project/navigation.tsx | 1 + .../functional/page_objects/svl_common_page.ts | 7 +++++++ .../functional/test_suites/common/home_page.ts | 13 ++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx index 1d48a6eccfbb5..45f115c5202f5 100644 --- a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx +++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx @@ -42,6 +42,7 @@ export const ProjectNavigation: React.FC = ({ } { + await svlCommonPage.login(); + }); + it('has project header', async () => { await svlCommonNavigation.navigateToKibanaHome(); await svlCommonPage.assertProjectHeaderExists(); }); + + it('has nav with fixed size', async () => { + await svlCommonNavigation.navigateToKibanaHome(); + await svlCommonPage.assertNavExistsWithFixedSize(); + }); }); } From 249ac9b5c77e2f0b2c2391855a6eaea8103e33d6 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:23:06 +0000 Subject: [PATCH 4/5] [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' --- .../test_serverless/functional/page_objects/svl_common_page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test_serverless/functional/page_objects/svl_common_page.ts b/x-pack/test_serverless/functional/page_objects/svl_common_page.ts index 215e70feb8a53..4c64df849a0c3 100644 --- a/x-pack/test_serverless/functional/page_objects/svl_common_page.ts +++ b/x-pack/test_serverless/functional/page_objects/svl_common_page.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { FtrProviderContext } from '../ftr_provider_context'; import expect from 'expect'; +import { FtrProviderContext } from '../ftr_provider_context'; export function SvlCommonPageProvider({ getService, getPageObjects }: FtrProviderContext) { const testSubjects = getService('testSubjects'); From be9936a3d5950c3d1b67c8f6e7a454794f79e498 Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Tue, 3 Oct 2023 16:35:38 -0400 Subject: [PATCH 5/5] Update using eui variable --- src/core/public/styles/_base.scss | 5 +++-- .../functional/page_objects/svl_common_page.ts | 7 ------- .../functional/test_suites/common/home_page/home_page.ts | 5 ----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss index c01826cc8ecfe..090ce072545ce 100644 --- a/src/core/public/styles/_base.scss +++ b/src/core/public/styles/_base.scss @@ -26,8 +26,9 @@ margin-left: 320px; // Hard-coded for now -- @cchaos } -.euiBody--hasFlyout[style*='padding-left: 248px'] .euiBottomBar { - margin-left: 248px; // Hard-coded for serverless sideNav +// Add support for serverless nabbar +.euiBody--hasFlyout .euiBottomBar { + margin-left: var(--euiCollapsibleNavOffset, 0); } // Temporary fix for EuiPageHeader with a bottom border but no tabs or padding diff --git a/x-pack/test_serverless/functional/page_objects/svl_common_page.ts b/x-pack/test_serverless/functional/page_objects/svl_common_page.ts index 4c64df849a0c3..7762bf92d046a 100644 --- a/x-pack/test_serverless/functional/page_objects/svl_common_page.ts +++ b/x-pack/test_serverless/functional/page_objects/svl_common_page.ts @@ -5,7 +5,6 @@ * 2.0. */ -import expect from 'expect'; import { FtrProviderContext } from '../ftr_provider_context'; export function SvlCommonPageProvider({ getService, getPageObjects }: FtrProviderContext) { @@ -101,12 +100,6 @@ export function SvlCommonPageProvider({ getService, getPageObjects }: FtrProvide await testSubjects.existOrFail('kibanaProjectHeader'); }, - async assertNavExistsWithFixedSize() { - const res = await testSubjects.find('projectLayoutSideNav'); - // EuiBottomBar expect side nav to be 248px if this change we may have to update src/core/public/styles/_base.scss - expect((await res.getSize()).width).toBe(248); - }, - async clickUserAvatar() { testSubjects.click('userMenuAvatar'); }, diff --git a/x-pack/test_serverless/functional/test_suites/common/home_page/home_page.ts b/x-pack/test_serverless/functional/test_suites/common/home_page/home_page.ts index f8cf2000cc972..228a8b431ad32 100644 --- a/x-pack/test_serverless/functional/test_suites/common/home_page/home_page.ts +++ b/x-pack/test_serverless/functional/test_suites/common/home_page/home_page.ts @@ -24,10 +24,5 @@ export default function ({ getPageObject, getService }: FtrProviderContext) { await svlCommonNavigation.navigateToKibanaHome(); await svlCommonPage.assertProjectHeaderExists(); }); - - it('has nav with fixed size', async () => { - await svlCommonNavigation.navigateToKibanaHome(); - await svlCommonPage.assertNavExistsWithFixedSize(); - }); }); }