mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 07:25:44 +01:00
Fixed bug/test
This commit is contained in:
@@ -167,7 +167,6 @@ function deleteUserFailure(url: string, err: Error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function deleteUser(link: string) {
|
export function deleteUser(link: string) {
|
||||||
|
|
||||||
return function(dispatch: ThunkDispatch) {
|
return function(dispatch: ThunkDispatch) {
|
||||||
dispatch(requestDeleteUser(link));
|
dispatch(requestDeleteUser(link));
|
||||||
return apiClient
|
return apiClient
|
||||||
@@ -178,7 +177,6 @@ export function deleteUser(link: string) {
|
|||||||
})
|
})
|
||||||
.catch(err => dispatch(deleteUserFailure(link, err)));
|
.catch(err => dispatch(deleteUserFailure(link, err)));
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getUsersFromState(state) {
|
export function getUsersFromState(state) {
|
||||||
@@ -198,7 +196,11 @@ export function getUsersFromState(state) {
|
|||||||
return userEntries;
|
return userEntries;
|
||||||
}
|
}
|
||||||
|
|
||||||
function extractUsersByNames(users: Array<User>, userNames: Array<string>) {
|
function extractUsersByNames(
|
||||||
|
users: Array<User>,
|
||||||
|
userNames: Array<string>,
|
||||||
|
oldUsersByNames: {}
|
||||||
|
) {
|
||||||
var usersByNames = {};
|
var usersByNames = {};
|
||||||
|
|
||||||
for (let user of users) {
|
for (let user of users) {
|
||||||
@@ -206,6 +208,10 @@ function extractUsersByNames(users: Array<User>, userNames: Array<string>) {
|
|||||||
entry: user
|
entry: user
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (var userName in oldUsersByNames) {
|
||||||
|
usersByNames[userName] = oldUsersByNames[userName];
|
||||||
|
}
|
||||||
return usersByNames;
|
return usersByNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -224,7 +230,12 @@ export default function reducer(state: any = {}, action: any = {}) {
|
|||||||
case FETCH_USERS_SUCCESS:
|
case FETCH_USERS_SUCCESS:
|
||||||
const users = action.payload._embedded.users;
|
const users = action.payload._embedded.users;
|
||||||
const userNames = users.map(user => user.name);
|
const userNames = users.map(user => user.name);
|
||||||
const usersByNames = {...state.usersByNames, extractUsersByNames(users, userNames)};
|
const usersByNames = extractUsersByNames(
|
||||||
|
users,
|
||||||
|
userNames,
|
||||||
|
state.usersByNames
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
users: {
|
users: {
|
||||||
|
|||||||
Reference in New Issue
Block a user