Merge remote-tracking branch 'origin/main' into 19051-handle-quotes-in-search

[arvados-workbench2.git] / src / views-components / login-form / login-form.tsx

diff --git a/src/views-components/login-form/login-form.tsx b/src/views-components/login-form/login-form.tsx
index aac1364207420247b0e620b3ee3b2679cda9d08e..3aa9e3f25aeb8ed1c6646765051596cb16ff00dd 100644 (file)
--- a/src/views-components/login-form/login-form.tsx
+++ b/src/views-components/login-form/login-form.tsx
@@ -12,6 +12,7 @@ import { AxiosPromise } from 'axios';
 import { DispatchProp } from 'react-redux';
 import { saveApiToken } from 'store/auth/auth-action';
 import { navigateToRootProject } from 'store/navigation/navigation-action';
 import { DispatchProp } from 'react-redux';
 import { saveApiToken } from 'store/auth/auth-action';
 import { navigateToRootProject } from 'store/navigation/navigation-action';

+import { replace } from 'react-router-redux';

 
 type CssRules = 'root' | 'loginBtn' | 'card' | 'wrapper' | 'progress';
 
 
 type CssRules = 'root' | 'loginBtn' | 'card' | 'wrapper' | 'progress';
 


@@ -87,8 +88,11 @@ export const LoginForm = withStyles(styles)(
                 setSubmitting(false);
                 if (response.data.uuid && response.data.api_token) {
                     const apiToken = `v2/${response.data.uuid}/${response.data.api_token}`;
                 setSubmitting(false);
                 if (response.data.uuid && response.data.api_token) {
                     const apiToken = `v2/${response.data.uuid}/${response.data.api_token}`;

+                    const rd = new URL(window.location.href);
+                    const rdUrl = rd.pathname + rd.search;

                     dispatch<any>(saveApiToken(apiToken)).finally(
                     dispatch<any>(saveApiToken(apiToken)).finally(

-                        () => dispatch(navigateToRootProject));
+                        () => rdUrl === '/' ? dispatch(navigateToRootProject) : dispatch(replace(rdUrl))
+                    );

                 } else {
                     setError(true);
                     setHelperText(response.data.message || 'Please try again');
                 } else {
                     setError(true);
                     setHelperText(response.data.message || 'Please try again');