Use default action type and add status to async actions

Since TypeScript can infer types based on string types, it has became
easier to define a single constant of an action that returns a promise,
and then dispatch actions with different statuses: pending, resolved,
and/or rejected. This seems like more typing at first, but in the long
run it will become easier to write generic reducer methods, and the
names of reduced types will not have to be repeated every time.

For example, previously we had to write:

    type MyActionTypes =
      IAsyncAction<IUser, 'LOGIN_PENDING', 'LOGIN_RESOLVED', 'LOGIN_REJECTED'>
      | ...

And now we can write:

    type MyActionTypes =
      IAsyncAction<IUser, 'LOGIN'>
      | ...

packages/client/src/actions/GetAction.ts

@@ -1,6 +1,6 @@
 import {IAction} from './IAction'
 
 export type GetAction<MyTypes, T extends string> =
-  MyTypes extends IAction<T>
+  MyTypes extends IAction<infer U, T>
   ? MyTypes
   : never

packages/client/src/actions/GetPendingAction.ts

@@ -0,0 +1,6 @@
+import {IAsyncAction} from './IAsyncAction'
+
+export type GetPendingAction<MyTypes, T extends string> =
+  MyTypes extends IAsyncAction<infer U, T> & {status: 'pending'}
+  ? MyTypes
+  : never

packages/client/src/actions/GetResolvedAction.ts

@@ -0,0 +1,6 @@
+import {IAsyncAction} from './IAsyncAction'
+
+export type GetResolvedAction<MyTypes, T extends string> =
+  MyTypes extends IAsyncAction<infer U, T> & {status: 'resolved'}
+  ? MyTypes
+  : never

packages/client/src/actions/IAction.ts

