From 8ff84abf67a0fb7cbb4b19360f62251e99239164 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Thu, 12 Jul 2018 16:51:32 +0200 Subject: [PATCH] Fixed bug/test --- scm-ui/src/users/modules/users.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js index 7361394368..77392c72b0 100644 --- a/scm-ui/src/users/modules/users.js +++ b/scm-ui/src/users/modules/users.js @@ -167,7 +167,6 @@ function deleteUserFailure(url: string, err: Error) { } export function deleteUser(link: string) { - return function(dispatch: ThunkDispatch) { dispatch(requestDeleteUser(link)); return apiClient @@ -178,7 +177,6 @@ export function deleteUser(link: string) { }) .catch(err => dispatch(deleteUserFailure(link, err))); }; - } export function getUsersFromState(state) { @@ -198,7 +196,11 @@ export function getUsersFromState(state) { return userEntries; } -function extractUsersByNames(users: Array, userNames: Array) { +function extractUsersByNames( + users: Array, + userNames: Array, + oldUsersByNames: {} +) { var usersByNames = {}; for (let user of users) { @@ -206,6 +208,10 @@ function extractUsersByNames(users: Array, userNames: Array) { entry: user }; } + + for (var userName in oldUsersByNames) { + usersByNames[userName] = oldUsersByNames[userName]; + } return usersByNames; } @@ -224,7 +230,12 @@ export default function reducer(state: any = {}, action: any = {}) { case FETCH_USERS_SUCCESS: const users = action.payload._embedded.users; const userNames = users.map(user => user.name); - const usersByNames = {...state.usersByNames, extractUsersByNames(users, userNames)}; + const usersByNames = extractUsersByNames( + users, + userNames, + state.usersByNames + ); + return { ...state, users: {