diff --git a/ui/components/role/index.js b/ui/components/role/index.js index 196f9ad..8ba78c5 100644 --- a/ui/components/role/index.js +++ b/ui/components/role/index.js @@ -68,12 +68,10 @@ export default class Role extends React.Component { active={this.props.active} disabled={this.props.disabled} onClick={this.onToggle} - onMouseOver={this.onMouseOver} - onMouseOut={this.onMouseOut} onTouchStart={this.onMouseOver} onTouchEnd={this.onMouseOut} colors={roleColors} - // title={(this.props.disabled) ? 'This role is disabled for safety.' : null} + title={(this.props.disabled) ? 'This role has unsafe permissions.' : null} > {this.props.role.name} { (this.props.disabled && this.state.hovering) && This role has unsafe permissions. } diff --git a/ui/stores/roles.js b/ui/stores/roles.js index 4e49cd5..f493bdc 100644 --- a/ui/stores/roles.js +++ b/ui/stores/roles.js @@ -65,7 +65,7 @@ const getUncategorized = (roleMap: OrderedMap, allCategories): Ren name: 'Uncategorized', position: -1, roles: rolesLeft, - _roles: OrderedSet(rolesLeft.map(r => roleMap.get(r))).sortBy(v => -v.position), + _roles: OrderedSet(rolesLeft.map(r => roleMap.get(r))).sortBy(v => -(v.position || 0)), hidden: true, type: 'multi' } @@ -93,7 +93,7 @@ export const renderRoles = (id: string) => (dispatch: *, getState: *) => { let render = OrderedSet() for (let catId in categories) { const category = categories[catId] - category._roles = OrderedSet(category.roles.map(r => roleMap.get(r))).sortBy(v => -v.position) + category._roles = OrderedSet(category.roles.map(r => roleMap.get(r))).sortBy(v => -(v.position || 0)) render = render.add(category) } // console.log({id})