15840: Fixes merge

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

diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts
index 4780aa728362aa7fdf0d536ed583827e8a007321..44b2bad68d92cf1ac0a77d0f55ad90a3575e61a5 100644 (file)
--- a/src/store/users/users-actions.ts
+++ b/src/store/users/users-actions.ts
@@ -11,7 +11,7 @@ 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 { navigateTo, navigateToUsers, navigateToRootProject } from "~/store/navigation/navigation-action";
 import { saveApiToken } from '~/store/auth/auth-action';
 
 export const USERS_PANEL_ID = 'usersPanel';
@@ -34,7 +34,7 @@ export const openUserAttributes = (uuid: string) =>
     };
 
 export const openUserManagement = (uuid: string) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const { resources } = getState();
         const data = getResource<UserResource>(uuid)(resources);
         dispatch(dialogActions.OPEN_DIALOG({ id: USER_MANAGEMENT_DIALOG, data }));
@@ -51,8 +51,13 @@ export const openSetupShellAccount = (uuid: string) =>
 
 export const loginAs = (uuid: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const client = await services.apiClientAuthorizationService.get(uuid);
-        dispatch<any>(saveApiToken(client.apiToken));
+        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(`v2/${client.uuid}/${client.apiToken}`));
         location.reload();
         dispatch<any>(navigateToRootProject);
     };
@@ -68,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));
     };
 
 
@@ -104,7 +109,7 @@ export const toggleIsActive = (uuid: string) =>
         const { resources } = getState();
         const data = getResource<UserResource>(uuid)(resources);
         const isActive = data!.isActive;
-        const newActivity = await services.userService.update(uuid, { ...data, isActive: !isActive });
+        const newActivity = await services.userService.update(uuid, { isActive: !isActive });
         dispatch<any>(loadUsersPanel());
         return newActivity;
     };
@@ -114,7 +119,7 @@ export const toggleIsAdmin = (uuid: string) =>
         const { resources } = getState();
         const data = getResource<UserResource>(uuid)(resources);
         const isAdmin = data!.isAdmin;
-        const newActivity = await services.userService.update(uuid, { ...data, isAdmin: !isAdmin });
+        const newActivity = await services.userService.update(uuid, { isAdmin: !isAdmin });
         dispatch<any>(loadUsersPanel());
         return newActivity;
     };
@@ -129,4 +134,4 @@ export const loadUsersData = () =>
 export const loadUsersPanel = () =>
     (dispatch: Dispatch) => {
         dispatch(userBindedActions.REQUEST_ITEMS());
-    };
\ No newline at end of file
+    };