KIALI-2479 Block console rendering until all configs are retrieved

src/actions/GraphDataThunkActions.ts

@@ -42,7 +42,7 @@ const GraphDataThunkActions = {
         graphType: graphType,
         injectServiceNodes: injectServiceNodes
       };
-      if (namespaces.find(namespace => namespace.name === serverConfig().istioNamespace)) {
+      if (namespaces.find(namespace => namespace.name === serverConfig.istioNamespace)) {
         restParams['includeIstio'] = true;
       }
 

src/actions/KialiAppAction.ts

@@ -8,7 +8,6 @@ import { LoginAction } from './LoginActions';
 import { MessageCenterAction } from './MessageCenterActions';
 import { NamespaceAction } from './NamespaceAction';
 import { UserSettingsAction } from './UserSettingsActions';
-import { ServerConfigAction } from './ServerConfigActions';
 import { JaegerAction } from './JaegerActions';
 
 export type KialiAppAction =
@@ -21,6 +20,5 @@ export type KialiAppAction =
   | LoginAction
   | MessageCenterAction
   | NamespaceAction
-  | ServerConfigAction
   | UserSettingsAction
   | JaegerAction;

src/actions/LoginThunkActions.ts

@@ -1,12 +1,7 @@
 import moment from 'moment';
-import { HTTP_CODES } from '../types/Common';
 import { KialiAppState, LoginState, LoginSession } from '../store/Store';
-import HelpDropdownThunkActions from './HelpDropdownThunkActions';
-import GrafanaThunkActions from './GrafanaThunkActions';
 import { LoginActions } from './LoginActions';
 import * as API from '../services/Api';
-import { ServerConfigActions } from './ServerConfigActions';
-
 import * as Login from '../services/Login';
 import { AuthResult } from '../types/Auth';
 import { KialiDispatch } from '../types/Redux';
@@ -21,20 +16,7 @@ const shouldRelogin = (state?: LoginState): boolean =>
   moment(state.uiExpiresOn).diff(moment()) > 0;
 
 const loginSuccess = async (dispatch: KialiDispatch, session: LoginSession) => {
-  try {
-    dispatch(LoginActions.loginSuccess(session));
-
-    dispatch(HelpDropdownThunkActions.refresh());
-    dispatch(GrafanaThunkActions.getInfo());
-
-    const response = await API.getServerConfig();
-
-    dispatch(ServerConfigActions.setServerConfig(response.data));
-  } catch (error) {
-    if (error.response && error.response.status === HTTP_CODES.UNAUTHORIZED) {
-      dispatch(LoginActions.logoutSuccess());
-    }
-  }
+  dispatch(LoginActions.loginSuccess(session));
 };
 
 // Performs the user login, dispatching to the proper login implementations.
@@ -87,7 +69,6 @@ const LoginThunkActions = {
 
         if (response.status === 204) {
           dispatch(LoginActions.logoutSuccess());
-          dispatch(LoginThunkActions.checkCredentials());
         }
       } catch (err) {
         dispatch(MessageCenterActions.addMessage(API.getErrorMsg('Logout failed', err)));

src/app/App.tsx

@@ -1,16 +1,18 @@
+import axios from 'axios';
 import * as React from 'react';
-import { Router, withRouter } from 'react-router-dom';
+import { PersistGate } from 'redux-persist/lib/integration/react';
 import { Provider } from 'react-redux';
-import './App.css';
+import { Router, withRouter } from 'react-router-dom';
+import * as Visibility from 'visibilityjs';
+import { GlobalActions } from '../actions/GlobalActions';
 import NavigationContainer from '../containers/NavigationContainer';
 import { store, persistor } from '../store/ConfigStore';
-import axios from 'axios';
-import { GlobalActions } from '../actions/GlobalActions';
+import './App.css';
+import AuthenticationControllerContainer from './AuthenticationController';
 import history from './History';
-import { PersistGate } from 'redux-persist/lib/integration/react';
-import * as Visibility from 'visibilityjs';
 import InitializingScreen from './InitializingScreen';
 import StartupInitializer from './StartupInitializer';
+import LoginPageConnected from '../containers/LoginPageContainer';
 
 /**
  * Use the Patternfly RCUE productized css styles if set by the environment
@@ -83,26 +85,32 @@ type AppState = {
 };
 
 class App extends React.Component<{}, AppState> {
-  private navigator = withRouter(NavigationContainer);
+  private protectedArea: React.ReactNode;
 
   constructor(props: {}) {
     super(props);
     this.state = {
       isInitialized: false
     };
-
     loadRcueCssIfNeeded();
+
+    const Navigator = withRouter(NavigationContainer);
+    this.protectedArea = (
+      <Router history={history}>
+        <Navigator />
+      </Router>
+    );
   }
 
   render() {
-    const Navigator = this.navigator;
     return (
       <Provider store={store}>
         <PersistGate loading={<InitializingScreen />} persistor={persistor}>
           {this.state.isInitialized ? (
-            <Router history={history}>
-              <Navigator />
-            </Router>
+            <AuthenticationControllerContainer
+              publicAreaComponent={<LoginPageConnected />}
+              protectedAreaComponent={this.protectedArea}
+            />
           ) : (
             <StartupInitializer onInitializationFinished={this.initializationFinishedHandler} />
           )}