15230: Link to other workbenches when double-clicking search results.

[arvados-workbench2.git] / src / store / users / users-actions.ts

diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts
index 7ea927de3e5a4637a68f59f5b6fb7e2fcec5e4a2..1a567e9db08017ca227a3182848370b179fcae1b 100644 (file)
--- a/src/store/users/users-actions.ts
+++ b/src/store/users/users-actions.ts
@@ -11,8 +11,8 @@ import { startSubmit, reset } from "redux-form";
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
 import { UserResource } from "~/models/user";
 import { getResource } from '~/store/resources/resources';
-import { navigateToProject, navigateToUsers, navigateToRootProject } from "~/store/navigation/navigation-action";
-import { saveApiToken, getUserDetails } from '~/store/auth/auth-action';
+import { navigateTo, navigateToUsers, navigateToRootProject } from "~/store/navigation/navigation-action";
+import { saveApiToken } from '~/store/auth/auth-action';
 
 export const USERS_PANEL_ID = 'usersPanel';
 export const USER_ATTRIBUTES_DIALOG = 'userAttributesDialog';
@@ -51,12 +51,15 @@ export const openSetupShellAccount = (uuid: string) =>
 
 export const loginAs = (uuid: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const { resources } = getState();
+        const data = getResource<UserResource>(uuid)(resources);
+        if (data) {
+            services.authService.saveUser(data);
+        }
         const client = await services.apiClientAuthorizationService.create({ ownerUuid: uuid });
-        dispatch<any>(saveApiToken(client.apiToken));
-        dispatch<any>(getUserDetails()).then(() => {
-            location.reload();
-            dispatch<any>(navigateToRootProject);
-        });
+        dispatch<any>(saveApiToken(`v2/${client.uuid}/${client.apiToken}`));
+        location.reload();
+        dispatch<any>(navigateToRootProject);
     };
 
 export const openUserCreateDialog = () =>
@@ -70,7 +73,7 @@ export const openUserCreateDialog = () =>
 
 export const openUserProjects = (uuid: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        dispatch<any>(navigateToProject(uuid));
+        dispatch<any>(navigateTo(uuid));
     };
 
 
@@ -131,4 +134,4 @@ export const loadUsersData = () =>
 export const loadUsersPanel = () =>
     (dispatch: Dispatch) => {
         dispatch(userBindedActions.REQUEST_ITEMS());
-    };
\ No newline at end of file
+    };