Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 23:45:44 +01:00
Code Issues Packages Projects Releases Activity

Fixed tests

Browse Source
This commit is contained in:
Philipp Czora
2018-07-17 17:00:45 +02:00
parent 0f87b61329
commit 727318124c
3 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scm-ui/src/users/modules/users.js
View File

@@ -1,17 +1,8 @@
// @flow
import {
apiClient,
NOT_FOUND_ERROR
} from "../../apiclient";
import type {
User
} from "../types/User";
import type {
UserEntry
} from "../types/UserEntry";
import {
Dispatch
} from "redux";
import { apiClient, NOT_FOUND_ERROR } from "../../apiclient";
import type { User } from "../types/User";
import type { UserEntry } from "../types/UserEntry";
import { Dispatch } from "redux";
export const FETCH_USERS = "scm/users/FETCH";
export const FETCH_USERS_SUCCESS = "scm/users/FETCH_SUCCESS";
@@ -58,7 +49,7 @@ function usersNotFound(url: string) {
}
export function fetchUsers() {
return function (dispatch: any) {
return function(dispatch: any) {
dispatch(requestUsers());
return apiClient
.get(USERS_URL)
@@ -98,7 +89,7 @@ function requestAddUser(user: User) {
}
export function addUser(user: User) {
return function (dispatch: Dispatch) {
return function(dispatch: Dispatch) {
dispatch(requestAddUser(user));
return apiClient
.postWithContentType(USERS_URL, user, CONTENT_TYPE_USER)
@@ -132,7 +123,7 @@ function requestUpdateUser(user: User) {
}
export function updateUser(user: User) {
return function (dispatch: Dispatch) {
return function(dispatch: Dispatch) {
dispatch(requestUpdateUser(user));
return apiClient
.putWithContentType(user._links.update.href, user, CONTENT_TYPE_USER)
@@ -182,9 +173,8 @@ export function deleteUserFailure(user: User, error: Error) {
};
}
export function deleteUser(user: User) {
return function (dispatch: any) {
return function(dispatch: any) {
dispatch(requestDeleteUser(user));
return apiClient
.delete(user._links.delete.href)
@@ -204,7 +194,7 @@ export function getUsersFromState(state) {
if (!userNames) {
return null;
}
var userEntries: Array < UserEntry > = [];
const userEntries: Array<UserEntry> = [];
for (let userName of userNames) {
userEntries.push(state.users.usersByNames[userName]);
@@ -214,11 +204,11 @@ export function getUsersFromState(state) {
}
function extractUsersByNames(
users: Array < User > ,
userNames: Array < string > ,
users: Array<User>,
userNames: Array<string>,
oldUsersByNames: {}
) {
var usersByNames = {};
const usersByNames = {};
for (let user of users) {
usersByNames[user.name] = {
@@ -226,7 +216,7 @@ function extractUsersByNames(
};
}
for (var userName in oldUsersByNames) {
for (let userName in oldUsersByNames) {
usersByNames[userName] = oldUsersByNames[userName];
}
return usersByNames;
@@ -239,7 +229,11 @@ export function editUser(user: User) {
};
}
const reduceUsersByNames = (state: any, username: string, newUserState: any) => {
const reduceUsersByNames = (
state: any,
username: string,
newUserState: any
) => {
const newUsersByNames = {
...state.usersByNames,
[username]: newUserState