Fix screen flickering on login action
[arvados-workbench2.git] / src / views-components / api-token / api-token.tsx
index 3dc6d1a1acf51370c3c7b9c169745dd98ae184d8..718d35891e1cee22735c523821a8725313abb86c 100644 (file)
@@ -2,13 +2,13 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Redirect, RouteProps } from "react-router";
+import { RouteProps } from "react-router";
 import * as React from "react";
 import { connect, DispatchProp } from "react-redux";
 import { getUserDetails, saveApiToken } from "~/store/auth/auth-action";
-import { getProjectList } from "~/store/project/project-action";
 import { getUrlParameter } from "~/common/url";
 import { AuthService } from "~/services/auth-service/auth-service";
+import { navigateToRootProject } from "~/store/navigation/navigation-action";
 
 interface ApiTokenProps {
     authService: AuthService;
@@ -20,13 +20,12 @@ export const ApiToken = connect()(
             const search = this.props.location ? this.props.location.search : "";
             const apiToken = getUrlParameter(search, 'api_token');
             this.props.dispatch(saveApiToken(apiToken));
-            this.props.dispatch<any>(getUserDetails()).then(() => {
-                const rootUuid = this.props.authService.getRootUuid();
-                this.props.dispatch(getProjectList(rootUuid));
+            this.props.dispatch<any>(getUserDetails()).finally(() => {
+                this.props.dispatch(navigateToRootProject);
             });
         }
         render() {
-            return <Redirect to="/"/>;
+            return <div/>;
         }
     }
 );