Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.9] Closes #72914 by hiding anomaly detection settings links when the ml plugin is disabled. (#73638) #73892

Merged
merged 2 commits into from
Jul 31, 2020
Merged

[7.9] Closes #72914 by hiding anomaly detection settings links when the ml plugin is disabled. (#73638) #73892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a57a3f1
Closes #72914 by hiding anomaly detection settings links when the ml …
ogupte Jul 30, 2020
ce8c17d
Merge remote-tracking branch 'upstream/7.9' into backport/7.9/pr-73638
ogupte Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions x-pack/plugins/apm/public/components/app/Home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ interface Props {
}

export function Home({ tab }: Props) {
const { config } = useApmPluginContext();
const { config, core } = useApmPluginContext();
const isMLEnabled = !!core.application.capabilities.ml;
const homeTabs = getHomeTabs(config);
const selectedTab = homeTabs.find(
(homeTab) => homeTab.name === tab
Expand All @@ -105,9 +106,11 @@ export function Home({ tab }: Props) {
</EuiButtonEmpty>
</SettingsLink>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<AnomalyDetectionSetupLink />
</EuiFlexItem>
{isMLEnabled && (
<EuiFlexItem grow={false}>
<AnomalyDetectionSetupLink />
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>
<SetupInstructionsLink />
</EuiFlexItem>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const AddEnvironments = ({
return (
<EuiPanel>
<EuiEmptyPrompt
iconType="warning"
iconType="alert"
body={<>{ML_ERRORS.MISSING_WRITE_PRIVILEGES}</>}
/>
</EuiPanel>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const DEFAULT_VALUE: AnomalyDetectionApiResponse = {

export const AnomalyDetection = () => {
const plugin = useApmPluginContext();
const canGetJobs = !!plugin.core.application.capabilities.ml.canGetJobs;
const canGetJobs = !!plugin.core.application.capabilities.ml?.canGetJobs;
const license = useLicense();
const hasValidLicense = license?.isActive && license?.hasAtLeast('platinum');

Expand Down Expand Up @@ -57,7 +57,7 @@ export const AnomalyDetection = () => {
return (
<EuiPanel>
<EuiEmptyPrompt
iconType="warning"
iconType="alert"
body={<>{ML_ERRORS.MISSING_READ_PRIVILEGES}</>}
/>
</EuiPanel>
Expand Down
33 changes: 22 additions & 11 deletions x-pack/plugins/apm/public/components/app/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ import {
import { HomeLink } from '../../shared/Links/apm/HomeLink';
import { useLocation } from '../../../hooks/useLocation';
import { getAPMHref } from '../../shared/Links/apm/APMLink';
import { useApmPluginContext } from '../../../hooks/useApmPluginContext';

export const Settings: React.FC = (props) => {
const plugin = useApmPluginContext();
const isMLEnabled = !!plugin.core.application.capabilities.ml;
const { search, pathname } = useLocation();
return (
<>
Expand Down Expand Up @@ -48,17 +51,25 @@ export const Settings: React.FC = (props) => {
'/settings/agent-configuration'
),
},
{
name: i18n.translate(
'xpack.apm.settings.anomalyDetection',
{
defaultMessage: 'Anomaly detection',
}
),
id: '4',
href: getAPMHref('/settings/anomaly-detection', search),
isSelected: pathname === '/settings/anomaly-detection',
},
...(isMLEnabled
? [
{
name: i18n.translate(
'xpack.apm.settings.anomalyDetection',
{
defaultMessage: 'Anomaly detection',
}
),
id: '4',
href: getAPMHref(
'/settings/anomaly-detection',
search
),
isSelected:
pathname === '/settings/anomaly-detection',
},
]
: []),
{
name: i18n.translate('xpack.apm.settings.customizeApp', {
defaultMessage: 'Customize app',
Expand Down