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

filter roles that doesn't exists and fix uncategorized listing

Browse source
This commit is contained in:
41666 2019-03-21 09:32:31 -05:00
parent 7e79d65390
commit f2cf88e58f
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ui/stores/roles.js
View file

@ -54,18 +54,18 @@ export const toggleRole = action('toggleRole', (state: ViewState, role: string,
}
})
const getUncategorized = (roleMap: OrderedMap<RenderedRole>, allCategories): RenderedCategory => {
const roles = Set(roleMap.keys())
const knownRoles = Set([...Object.values(allCategories).map((c: any) => c.roles)])
const getUncategorized = (roleMap: OrderedMap<RenderedRole>, allCategories: Set): RenderedCategory => {
const roles = roleMap.keySeq().toSet()
const knownRoles = allCategories.map(v => v.roles).flatMap(v => v)
const rolesLeft = roles.subtract(knownRoles)
// console.log({ roles, knownRoles, rolesLeft })
// console.log(Map({ roles, knownRoles, rolesLeft }).toJS())
return {
id: 'Uncategorized',
name: 'Uncategorized',
position: -1,
roles: rolesLeft,
_roles: OrderedSet(rolesLeft.map(r => roleMap.get(r))).sortBy(v => -(v.position || 0)),
_roles: rolesLeft.map(v => roleMap.get(v)).filter(v => v != null),
hidden: true,
type: 'multi'
}
@ -93,13 +93,14 @@ 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 || 0))
category._roles = OrderedSet(
category.roles.map(r => roleMap.get(r))
).filter(role => role != null).sortBy(role => role ? -(role.position || 0) : 0)
render = render.add(category)
}
// console.log({id})
render = render.add(getUncategorized(roleMap, categories))
render = render.sortBy(h => h.position || 0)
render = render.add(getUncategorized(roleMap, render.toSet()))
render = render.sortBy(h => (h.position) ? h.position : h.name)
dispatch(updateCurrentView({ server: id, categories: render, invalidated: false, selected: Set(current.gm.roles), originalSelected: Set(current.gm.roles) }))
}