Make user.more.roles to be immutable

Caused blocking error in SettingsPage
Lokiedu · Nov 13, 2016 · c5f3854 · c5f3854
1 parent a22b14b
commit c5f3854
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/pages/settings.js b/src/pages/settings.js
@@ -121,7 +121,7 @@ class SettingsPage extends React.Component {
       return false;
     }
 
-    const roles = (current_user.getIn(['user', 'more', 'roles']) || i.List()).toJS();
+    const roles = current_user.getIn(['user', 'more', 'roles'], i.List()).toJS();
 
     const client = new ApiClient(API_HOST);
     const triggers = new ActionsTrigger(client, this.props.dispatch);

diff --git a/src/store/users.js b/src/store/users.js
@@ -60,7 +60,7 @@ export default function reducer(state = initialState, action) {
 
       if (action.user) {
         if (action.user.more && action.user.more.roles) {
-          state = state.setIn([action.user.id, 'more', 'roles'], action.user.more.roles);
+          state = state.setIn([action.user.id, 'more', 'roles'], i.fromJS(action.user.more.roles));
         }
       }