18559: Fix user profile form initialization & cleanup

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

diff --git a/src/store/user-profile/user-profile-actions.ts b/src/store/user-profile/user-profile-actions.ts
index 103456f3ea8dd766930dd53ac84845bf449e1d43..82e90a2bc46eec16f0387bdef534e4f856e14ede 100644 (file)
--- a/src/store/user-profile/user-profile-actions.ts
+++ b/src/store/user-profile/user-profile-actions.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 import { RootState } from "store/store";
 import { Dispatch } from 'redux';
-import { reset } from "redux-form";
+import { initialize, reset } from "redux-form";
 import { ServiceRepository } from "services/services";
 import { bindDataExplorerActions } from "store/data-explorer/data-explorer-action";
 import { propertiesActions } from 'store/properties/properties-actions';
@@ -25,9 +25,10 @@ export const loadUserProfilePanel = (userUuid?: string) =>
     // Get user uuid from route or use current user uuid
     const uuid = userUuid || getState().auth.user?.uuid;
     if (uuid) {
+      await dispatch(propertiesActions.SET_PROPERTY({ key: USER_PROFILE_PANEL_ID, value: uuid }));
       const user = await services.userService.get(uuid);
+      dispatch(initialize(USER_PROFILE_FORM, user));
       dispatch(updateResources([user]));
-      await dispatch(propertiesActions.SET_PROPERTY({ key: USER_PROFILE_PANEL_ID, value: uuid }));
       dispatch(UserProfileGroupsActions.REQUEST_ITEMS());
     }
   }