roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-04-25 12:19:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sort roles and fix empty name styling

Browse source
This commit is contained in:
41666 2019-03-21 09:39:28 -05:00
parent de37215850
commit 309b02c6f6
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/components/role/index.js
View file

@ -64,6 +64,8 @@ export default class Role extends React.Component<RoleProps, RoleState> {
base: Color(color).hsl().string()
}
const name = (this.props.role.name !== '') ? this.props.role.name : <>&nbsp;</>
return <RoleStyled
active={this.props.active}
disabled={this.props.disabled}
@ -73,7 +75,7 @@ export default class Role extends React.Component<RoleProps, RoleState> {
colors={roleColors}
title={(this.props.disabled) ? 'This role has unsafe permissions.' : null}
>
{this.props.role.name}
{name}
{ (this.props.disabled && this.state.hovering) && <Tooltip>This role has unsafe permissions.</Tooltip> }
</RoleStyled>
}

2
ui/stores/roles.js
View file

@ -65,7 +65,7 @@ const getUncategorized = (roleMap: OrderedMap<RenderedRole>, allCategories: Set)
name: 'Uncategorized',
position: -1,
roles: rolesLeft,
_roles: rolesLeft.map(v => roleMap.get(v)).filter(v => v != null),
_roles: rolesLeft.map(v => roleMap.get(v)).filter(v => v != null).sortBy(v => -v.position),
hidden: true,
type: 'multi'
}