Merge branch '13708-process-form-runtime-constraints'

[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 4780aa728362aa7fdf0d536ed583827e8a007321..42406858623aa9f0f99dde829ae4fca1d99b6948 100644 (file)
--- a/src/store/users/users-actions.ts
+++ b/src/store/users/users-actions.ts
@@ -12,7 +12,7 @@ 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 } from '~/store/auth/auth-action';
+import { saveApiToken, getUserDetails } from '~/store/auth/auth-action';
 
 export const USERS_PANEL_ID = 'usersPanel';
 export const USER_ATTRIBUTES_DIALOG = 'userAttributesDialog';
@@ -34,10 +34,13 @@ 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 }));
+        const user = getResource<UserResource>(uuid)(resources);
+        const clients = await services.apiClientAuthorizationService.list();
+        const client = clients.items.find(it => it.ownerUuid === uuid);
+        console.log(client);
+        dispatch(dialogActions.OPEN_DIALOG({ id: USER_MANAGEMENT_DIALOG, data: { user, client } }));
     };
 
 export const openSetupShellAccount = (uuid: string) =>
@@ -53,8 +56,10 @@ export const loginAs = (uuid: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const client = await services.apiClientAuthorizationService.get(uuid);
         dispatch<any>(saveApiToken(client.apiToken));
-        location.reload();
-        dispatch<any>(navigateToRootProject);
+        dispatch<any>(getUserDetails()).then(() => {
+            location.reload();
+            dispatch<any>(navigateToRootProject);
+        });
     };
 
 export const openUserCreateDialog = () =>