From c5f385478decc966f2086fb5858607781e06b4ae Mon Sep 17 00:00:00 2001 From: Oopscurity Date: Fri, 4 Nov 2016 00:16:42 +0300 Subject: [PATCH] Make user.more.roles to be immutable Caused blocking error in SettingsPage --- src/pages/settings.js | 2 +- src/store/users.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/settings.js b/src/pages/settings.js index e36d9683..6b5dd0fc 100644 --- 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 index f6983cf3..ba395214 100644 --- 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)); } }