17231: Added timeout to allow app to load properly before redirect

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>01~

diff --git a/src/views-components/api-token/api-token.tsx b/src/views-components/api-token/api-token.tsx
index b282311814a7f2650bbc2ff9cd99de657debbf60..548dfe772291690adbb5b728618033c04af6fcf1 100644 (file)
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -11,6 +11,7 @@ import { AuthService } from "~/services/auth-service/auth-service";
 import { navigateToRootProject, navigateToLinkAccount } from "~/store/navigation/navigation-action";
 import { Config } from "~/common/config";
 import { getAccountLinkData } from "~/store/link-account-panel/link-account-panel-actions";
+import { replace } from "react-router-redux";
 
 interface ApiTokenProps {
     authService: AuthService;
@@ -27,18 +28,20 @@ export const ApiToken = connect()(
             this.props.dispatch<any>(saveApiToken(apiToken)).finally(() => {
                 const redirectURL = this.props.authService.getTargetURL();
 
-                if (loadMainApp) {
-                    if (redirectURL) {
-                        this.props.authService.removeTargetURL();
-                        window.location.href = redirectURL;
+                setTimeout(() => {
+                    if (loadMainApp) {
+                        if (redirectURL) {
+                            this.props.authService.removeTargetURL();
+                            this.props.dispatch(replace(redirectURL));
+                        }
+                        else if (this.props.dispatch(getAccountLinkData())) {
+                            this.props.dispatch(navigateToLinkAccount);
+                        }
+                        else {
+                            this.props.dispatch(navigateToRootProject);
+                        }
                     }
-                    else if (this.props.dispatch(getAccountLinkData())) {
-                        this.props.dispatch(navigateToLinkAccount);
-                    }
-                    else {
-                        this.props.dispatch(navigateToRootProject);
-                    }
-                }
+                }, 0);
             });
         }
         render() {