[Monitoring] Fix Set Up Monitoring redirect to setup mode (elastic#11…

…4354) (elastic#114707) * [Monitoring] Fix Set Up Monitoring redirect to setup mode * Fix initt setup mode from route init
kibanamachine · Oct 12, 2021 · 5707a2b · 5707a2b
1 parent 8bd946e
commit 5707a2b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/elasticsearch_template.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/elasticsearch_template.tsx
@@ -12,7 +12,7 @@ import { TabMenuItem, PageTemplateProps } from '../page_template';
 import { ML_SUPPORTED_LICENSES } from '../../../../common/constants';
 
 interface ElasticsearchTemplateProps extends PageTemplateProps {
-  cluster: any;
+  cluster?: any;
 }
 
 export const ElasticsearchTemplate: React.FC<ElasticsearchTemplateProps> = ({
@@ -43,7 +43,7 @@ export const ElasticsearchTemplate: React.FC<ElasticsearchTemplateProps> = ({
     },
   ];
 
-  if (mlIsSupported(cluster.license)) {
+  if (cluster && mlIsSupported(cluster.license)) {
     tabs.push({
       id: 'ml',
       label: i18n.translate('xpack.monitoring.esNavigation.jobsLinkText', {
@@ -53,7 +53,7 @@ export const ElasticsearchTemplate: React.FC<ElasticsearchTemplateProps> = ({
     });
   }
 
-  if (cluster.isCcrEnabled) {
+  if (cluster?.isCcrEnabled) {
     tabs.push({
       id: 'ccr',
       label: i18n.translate('xpack.monitoring.esNavigation.ccrLinkText', {

diff --git a/x-pack/plugins/monitoring/public/application/route_init.tsx b/x-pack/plugins/monitoring/public/application/route_init.tsx
@@ -9,6 +9,7 @@ import { Route, Redirect, useLocation } from 'react-router-dom';
 import { useClusters } from './hooks/use_clusters';
 import { GlobalStateContext } from './contexts/global_state_context';
 import { getClusterFromClusters } from '../lib/get_cluster_from_clusters';
+import { isInSetupMode } from './setup_mode';
 import { LoadingPage } from './pages/loading_page';
 
 export interface ComponentProps {
@@ -35,13 +36,12 @@ export const RouteInit: React.FC<RouteInitProps> = ({
 
   const { clusters, loaded } = useClusters(clusterUuid, undefined, codePaths);
 
-  // TODO: we will need this when setup mode is migrated
-  // const inSetupMode = isInSetupMode();
+  const inSetupMode = isInSetupMode(undefined, globalState);
 
   const cluster = getClusterFromClusters(clusters, globalState, unsetGlobalState);
 
   // TODO: check for setupMode too when the setup mode is migrated
-  if (loaded && !cluster) {
+  if (loaded && !cluster && !inSetupMode) {
     return <Redirect to="/no-data" />;
   }
 

diff --git a/x-pack/plugins/monitoring/public/application/setup_mode/index.ts b/x-pack/plugins/monitoring/public/application/setup_mode/index.ts
@@ -0,0 +1,8 @@
+/*
+ * 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.
+ */
+
+export * from './setup_mode';
diff --git a/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode.tsx b/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode.tsx
@@ -177,15 +177,15 @@ export const initSetupModeState = async (
   }
 };
 
-export const isInSetupMode = (context?: ISetupModeContext) => {
+export const isInSetupMode = (context?: ISetupModeContext, gState: GlobalState = globalState) => {
   if (context?.setupModeSupported === false) {
     return false;
   }
   if (setupModeState.enabled) {
     return true;
   }
 
-  return globalState.inSetupMode;
+  return gState.inSetupMode;
 };
 
 export const isSetupModeFeatureEnabled = (feature: SetupModeFeature) => {