[Actionable Observability] hide rules from sidebar and move under ale…

…rts (#128437) * hide rules from sidebar and move under alerts * update tests * remove commented code * update order Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Mar 24, 2022 · 8d1b8c0 · 8d1b8c0
1 parent 5a3faca
commit 8d1b8c0
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 21 deletions.
diff --git a/x-pack/plugins/observability/public/hooks/create_use_rules_link.ts b/x-pack/plugins/observability/public/hooks/create_use_rules_link.ts
@@ -11,7 +11,7 @@ export function createUseRulesLink(isNewRuleManagementEnabled = false) {
     const linkProps = isNewRuleManagementEnabled
       ? {
           app: 'observability',
-          pathname: '/rules',
+          pathname: '/alerts/rules',
         }
       : {
           app: 'management',

diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
@@ -147,7 +147,7 @@ function AlertsPage() {
   }, []);
 
   const manageRulesHref = config.unsafe.rules.enabled
-    ? http.basePath.prepend('/app/observability/rules')
+    ? http.basePath.prepend('/app/observability/alerts/rules')
     : http.basePath.prepend('/app/management/insightsAndAlerting/triggersActions/rules');
 
   const dynamicIndexPatternsAsyncState = useAsync(async (): Promise<DataViewBase[]> => {

diff --git a/x-pack/plugins/observability/public/pages/rules/index.tsx b/x-pack/plugins/observability/public/pages/rules/index.tsx
@@ -19,6 +19,7 @@ import {
   EuiFieldSearch,
   OnRefreshChangeProps,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { usePluginContext } from '../../hooks/use_plugin_context';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
@@ -140,6 +141,12 @@ export function RulesPage() {
   }, [refreshInterval, reload, isPaused]);
 
   useBreadcrumbs([
+    {
+      text: i18n.translate('xpack.observability.breadcrumbs.alertsLinkText', {
+        defaultMessage: 'Alerts',
+      }),
+      href: http.basePath.prepend('/app/observability/alerts'),
+    },
     {
       text: RULES_BREADCRUMB_TEXT,
     },

diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts
@@ -93,21 +93,22 @@ export class Plugin
       order: 8001,
       path: '/alerts',
       navLinkStatus: AppNavLinkStatus.hidden,
-    },
-    {
-      id: 'rules',
-      title: i18n.translate('xpack.observability.rulesLinkTitle', {
-        defaultMessage: 'Rules',
-      }),
-      order: 8002,
-      path: '/rules',
-      navLinkStatus: AppNavLinkStatus.hidden,
+      deepLinks: [
+        {
+          id: 'rules',
+          title: i18n.translate('xpack.observability.rulesLinkTitle', {
+            defaultMessage: 'Rules',
+          }),
+          path: '/alerts/rules',
+          navLinkStatus: AppNavLinkStatus.hidden,
+        },
+      ],
     },
     getCasesDeepLinks({
       basePath: casesPath,
       extend: {
         [CasesDeepLinkId.cases]: {
-          order: 8003,
+          order: 8002,
           navLinkStatus: AppNavLinkStatus.hidden,
         },
         [CasesDeepLinkId.casesCreate]: {

diff --git a/x-pack/plugins/observability/public/routes/index.tsx b/x-pack/plugins/observability/public/routes/index.tsx
@@ -88,7 +88,7 @@ export const routes = {
     },
     exact: true,
   },
-  '/rules': {
+  '/alerts/rules': {
     handler: () => {
       return <RulesPage />;
     },

diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
@@ -64,7 +64,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(navLinks.map((link) => link.text)).to.eql([
           'Overview',
           'Alerts',
-          'Rules',
           'APM',
           'User Experience',
           'Stack Management',
@@ -120,7 +119,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(navLinks).to.eql([
           'Overview',
           'Alerts',
-          'Rules',
           'APM',
           'User Experience',
           'Stack Management',

diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
@@ -63,7 +63,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows metrics navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Alerts', 'Rules', 'Metrics', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Metrics', 'Stack Management']);
       });
 
       describe('infrastructure landing page without data', () => {
@@ -161,7 +161,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows metrics navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Alerts', 'Rules', 'Metrics', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Metrics', 'Stack Management']);
       });
 
       describe('infrastructure landing page without data', () => {

diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
@@ -60,7 +60,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows logs navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Alerts', 'Rules', 'Logs', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Logs', 'Stack Management']);
       });
 
       describe('logs landing page without data', () => {
@@ -123,7 +123,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows logs navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Alerts', 'Rules', 'Logs', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Logs', 'Stack Management']);
       });
 
       describe('logs landing page without data', () => {

diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
@@ -70,7 +70,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(navLinks.map((link) => link.text)).to.eql([
           'Overview',
           'Alerts',
-          'Rules',
           'Uptime',
           'Stack Management',
         ]);
@@ -124,7 +123,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows uptime navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Alerts', 'Rules', 'Uptime', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Uptime', 'Stack Management']);
       });
 
       it('can navigate to Uptime app', async () => {