16941: Fix AxiosInstance import. Add apiClient accessor

Also fix warning about Grid needing to be a container.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts
index 294424013bcf5de46455ac2d77d274312dbb9fb8..ce3564e001614b664998a9db73a57c79eabc79af 100644 (file)
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -69,6 +69,10 @@ export class AuthService {
         return this.getStorage().getItem(HOME_CLUSTER) || undefined;
     }
 
+    public getApiClient() {
+        return this.apiClient;
+    }
+
     public removeUser() {
         this.getStorage().removeItem(USER_EMAIL_KEY);
         this.getStorage().removeItem(USER_FIRST_NAME_KEY);

diff --git a/src/store/auth/auth-action-session.ts b/src/store/auth/auth-action-session.ts
index f0093f9ff24b6c21e17d53eefa8bcc7484617d45..c871e147d1c249f4f5f699196f90eb33598023ae 100644 (file)
--- a/src/store/auth/auth-action-session.ts
+++ b/src/store/auth/auth-action-session.ts
@@ -6,7 +6,7 @@ import { Dispatch } from "redux";
 import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions";
 import { RootState } from "~/store/store";
 import { ServiceRepository, createServices, setAuthorizationHeader } from "~/services/services";
-import Axios from "axios";
+import Axios, { AxiosInstance } from "axios";
 import { User, getUserDisplayName } from "~/models/user";
 import { authActions } from "~/store/auth/auth-action";
 import {
@@ -313,7 +313,7 @@ export const initSessions = (authService: AuthService, config: Config, user: Use
     (dispatch: Dispatch<any>) => {
         const sessions = authService.buildSessions(config, user);
         dispatch(authActions.SET_SESSIONS(sessions));
-        dispatch(validateSessions(authService.apiClient));
+        dispatch(validateSessions(authService.getApiClient()));
     };
 
 export const loadSiteManagerPanel = () =>

diff --git a/src/views-components/main-content-bar/main-content-bar.tsx b/src/views-components/main-content-bar/main-content-bar.tsx
index c8565d62b1844c70e3c0eec7459b02e497dc9a28..cad73a3a8e4b8cee12b6eba1155b80a5fa619990 100644 (file)
--- a/src/views-components/main-content-bar/main-content-bar.tsx
+++ b/src/views-components/main-content-bar/main-content-bar.tsx
@@ -43,26 +43,26 @@ export const MainContentBar =
     connect((state: RootState) => ({
         buttonVisible: isButtonVisible(state)
     }), {
-        onDetailsPanelToggle: toggleDetailsPanel,
-    })(
-        withStyles(styles)(
-            (props: MainContentBarProps & WithStyles<CssRules> & any) =>
-                <Toolbar>
-                    <Grid container>
-                        <Grid item xs alignItems="center">
-                            <Breadcrumbs />
+            onDetailsPanelToggle: toggleDetailsPanel,
+        })(
+            withStyles(styles)(
+                (props: MainContentBarProps & WithStyles<CssRules> & any) =>
+                    <Toolbar>
+                        <Grid container>
+                            <Grid container item xs alignItems="center">
+                                <Breadcrumbs />
+                            </Grid>
+                            <Grid item>
+                                <RefreshButton />
+                            </Grid>
+                            <Grid item>
+                                {props.buttonVisible && <Tooltip title="Additional Info">
+                                    <IconButton color="inherit" className={props.classes.infoTooltip} onClick={props.onDetailsPanelToggle}>
+                                        <DetailsIcon />
+                                    </IconButton>
+                                </Tooltip>}
+                            </Grid>
                         </Grid>
-                        <Grid item>
-                            <RefreshButton />
-                        </Grid>
-                        <Grid item>
-                            {props.buttonVisible && <Tooltip title="Additional Info">
-                                <IconButton color="inherit" className={props.classes.infoTooltip} onClick={props.onDetailsPanelToggle}>
-                                    <DetailsIcon />
-                                </IconButton>
-                            </Tooltip>}
-                        </Grid>
-                    </Grid>
-                </Toolbar>
-        )
-    );
+                    </Toolbar>
+            )
+        );