@@ -1,3 +1,4 @@
-export interface IAction<ActionType extends string> {
+export interface IAction<T, ActionType extends string> {
+  payload: T
   type: ActionType
 }

packages/client/src/actions/IAsyncAction.ts

@@ -2,11 +2,9 @@ import {IPendingAction} from './IPendingAction'
 import {IResolvedAction} from './IResolvedAction'
 import {IRejectedAction} from './IRejectedAction'
 
-export type IAsyncAction<T,
+export type IAsyncStatus = 'pending' | 'resolved' | 'rejected'
-  PendingActionType extends string,
+
-  ResolvedActionType extends string,
+export type IAsyncAction<T, ActionType extends string> =
-  RejectedActionType extends string
+  IPendingAction<T, ActionType>
-> =
+  | IResolvedAction<T, ActionType>
-  IPendingAction<T, PendingActionType>
+  | IRejectedAction<ActionType>
-  | IResolvedAction<T, ResolvedActionType>
-  | IRejectedAction<RejectedActionType>

packages/client/src/actions/IPendingAction.ts

@@ -1,6 +1,6 @@
 import {IAction} from './IAction'
 
 export interface IPendingAction<T, ActionType extends string> extends
-  IAction<ActionType> {
+  IAction<Promise<T>, ActionType> {
-  payload: Promise<T>
+  status: 'pending'
 }

packages/client/src/actions/IRejectedAction.ts

@@ -1,6 +1,6 @@
 import {IAction} from './IAction'
 
 export interface IRejectedAction<ActionType extends string> extends
-  IAction<ActionType> {
+  IAction<Error, ActionType> {
-  error: Error
+  status: 'rejected'
 }

packages/client/src/actions/IResolvedAction.ts

@@ -1,6 +1,7 @@
 import {IAction} from './IAction'
 
 export interface IResolvedAction<T, ActionType extends string> extends
-  IAction<ActionType> {
+  IAction<T, ActionType> {
   payload: T
+  status: 'resolved'
 }

packages/client/src/actions/PendingAction.ts

@@ -0,0 +1,9 @@
+import {IPendingAction} from './IPendingAction'
+
+export class PendingAction<T, ActionType extends string> {
+  readonly status = 'pending'
+  constructor(
+    readonly payload: T,
+    readonly type: ActionType,
+  ) {}
+}

packages/client/src/actions/index.ts

@@ -1,6 +1,9 @@
 export * from './GetAction'
+export * from './GetResolvedAction'
+export * from './GetPendingAction'
 export * from './IAction'
 export * from './IAsyncAction'
 export * from './IPendingAction'
 export * from './IRejectedAction'
 export * from './IResolvedAction'
+export * from './PendingAction'

packages/client/src/crud/CRUDReducer.ts

@@ -48,37 +48,31 @@ export class CRUDReducer<T extends ICRUDIdable> {
     readonly resolvedExtension = '_RESOLVED',
     readonly rejectedExtension = '_REJECTED',
   ) {
+
+    const defaultMethodStatus = this.getDefaultMethodStatus()
     this.defaultState = {
       ids: [],
       byId: {},
 
       status: {
-        post: {
+        post: defaultMethodStatus,
-          error: '',
+        put: defaultMethodStatus,
-          isLoading: false,
+        delete: defaultMethodStatus,
-        },
+        get: defaultMethodStatus,
-        put: {
+        getMany: defaultMethodStatus,
-          error: '',
-          isLoading: false,
-        },
-        delete: {
-          error: '',
-          isLoading: false,
-        },
-        get: {
-          error: '',
-          isLoading: false,
-        },
-        getMany: {
-          error: '',
-          isLoading: false,
-        },
       },
     }
 
     this.actionTypes = this.getActionTypes()
   }
 
+  getDefaultMethodStatus(): ICRUDMethodStatus {
+    return {
+      error: '',
+      isLoading: false,
+    }
+  }
+
   protected getPromiseActionNames(type: string) {
     return {
       pending: type + this.pendingExtension,

packages/client/src/crumbs/CrumbsActions.ts

@@ -1,4 +1,4 @@
-import {GetAction, IResolvedAction} from '../actions'
+import {GetAction, IAction} from '../actions'
 
 export interface ICrumbLink {
   name: string
@@ -11,7 +11,7 @@ export interface ICrumbs {
 }
 
 export type CrumbsActionType =
-  IResolvedAction<ICrumbs, 'BREADCRUMBS_SET'>
+  IAction<ICrumbs, 'BREADCRUMBS_SET'>
 
 type Action<T extends string> = GetAction<CrumbsActionType, T>
 

packages/client/src/login/LoginActions.ts

@@ -1,68 +1,43 @@
-import {GetAction, IAsyncAction, IResolvedAction} from '../actions'
+import {GetAction, IAsyncAction, IAction, PendingAction} from '../actions'
 import {IAPIDef, ICredentials, INewUser, IUser} from '@rondo/common'
 import {IHTTPClient} from '../http/IHTTPClient'
 
-export enum LoginActionKeys {
-  LOGIN = 'LOGIN',
-  LOGIN_PENDING = 'LOGIN_PENDING',
-  LOGIN_REJECTED = 'LOGIN_REJECTED',
-
-  LOGIN_LOG_OUT = 'LOGIN_LOG_OUT',
-  LOGIN_LOG_OUT_PENDING = 'LOGIN_LOG_OUT_PENDING',
-  LOGIN_LOG_OUT_REJECTED = 'LOGIN_LOG_OUT_REJECTED',
-
-  LOGIN_REGISTER = 'LOGIN_REGISTER',
-  LOGIN_REGISTER_PENDING = 'LOGIN_REGISTER_PENDING',
-  LOGIN_REGISTER_REJECTED = 'LOGIN_REGISTER_REJECTED',
-
-  LOGIN_REDIRECT_SET = 'LOGIN_REDIRECT_SET',
-}
-
 export type LoginActionType =
-  IAsyncAction<IUser,
+  IAsyncAction<IUser, 'LOGIN'>
-    'LOGIN_PENDING',
+  | IAsyncAction<unknown, 'LOGIN_LOGOUT'>
-    'LOGIN_RESOLVED',
+  | IAsyncAction<IUser, 'LOGIN_REGISTER'>
-    'LOGIN_REJECTED'>
+  | IAction<{redirectTo: string}, 'LOGIN_REDIRECT_SET'>
-  | IAsyncAction<unknown,
-  'LOGIN_LOGOUT_PENDING',
-  'LOGIN_LOGOUT_RESOLVED',
-  'LOGIN_LOGOUT_REJECTED'>
-  | IAsyncAction<IUser,
-  'LOGIN_REGISTER_PENDING',
-  'LOGIN_REGISTER_RESOLVED',
-  'LOGIN_REGISTER_REJECTED'>
-  | IResolvedAction<{redirectTo: string}, 'LOGIN_REDIRECT_SET'>
 
 type Action<T extends string> = GetAction<LoginActionType, T>
 
 export class LoginActions {
   constructor(protected readonly http: IHTTPClient<IAPIDef>) {}
 
-  logIn = (credentials: ICredentials): Action<'LOGIN_PENDING'> => {
+  logIn = (credentials: ICredentials) => {
-    return {
+    return new PendingAction(
-      payload: this.http.post('/auth/login', credentials),
+      this.http.post('/auth/login', credentials),
-      type: 'LOGIN_PENDING',
+      'LOGIN',
-    }
+    )
   }
 
-  logOut = (): Action<'LOGIN_LOGOUT_PENDING'> => {
+  logOut = () => {
-    return {
+    return new PendingAction(
-      payload: this.http.get('/auth/logout'),
+      this.http.get('/auth/logout'),
-      type: 'LOGIN_LOGOUT_PENDING',
+      'LOGIN_LOGOUT',
-    }
+    )
   }
 
-  register = (profile: INewUser): Action<'LOGIN_REGISTER_PENDING'> => {
+  register = (profile: INewUser) => {
-    return {
+    return new PendingAction(
-      payload: this.http.post('/auth/register', profile),
+      this.http.post('/auth/register', profile),
-      type: 'LOGIN_REGISTER_PENDING',
+      'LOGIN_REGISTER',
-    }
+    )
   }
 
   setRedirectTo = (redirectTo: string): Action<'LOGIN_REDIRECT_SET'> => {
     return {
       payload: {redirectTo},
-      type: LoginActionKeys.LOGIN_REDIRECT_SET,
+      type: 'LOGIN_REDIRECT_SET',
     }
   }
 }

packages/client/src/login/LoginReducer.ts

@@ -2,13 +2,15 @@ import {IUser} from '@rondo/common'
 import {LoginActionType} from './LoginActions'
 
 export interface ILoginState {
-  readonly error?: string
+  readonly error: string
+  readonly isLoading: boolean
   readonly user?: IUser
   readonly redirectTo: string
 }
 
 const defaultState: ILoginState = {
-  error: undefined,
+  error: '',
+  isLoading: false,
   user: undefined,
   redirectTo: '/',
 }
@@ -18,19 +20,33 @@ export function Login(
   action: LoginActionType,
 ): ILoginState {
   switch (action.type) {
-    case 'LOGIN_RESOLVED':
+    // sync actions
-      return {...state, user: action.payload, error: ''}
-    case 'LOGIN_LOGOUT_RESOLVED':
-      return {...state, user: undefined}
-    case 'LOGIN_REJECTED':
-      return {...state, error: action.error.message}
-    case 'LOGIN_REGISTER_RESOLVED':
-      return {...state, user: action.payload, error: ''}
-    case 'LOGIN_REGISTER_REJECTED':
-      return {...state, error: action.error.message}
     case 'LOGIN_REDIRECT_SET':
       return {...state, redirectTo: action.payload.redirectTo}
     default:
+      // async actions
+      switch (action.status) {
+        case 'pending':
+          return {
+            ...state,
+            isLoading: true,
+          }
+        case 'rejected':
+          return {
+            ...state,
+            isLoading: false,
+            error: action.payload.message,
+          }
+        case 'resolved':
+          switch (action.type) {
+            case 'LOGIN':
+              return {...state, user: action.payload, error: ''}
+            case 'LOGIN_LOGOUT':
+              return {...state, user: undefined}
+            case 'LOGIN_REGISTER':
+              return {...state, user: action.payload, error: ''}
+          }
+      }
       return state
   }
 }

packages/client/src/middleware/PromiseMiddleware.test.ts

@@ -4,13 +4,6 @@ import {getError} from '../test-utils'
 
 describe('PromiseMiddleware', () => {
 
-  describe('constructor', () => {
-    it('throws an error when action types are the same', () => {
-      expect(() => new PromiseMiddleware('a', 'a', 'a')).toThrowError()
-      expect(new PromiseMiddleware('a', 'b', 'c')).toBeTruthy()
-    })
-  })
-
   let store!: Store
   beforeEach(() => {
     const middleware = new PromiseMiddleware()
@@ -22,8 +15,11 @@ describe('PromiseMiddleware', () => {
 
   it('does nothing when payload is not a promise', () => {
     const action = {type: 'test'}
-    store.dispatch(action)
+    const result = store.dispatch(action)
-    expect(store.getState().slice(1)).toEqual([action])
+    expect(result).toBe(action)
+    expect(store.getState().slice(1)).toEqual([{
+      type: action.type,
+    }])
   })
 
   it('dispatches pending and resolved action', async () => {
@@ -31,16 +27,21 @@ describe('PromiseMiddleware', () => {
     const type = 'TEST'
     const action = {
       payload: Promise.resolve(value),
-      type: `${type}_PENDING`,
+      type,
     }
     const result = store.dispatch(action)
-    expect(result).toBe(action)
+    expect(result).toEqual({
+      ...action,
+      status: 'pending',
+    })
     await result.payload
     expect(store.getState().slice(1)).toEqual([{
       ...action,
+      status: 'pending',
     }, {
       payload: value,
-      type: type + '_RESOLVED',
+      status: 'resolved',
+      type,
     }])
   })
 
@@ -49,17 +50,23 @@ describe('PromiseMiddleware', () => {
     const type = 'TEST'
     const action = {
       payload: Promise.reject(error),
-      type: `${type}_PENDING`,
+      type,
     }
     const result = store.dispatch(action)
-    expect(result).toBe(action)
+    expect(result).toEqual({
+      ...action,
+      status: 'pending',
+    })
     const err = await getError(result.payload)
     expect(err).toBe(error)
     expect(store.getState().slice(1)).toEqual([{
-      ...action,
+      payload: action.payload,
+      status: 'pending',
+      type,
     }, {
       error,
-      type: `${type}_REJECTED`,
+      status: 'rejected',
+      type,
     }])
   })
 

packages/client/src/middleware/PromiseMiddleware.ts

@@ -20,45 +20,34 @@ function isPromise(value: any): value is Promise<any> {
  *     const middleware = applyMiddleware(new PromiseMiddleware().handle)
  */
 export class PromiseMiddleware {
-  protected regexp: RegExp
-
-  constructor(
-    readonly pendingExtension = '_PENDING',
-    readonly resolvedExtension = '_RESOLVED',
-    readonly rejectedExtension = '_REJECTED',
-  ) {
-    assert(
-      this.pendingExtension !== this.resolvedExtension &&
-      this.resolvedExtension !== this.rejectedExtension &&
-      this.pendingExtension !== this.rejectedExtension,
-      'Pending, resolved and rejected extensions must be unique')
-
-    this.regexp = new RegExp(pendingExtension + '$')
-  }
   handle: Middleware = store => next => (action: AnyAction) => {
     const {payload, type} = action
-    // Propagate this action. Only attach listeners to the promise.
-    next(action)
     if (!isPromise(payload)) {
-      return
+      return next(action)
     }
-
+    const pendingAction = {
-    const strippedType = type.replace(this.regexp, '')
+      ...action,
+      status: 'pending',
+    }
+    // Propagate this action. Only attach listeners to the promise.
+    next(pendingAction)
 
     payload
     .then(result => {
       store.dispatch({
         payload: result,
-        type: strippedType + this.resolvedExtension,
+        status: 'resolved',
+        type,
       })
     })
     .catch(err => {
       store.dispatch({
         error: err,
-        type: strippedType + this.rejectedExtension,
+        status: 'rejected',
+        type,
       })
     })
 
-    return action
+    return pendingAction
   }
 }

packages/client/src/team/TeamActions.ts

@@ -1,74 +1,44 @@
 import {IAPIDef} from '@rondo/common'
-import {GetAction, IAsyncAction} from '../actions'
+import {GetPendingAction, IAsyncAction, PendingAction} from '../actions'
 import {IHTTPClient} from '../http/IHTTPClient'
 import {ITeam, IUser, IUserInTeam} from '@rondo/common'
 
 export type TeamActionType =
-  IAsyncAction<ITeam[],
+  IAsyncAction<ITeam[], 'TEAMS'>
-  'TEAMS_PENDING',
+  | IAsyncAction<ITeam, 'TEAM_CREATE'>
-  'TEAMS_RESOLVED',
+  | IAsyncAction<ITeam, 'TEAM_UPDATE'>
-  'TEAMS_REJECTED'>
+  | IAsyncAction<{id: number}, 'TEAM_REMOVE'>
-  | IAsyncAction<ITeam,
+  | IAsyncAction<IUserInTeam, 'TEAM_USER_ADD'>
-  'TEAM_CREATE_PENDING',
+  | IAsyncAction<{userId: number, teamId: number}, 'TEAM_USER_REMOVE'>
-  'TEAM_CREATE_RESOLVED',
+  | IAsyncAction<{teamId: number, usersInTeam: IUserInTeam[]}, 'TEAM_USERS'>
-  'TEAM_CREATE_REJECTED'>
+  | IAsyncAction<IUser | undefined, 'TEAM_USER_FIND'>
-  | IAsyncAction<ITeam,
-  'TEAM_UPDATE_PENDING',
-  'TEAM_UPDATE_RESOLVED',
-  'TEAM_UPDATE_REJECTED'>
-  | IAsyncAction<{id: number},
-  'TEAM_REMOVE_PENDING',
-  'TEAM_REMOVE_RESOLVED',
-  'TEAM_REMOVE_REJECTED'>
-  | IAsyncAction<IUserInTeam,
-  'TEAM_USER_ADD_PENDING',
-  'TEAM_USER_ADD_RESOLVED',
-  'TEAM_USER_ADD_REJECTED'>
-  | IAsyncAction<{userId: number, teamId: number},
-  'TEAM_USER_REMOVE_PENDING',
-  'TEAM_USER_REMOVE_RESOLVED',
-  'TEAM_USER_REMOVE_REJECTED'>
-  | IAsyncAction<{teamId: number, usersInTeam: IUserInTeam[]},
-  'TEAM_USERS_PENDING',
-  'TEAM_USERS_RESOLVED',
-  'TEAM_USERS_REJECTED'>
-  | IAsyncAction<IUser | undefined,
-  'TEAM_USER_FIND_PENDING',
-  'TEAM_USER_FIND_RESOLVED',
-  'TEAM_USER_FIND_REJECTED'>
 
-type Action<T extends string> = GetAction<TeamActionType, T>
+type Action<T extends string> = GetPendingAction<TeamActionType, T>
 
 export class TeamActions {
   constructor(protected readonly http: IHTTPClient<IAPIDef>) {}
 
-  fetchMyTeams = (): Action<'TEAMS_PENDING'> => {
+  fetchMyTeams = (): Action<'TEAMS'> => {
-    return {
+    return new PendingAction(this.http.get('/my/teams'), 'TEAMS')
-      payload: this.http.get('/my/teams'),
-      type: 'TEAMS_PENDING',
-    }
   }
 
-  createTeam = (team: {name: string}): Action<'TEAM_CREATE_PENDING'> => {
+  createTeam = (team: {name: string}): Action<'TEAM_CREATE'> => {
-    return {
+    return new PendingAction(this.http.post('/teams', team), 'TEAM_CREATE')
-      payload: this.http.post('/teams', team),
-      type: 'TEAM_CREATE_PENDING',
-    }
   }
 
   updateTeam = ({id, name}: {id: number, name: string})
-  : Action<'TEAM_UPDATE_PENDING'> => {
+  : Action<'TEAM_UPDATE'> => {
-    return {
+    return new PendingAction(
-      payload: this.http.put('/teams/:id', {name}, {id}),
+      this.http.put('/teams/:id', {name}, {id}),
-      type: 'TEAM_UPDATE_PENDING',
+      'TEAM_UPDATE',
-    }
+    )
   }
 
-  removeTeam = ({id}: {id: number}): Action<'TEAM_REMOVE_PENDING'> => {
+  removeTeam = ({id}: {id: number}): Action<'TEAM_REMOVE'> => {
-    return {
+    return new PendingAction(
-      payload: this.http.delete('/teams/:id', {}, {id}),
+      this.http.delete('/teams/:id', {}, {id}),
-      type: 'TEAM_REMOVE_PENDING',
+      'TEAM_REMOVE',
-    }
+    )
   }
 
   addUser(
@@ -77,14 +47,14 @@ export class TeamActions {
       teamId: number,
       roleId: number,
     })
-  : Action<'TEAM_USER_ADD_PENDING'> {
+  : Action<'TEAM_USER_ADD'> {
-    return {
+    return new PendingAction(
-      payload: this.http.post('/teams/:teamId/users/:userId', {}, {
+      this.http.post('/teams/:teamId/users/:userId', {}, {
         userId,
         teamId,
       }),
-      type: 'TEAM_USER_ADD_PENDING',
+      'TEAM_USER_ADD',
-    }
+    )
   }
 
   removeUser = (
@@ -92,33 +62,31 @@ export class TeamActions {
       userId: number,
       teamId: number,
     })
-  : Action<'TEAM_USER_REMOVE_PENDING'> => {
+  : Action<'TEAM_USER_REMOVE'> => {
-    return {
+    return new PendingAction(
-      payload: this.http.delete('/teams/:teamId/users/:userId', {}, {
+      this.http.delete('/teams/:teamId/users/:userId', {}, {
         userId,
         teamId,
       }),
-      type: 'TEAM_USER_REMOVE_PENDING',
+      'TEAM_USER_REMOVE',
-    }
+    )
   }
 
   fetchUsersInTeam = ({teamId}: {teamId: number})
-  : Action<'TEAM_USERS_PENDING'> => {
+  : Action<'TEAM_USERS'> => {
-    return {
+    return new PendingAction(
-      payload: this.http.get('/teams/:teamId/users', {}, {
+      this.http.get('/teams/:teamId/users', {}, {
         teamId,
       })
       .then(usersInTeam => ({teamId, usersInTeam})),
-      type: 'TEAM_USERS_PENDING',
+       'TEAM_USERS',
-    }
+    )
   }
 
-  findUserByEmail = (email: string): Action<'TEAM_USER_FIND_PENDING'> => {
+  findUserByEmail = (email: string): Action<'TEAM_USER_FIND'> => {
-    return {
+    return new PendingAction(
-      payload: this.http.get('/users/emails/:email', {}, {
+      this.http.get('/users/emails/:email', {}, {email}),
-        email,
+      'TEAM_USER_FIND',
-      }),
+    )
-      type: 'TEAM_USER_FIND_PENDING',
-    }
   }
 }

packages/client/src/team/TeamReducer.ts

@@ -2,7 +2,7 @@ import {
   ITeam, IUserInTeam, ReadonlyRecord, indexBy, without,
 } from '@rondo/common'
 import {TeamActionType} from './TeamActions'
-import {GetAction} from '../actions'
+import {GetResolvedAction} from '../actions'
 
 export interface ITeamState {
   readonly error: string
@@ -26,7 +26,7 @@ const defaultState: ITeamState = {
 
 function removeUser(
   state: ITeamState,
-  action: GetAction<TeamActionType, 'TEAM_USER_REMOVE_RESOLVED'>,
+  action: GetResolvedAction<TeamActionType, 'TEAM_USER_REMOVE'>,
 ) {
 
   const {payload} = action
@@ -53,15 +53,24 @@ function getUserKey(userInTeam: {userId: number, teamId: number}) {
 }
 
 export function Team(state = defaultState, action: TeamActionType): ITeamState {
+  switch (action.status) {
+    case 'pending':
+      return state
+    case 'rejected':
+      return {
+        ...state,
+        error: action.payload.message,
+      }
+    case 'resolved':
       switch (action.type) {
-    case 'TEAMS_RESOLVED':
+        case 'TEAMS':
           return {
             ...state,
             teamIds: action.payload.map(team => team.id),
             teamsById: indexBy(action.payload, 'id'),
           }
-    case 'TEAM_CREATE_RESOLVED':
+        case 'TEAM_CREATE':
-    case 'TEAM_UPDATE_RESOLVED':
+        case 'TEAM_UPDATE':
           return {
             ...state,
             teamIds: state.teamIds.indexOf(action.payload.id) >= 0
@@ -72,7 +81,7 @@ export function Team(state = defaultState, action: TeamActionType): ITeamState {
               [action.payload.id]: action.payload,
             },
           }
-    case 'TEAM_USER_ADD_RESOLVED':
+        case 'TEAM_USER_ADD':
           return {
             ...state,
             userKeysByTeamId: {
@@ -87,9 +96,9 @@ export function Team(state = defaultState, action: TeamActionType): ITeamState {
               [getUserKey(action.payload)]: action.payload,
             },
           }
-    case 'TEAM_USER_REMOVE_RESOLVED':
+        case 'TEAM_USER_REMOVE':
           return removeUser(state, action)
-    case 'TEAM_USERS_RESOLVED':
+        case 'TEAM_USERS':
           const usersByKey = action.payload.usersInTeam
           .reduce((obj, userInTeam) => {
             obj[getUserKey(userInTeam)] = userInTeam
@@ -108,20 +117,14 @@ export function Team(state = defaultState, action: TeamActionType): ITeamState {
               ...usersByKey,
             },
           }
-    case 'TEAM_REMOVE_RESOLVED':
+        case 'TEAM_REMOVE':
           return {
             ...state,
             teamIds: state.teamIds.filter(id => id !== action.payload.id),
             teamsById: without(state.teamsById, action.payload.id),
           }
-    case 'TEAM_CREATE_REJECTED':
+        default:
-    case 'TEAM_UPDATE_REJECTED':
+          return state
-    case 'TEAM_USER_ADD_REJECTED':
-    case 'TEAM_USER_REMOVE_REJECTED':
-    case 'TEAM_USERS_REJECTED':
-      return {
-        ...state,
-        error: action.error.message,
       }
     default:
       return state