add error handling for fetching users

scm-ui/src/users/containers/Users.js

@@ -43,7 +43,14 @@ class Users extends React.Component<Props, User> {
           <UserTable entries={userEntries} deleteUser={deleteUser} />
         </div>
       );
-    } else {
+    } else if(error){
+      return (
+        <div>
+          <ErrorNotification error={error} />
+        </div>
+      );
+    }
+    else {
       return <Loading />;
     }
   }

scm-ui/src/users/modules/users.js

@@ -46,11 +46,13 @@ function requestUsers() {
   };
 }
 
-function failedToFetchUsers(url: string, err: Error) {
+export function failedToFetchUsers(url: string, error: Error) {
   return {
     type: FETCH_USERS_FAILURE,
-    payload: err,
+    payload: {
-    url
+      error,
+      url
+    }
   };
 }
 
@@ -77,12 +79,9 @@ export function fetchUsers() {
       .then(data => {
         dispatch(fetchUsersSuccess(data));
       })
-      .catch(err => {
+      .catch(cause => {
-        if (err === NOT_FOUND_ERROR) {
+        const error = new Error(`could not fetch users: ${cause.message}`);
-          dispatch(usersNotFound(USERS_URL));
+        dispatch(failedToFetchUsers(USERS_URL, error));
-        } else {
-          dispatch(failedToFetchUsers(USERS_URL, err));
-        }
       });
   };
 }
@@ -120,12 +119,9 @@ export function fetchUser(name: string) {
       .then(data => {
         dispatch(fetchUserSuccess(data));
       })
-      .catch(err => {
+      .catch(cause => {
-        if (err === NOT_FOUND_ERROR) {
+        const error = new Error(`could not fetch user: ${cause.message}`);
-          dispatch(usersNotFound(userUrl));
+        dispatch(failedToFetchUsers(USERS_URL, error));
-        } else {
-          dispatch(failedToFetchUsers(userUrl, err));
-        }
       });
   };
 }
@@ -386,6 +382,14 @@ export default function reducer(state: any = {}, action: any = {}) {
         usersByNames: newUserByNames
       }
     case FETCH_USERS_FAILURE:
+      return {
+        ...state,
+        users: {
+          ...state.users,
+          loading: false,
+          error: action.payload.error
+        }
+      };
     case DELETE_USER_FAILURE:
       const newState = reduceUsersByNames(state, action.payload.user.name, {
         loading: false,

scm-ui/src/users/modules/users.test.js

@@ -24,7 +24,8 @@ import {
   DELETE_USER_FAILURE,
   deleteUser,
   updateUserFailure,
-  deleteUserSuccess
+  deleteUserSuccess,
+  failedToFetchUsers
 } from "./users";
 
 import reducer from "./users";
@@ -442,6 +443,20 @@ describe("users reducer", () => {
     expect(newState.users.error).toBe(null);
   });
 
+  it("should set error state if users could not be fetched", () => {
+    const state = {
+      users: {
+        error: null,
+        loading: true
+      }
+    };
+
+    const error = new Error("could not edit user zaphod: ..");
+    const newState = reducer(state, failedToFetchUsers('/users', error));
+    expect(newState.users.error).toBe(error);
+    expect(newState.users.loading).toBeFalsy();
+  });
+
   it("should not replace whole usersByNames map when fetching users", () => {
     const oldState = {
       usersByNames: {