sync

UI/src/reducers/role-picker.js

@@ -2,17 +2,17 @@ import { Map, OrderedMap } from 'immutable'
 
 const initialState = Map({
   hidden: true, // should the view be hidden?
-  emptyRoles: true, // helps derender roles so there's no visible element state change
+  // emptyRoles: true, // helps derender roles so there's no visible element state change
   viewMap: OrderedMap({}), // roles in categories
-  originalRolesSelected: Map({}), // Map<role id, bool> -- original roles for diffing against selected 
+  originalRolesSelected: Map({}), // Map<role id, bool> -- original roles for diffing against selected
   rolesSelected: Map({}) // Map<role id, bool> -- new roles for diffing
 })
 
 export default (state = initialState, { type, data }) => {
   switch (type) {
     case Symbol.for('setup role picker'):
-      return state.mergeDeep(data)
- 
+      return Map(data)
+
     case Symbol.for('hide role picker ui'):
       return {
         ...state,
@@ -27,9 +27,9 @@ export default (state = initialState, { type, data }) => {
 
     case Symbol.for('update selected roles'):
       return state.setIn(['rolesSelected', data.id], data.state)
-      
-    case Symbol.for('zero role picker'):
-      return initialState
+
+    // case Symbol.for('zero role picker'):
+      // return initialState
 
     default:
       return state

UI/src/reducers/servers.js

@@ -14,6 +14,7 @@ const blankServer = Map({
     icon: '4fa0c1063649a739f3fe1a0589aa2c03'
   },
   roles: Set([]),
+  categories: OrderedMap(),
   perms: {
     isAdmin: true,
     canManageRoles: true