Merge pull request #140 from CreateThrive/bugfix/users-redirect-error

Bugfix: Redirect when creating a user

Author: TOPOFGR

src/pages/User/index.jsx

@@ -48,7 +48,9 @@ const User = () => {
     }
   }, [isEditing, id, userData, user, dispatch]);
 
-  const redirect = (error || success) && <Redirect to={paths.USERS} />;
+  const redirect = ((isEditing && error) || success) && (
+    <Redirect to={paths.USERS} />
+  );
 
   const editUserMessage = useFormatMessage('User.editUser');
 

src/state/actions/users.js

@@ -50,6 +50,12 @@ export const fetchUsers = (userId = '') => {
         return dispatch(USERS_FETCH_DATA_FAIL({ error }));
       }
 
+      if (!userData) {
+        const errorMessage = 'User not available';
+        toastr.error('', errorMessage);
+        return dispatch(USERS_FETCH_DATA_FAIL({ error: errorMessage }));
+      }
+
       const user = { ...userData, id: userId };
       const users = getState().users.data;
       users.push(user);