maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix missing alerts menu (#94210)

Browse source 
In #92898 the `alerts` plugin was renamed to `alerting`. We were checking if this plugin is enabled with a check like `'alerts' in plugins`, which is not type checked.

Change the check to use `!!plugins.alerting` so this type of change will be caught in the future.

Rename `get_alert_capabilities` to `get_alerting_capabilities` to match the name of the exported function. Add a test for it.
This commit is contained in:
Nathan L Smith 2021-03-09 18:52:57 -06:00 committed by GitHub
parent 89a43555f8
commit 0ac5e4db7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/apm/public/application/action_menu/index.tsx
View file

@ -9,7 +9,7 @@ import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
import { useParams } from 'react-router-dom';
import { getAlertingCapabilities } from '../../components/alerting/get_alert_capabilities';
import { getAlertingCapabilities } from '../../components/alerting/get_alerting_capabilities';
import { getAPMHref } from '../../components/shared/Links/apm/APMLink';
import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
import { AlertingPopoverAndFlyout } from './alerting_popover_flyout';

23
x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts Normal file
View file

@ -0,0 +1,23 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { Capabilities } from 'kibana/public';
import { ApmPluginSetupDeps } from '../../plugin';
import { getAlertingCapabilities } from './get_alerting_capabilities';
describe('getAlertingCapabilities', () => {
describe('when the alerting plugin is not enabled', () => {
it('returns isAlertingAvailable = false', () => {
expect(
getAlertingCapabilities(
{} as ApmPluginSetupDeps,
({ apm: {} } as unknown) as Capabilities
).isAlertingAvailable
).toEqual(false);
});
});
});

2
x-pack/plugins/apm/public/components/alerting/get_alert_capabilities.ts → x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts
View file

@ -14,7 +14,7 @@ export const getAlertingCapabilities = (
) => {
const canReadAlerts = !!capabilities.apm['alerting:show'];
const canSaveAlerts = !!capabilities.apm['alerting:save'];
const isAlertingPluginEnabled = 'alerts' in plugins;
const isAlertingPluginEnabled = !!plugins.alerting;
const isAlertingAvailable =
isAlertingPluginEnabled && (canReadAlerts || canSaveAlerts);
const isMlPluginEnabled = 'ml' in plugins;