Skip to content

Commit

Permalink
Avoid re-sorting abilities and modifiers.
Browse files Browse the repository at this point in the history
  • Loading branch information
Damnae committed Apr 7, 2024
1 parent 3cbe7c7 commit c7b9eca
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/sources/ability.ts
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ export async function getTaskContext(commitId:string, type:TaskContextType) : Pr
}

result = container[type] = context
console.log(`cached ${type} ability context for ${commitId}`)
console.log(`cached ${type} ability context for ${commitId} (${Object.keys(context.Abilities).length}/${Object.keys(context.Modifiers).length}/${Object.keys(context.TaskListTemplates).length})`)
}
return result
})
Expand Down
14 changes: 5 additions & 9 deletions src/views/navigation-main/AbilityNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@
import { ref, computed, inject, Ref, } from 'vue'
import { RouterLink } from 'vue-router';
import NavItem from '@/components/NavItem.vue'
import { Ability, TaskContext, TaskContextType, getTaskContext } from '@/sources/ability';
import { TaskContext, TaskContextType, getTaskContext } from '@/sources/ability';
const commitId = inject<string>('commitId') as string
const search = inject<Ref<string>>('search') as Ref<string>
const taskContext = ref<TaskContext>(await getTaskContext(commitId, TaskContextType.All))
const abilitiesSearchResults = computed(() => allAbilities())
function allAbilities() : Ability[]
{
return Object.values(taskContext.value.Abilities)
.filter(v => v.SearchKeywords.some(k => k.includes(search.value.toLowerCase())))
.sort((a, b) => a.Name > b.Name ? 1 : -1)
}
const sortedAbilities = computed(() => Object.values(taskContext.value.Abilities)
.sort((a, b) => a.Name > b.Name ? 1 : -1))
const abilitiesSearchResults = computed(() => sortedAbilities.value
.filter(v => v.SearchKeywords.some(k => k.includes(search.value.toLowerCase()))))
</script>

<template>
Expand Down
14 changes: 5 additions & 9 deletions src/views/navigation-main/ModifierNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@
import { ref, computed, inject, Ref, } from 'vue'
import { RouterLink } from 'vue-router';
import NavItem from '@/components/NavItem.vue'
import { Modifier, TaskContext, TaskContextType, getTaskContext } from '@/sources/ability';
import { TaskContext, TaskContextType, getTaskContext } from '@/sources/ability';
const commitId = inject<string>('commitId') as string
const search = inject<Ref<string>>('search') as Ref<string>
const taskContext = ref<TaskContext>(await getTaskContext(commitId, TaskContextType.All))
const modifiersSearchResults = computed(() => allModifiers())
function allModifiers() : Modifier[]
{
return Object.values(taskContext.value.Modifiers)
.filter(v => v.Name.toLowerCase().includes(search.value.toLowerCase()))
.sort((a, b) => a.Name > b.Name ? 1 : -1)
}
const sortedModifiers = computed(() => Object.values(taskContext.value.Modifiers)
.sort((a, b) => a.Name > b.Name ? 1 : -1))
const modifiersSearchResults = computed(() => sortedModifiers.value
.filter(v => v.Name.toLowerCase().includes(search.value.toLowerCase())))
</script>

<template>
Expand Down

0 comments on commit c7b9eca

Please sign in to comment.