Closes #72914 by hiding anomaly detection settings links when the ml …

…plugin is disabled. (#73638) (#73892) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx # x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx # x-pack/plugins/apm/public/components/app/Settings/index.tsx
elastic · Jul 31, 2020 · d834429 · d834429
1 parent 4dba016
commit d834429
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/x-pack/plugins/apm/public/components/app/Home/index.tsx b/x-pack/plugins/apm/public/components/app/Home/index.tsx
@@ -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
@@ -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>

diff --git a/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx b/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx
@@ -64,7 +64,7 @@ export const AddEnvironments = ({
     return (
       <EuiPanel>
         <EuiEmptyPrompt
-          iconType="warning"
+          iconType="alert"
           body={<>{ML_ERRORS.MISSING_WRITE_PRIVILEGES}</>}
         />
       </EuiPanel>

diff --git a/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx
@@ -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');
 
@@ -57,7 +57,7 @@ export const AnomalyDetection = () => {
     return (
       <EuiPanel>
         <EuiEmptyPrompt
-          iconType="warning"
+          iconType="alert"
           body={<>{ML_ERRORS.MISSING_READ_PRIVILEGES}</>}
         />
       </EuiPanel>

diff --git a/x-pack/plugins/apm/public/components/app/Settings/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/index.tsx
@@ -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 (
     <>
@@ -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',