Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"cSpell.words": [
"dompurify",
"gamesystem",
"icontains",
"imagekit",
"magicitems",
"medior",
Expand All @@ -15,4 +16,4 @@
"togglebuttons",
"vueuse"
]
}
}
7 changes: 3 additions & 4 deletions app/components/form/Bestiary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const selectedDocuments = ref<string[]>(props.preSelectedDocuments)

const queryFilters = ref<Open5eFilters>({
page: 0,
search: debouncedSearch.value,
name__icontains: debouncedSearch.value,
cr: typeof cr.value === 'string' ? undefined : cr.value,
ordering: sortBy.value,
document__key__in: selectedDocuments.value.join(','),
Expand All @@ -36,7 +36,7 @@ const queryFilters = ref<Open5eFilters>({
watch([debouncedSearch, cr, sortBy], () => {
queryFilters.value = {
page: 0,
search: debouncedSearch.value,
name__icontains: debouncedSearch.value,
cr: typeof cr.value === 'string' ? undefined : cr.value,
ordering: sortBy.value,
document__key__in: selectedDocuments.value.join(','),
Expand All @@ -46,7 +46,7 @@ watch([debouncedSearch, cr, sortBy], () => {
watch(selectedDocuments, () => {
queryFilters.value = {
page: 0,
search: '',
name__icontains: '',
cr: typeof cr.value === 'string' ? undefined : cr.value,
ordering: sortBy.value,
document__key__in: selectedDocuments.value.join(','),
Expand Down Expand Up @@ -95,7 +95,6 @@ async function addMonster(monster: DndMonster): Promise<void> {
v-model="search"
name="search"
type="search"
:disabled="isLoading"
/>
<UiInputGroupAddon align="inline-end">
<Icon
Expand Down
8 changes: 4 additions & 4 deletions app/components/templates/DnDContentSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ const selectedDocuments = ref<string[]>(props.preSelectedDocuments)

const queryFilters = ref<Open5eFilters>({
page: 0,
search: debouncedSearch.value,
name__icontains: debouncedSearch.value,
ordering: sortBy.value,
document__key__in: selectedDocuments.value.join(','),
})

watch([debouncedSearch, sortBy], () => {
queryFilters.value = {
page: 0,
search: debouncedSearch.value,
name__icontains: debouncedSearch.value,
ordering: sortBy.value,
document__key__in: selectedDocuments.value.join(','),
}
Expand All @@ -50,7 +50,7 @@ watch([debouncedSearch, sortBy], () => {
watch([type, selectedDocuments], () => {
queryFilters.value = {
page: 0,
search: '',
name__icontains: '',
ordering: 'name',
document__key__in: selectedDocuments.value.join(','),
}
Expand Down Expand Up @@ -112,7 +112,7 @@ async function removePins(): Promise<void> {
id="search"
v-model="search"
data-test-search
:disabled="showPinned || isLoading"
:disabled="showPinned"
name="search"
type="search"
/>
Expand Down
2 changes: 1 addition & 1 deletion shared/types/open5e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type Open5eSortBy
export interface Open5eFilters {
page: number
limit?: number
search?: string
name__icontains?: string
cr?: number
ordering?: Open5eSortBy
document__key__in?: string
Expand Down