Flatten userlist store structure. Add several unit tests for userListReducers

Author: borisyankov

src/common/__tests__/__snapshots__/ZulipButton-test.js.snap

@@ -5,8 +5,8 @@ exports[`test renders correctly 1`] = `
       undefined,
       Object {
         "alignItems": "center",
+        "alignSelf": "stretch",
         "borderRadius": 5,
-        "flex": 1,
         "height": 44,
         "justifyContent": "center",
         "marginBottom": 10

src/userlist/UserListContainer.js

@@ -21,8 +21,7 @@ class UserListContainer extends Component {
 }
 
 const mapStateToProps = (state) => ({
-  users: state.userlist.get('users'),
-  presence: state.userlist.get('presence'),
+  users: state.userlist,
 });
 
 const mapDispatchToProps = (dispatch, ownProps) =>

src/userlist/UsersCard.js

@@ -37,7 +37,6 @@ export default class UsersCard extends Component {
     drawer: () => null,
   };
 
-
   constructor(props: Props) {
     super(props);
     this.state = {

src/userlist/__tests__/userListReducers-test.js

@@ -0,0 +1,20 @@
+import { fromJS } from 'immutable';
+import { GET_USER_RESPONSE } from '../userListActions';
+import userListReducers from '../userListReducers';
+
+it('when unrecognized action, no previous state, returns initial state, does not throw', () => {
+  const newState = userListReducers(undefined, {});
+  expect(newState).toBeDefined();
+});
+
+it('on unrecognized action, returns input state unchanged', () => {
+  const prevState = { hello: 'world' };
+  const newState = userListReducers(prevState, {});
+  expect(newState).toEqual(prevState);
+});
+
+it('on GET_USER_RESPONSE stores user data', () => {
+  const users = [{ full_name: 'user1' }, { full_name: 'user2' }];
+  const newState = userListReducers(fromJS([]), { type: GET_USER_RESPONSE, users });
+  expect(newState).toEqual(users);
+});

src/userlist/userListActions.js

@@ -2,7 +2,6 @@ import { Auth, focusPing, getUsers } from '../api/apiClient';
 
 export const PRESENCE_RESPONSE = 'PRESENCE_RESPONSE';
 export const GET_USER_RESPONSE = 'GET_USER_RESPONSE';
-export const USER_FILTER_CHANGE = 'USER_FILTER_CHANGE';
 
 export const sendFocusPing = (auth: Auth, hasFocus: boolean, newUserInput: boolean) =>
   async (dispatch) => {

src/userlist/userListReducers.js

@@ -6,7 +6,6 @@ import {
 import {
   GET_USER_RESPONSE,
   PRESENCE_RESPONSE,
-  USER_FILTER_CHANGE,
 } from './userListActions';
 
 type Presence = {
@@ -31,10 +30,7 @@ type PresenceMap = {
 //   presence: PresenceMap,
 // }
 
-const initialState = fromJS({
-  filter: '',
-  users: [],
-});
+const initialState = fromJS([]);
 
 const activityFromPresence = (presence: PresenceMap): UserStatus =>
   'active';
@@ -46,28 +42,24 @@ const reducer = (state = initialState, action) => {
       Object.keys(action.presence).forEach(x => {
         const status = activityFromPresence(action.presence[x]);
         const user = state.find(u => u.email === x);
-        newState = state.setIn([user, { status }]);
+        newState = state.set({ status });
       });
       return newState;
     }
-    case GET_USER_RESPONSE:
-      return state.merge({
-        users: fromJS(action.users.map(x => ({
-          email: x.email,
-          fullName: x.full_name,
-          avatarUrl: x.avatar_url,
-          isActive: x.is_active,
-          isAdmin: x.is_admin,
-          isBot: x.is_bot,
-        }))),
-      });
+    case GET_USER_RESPONSE: {
+      const users = action.users.map(x => ({
+        email: x.email,
+        fullName: x.full_name,
+        avatarUrl: x.avatar_url,
+        isActive: x.is_active,
+        isAdmin: x.is_admin,
+        isBot: x.is_bot,
+      }));
+      return state.merge(fromJS(users));
+    }
     case EVENT_PRESENCE:
       // TODO
       return state;
-    case USER_FILTER_CHANGE:
-      return state.merge({
-        filter: action.filter,
-      });
     default:
       return state;
   }