From 0205b4b29cb3b798d111206b50338fa514c8caed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loix?= Date: Wed, 18 Dec 2024 12:27:06 +0000 Subject: [PATCH 1/3] Remove "userAndRoles" from navTree --- x-pack/plugins/serverless_search/public/navigation_tree.ts | 4 ---- .../public/navigation/side_navigation.ts | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/x-pack/plugins/serverless_search/public/navigation_tree.ts b/x-pack/plugins/serverless_search/public/navigation_tree.ts index ae1d856e8f529..7d62be658166a 100644 --- a/x-pack/plugins/serverless_search/public/navigation_tree.ts +++ b/x-pack/plugins/serverless_search/public/navigation_tree.ts @@ -165,10 +165,6 @@ export const navigationTree = ({ isAppRegistered }: ApplicationStart): Navigatio defaultMessage: 'Management', }), }, - { - id: 'cloudLinkUserAndRoles', - cloudLink: 'userAndRoles', - }, { id: 'cloudLinkDeployment', cloudLink: 'deployment', diff --git a/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/side_navigation.ts b/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/side_navigation.ts index 139e1fe1f8064..b8e7bdea916c5 100644 --- a/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/side_navigation.ts +++ b/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/side_navigation.ts @@ -31,10 +31,7 @@ export const initSideNavigation = async (services: Services) => { ) as GroupDefinition; if (footerGroup) { footerGroup.title = PROJECT_SETTINGS_TITLE; - footerGroup.children.push( - { cloudLink: 'userAndRoles', openInNewTab: true }, - { cloudLink: 'billingAndSub', openInNewTab: true } - ); + footerGroup.children.push({ cloudLink: 'billingAndSub', openInNewTab: true }); } }) ) From dde5154f2f291321673478053bc0754b5d8ae929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loix?= Date: Wed, 18 Dec 2024 14:31:35 +0000 Subject: [PATCH 2/3] Fix functional test --- .../test_serverless/functional/test_suites/search/navigation.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/test_serverless/functional/test_suites/search/navigation.ts b/x-pack/test_serverless/functional/test_suites/search/navigation.ts index 3c1922892addc..f50575d0b415b 100644 --- a/x-pack/test_serverless/functional/test_suites/search/navigation.ts +++ b/x-pack/test_serverless/functional/test_suites/search/navigation.ts @@ -256,7 +256,6 @@ export default function ({ getPageObject, getService }: FtrProviderContext) { await solutionNavigation.sidenav.expectLinkExists({ text: 'Trained models' }); await solutionNavigation.sidenav.expectLinkExists({ text: 'Management' }); - await solutionNavigation.sidenav.expectLinkExists({ text: 'Users and roles' }); await solutionNavigation.sidenav.expectLinkExists({ text: 'Performance' }); await solutionNavigation.sidenav.expectLinkExists({ text: 'Billing and subscription' }); From 84bbb47609efa1c333196808586d028aa9dac3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loix?= Date: Wed, 18 Dec 2024 16:14:51 +0000 Subject: [PATCH 3/3] Fix functional test --- .../test_serverless/functional/test_suites/search/navigation.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/test_serverless/functional/test_suites/search/navigation.ts b/x-pack/test_serverless/functional/test_suites/search/navigation.ts index f50575d0b415b..6d482eeacbc7b 100644 --- a/x-pack/test_serverless/functional/test_suites/search/navigation.ts +++ b/x-pack/test_serverless/functional/test_suites/search/navigation.ts @@ -280,7 +280,6 @@ export default function ({ getPageObject, getService }: FtrProviderContext) { 'project_settings_project_nav', 'ml:modelManagement', 'management', - 'cloudLinkUserAndRoles', 'cloudLinkDeployment', 'cloudLinkBilling', ]);