Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-21 16:03:03 +01:00
Code Issues Projects Releases Wiki Activity

feat(webui): read progress filter for Series when browsing Libraries

Browse source 
related to #25
This commit is contained in:
Gauthier Roebroeck 2020-06-05 16:56:50 +08:00
parent 885c891267
commit 0c046a767d
5 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
komga-webui/src/components/FilterMenuButton.vue
View file

@ -30,15 +30,16 @@
</v-list-item>
</div>
<v-list-item v-if="filterCustom"
@click="clearAll()"
dense
>
<v-list-item-icon>
<v-icon>mdi-close</v-icon>
</v-list-item-icon>
<v-list-item-title>Clear</v-list-item-title>
</v-list-item>
<template v-if="filterCustom">
<v-divider/>
<v-list-item @click="clearAll()" dense>
<v-list-item-icon>
<v-icon>mdi-close</v-icon>
</v-list-item-icon>
<v-list-item-title>Clear</v-list-item-title>
</v-list-item>
</template>
</v-list>
</v-menu>
</template>

4
komga-webui/src/functions/query-params.ts
View file

@ -10,3 +10,7 @@ export function parseQuerySort (querySort: any, sortOptions: SortOption[]): Sort
}
return customSort
}
export function parseQueryFilter (queryStatus: any, enumeration: any): string[] {
return queryStatus ? queryStatus.toString().split(',').filter((x: string) => Object.keys(enumeration).includes(x)) : []
}

5
komga-webui/src/services/komga-series.service.ts
View file

@ -11,7 +11,7 @@ export default class KomgaSeriesService {
this.http = http
}
async getSeries (libraryId?: number, pageRequest?: PageRequest, search?: string, status?: string[]): Promise<Page<SeriesDto>> {
async getSeries (libraryId?: number, pageRequest?: PageRequest, search?: string, status?: string[], readStatus?: string[]): Promise<Page<SeriesDto>> {
try {
const params = { ...pageRequest } as any
if (libraryId) {
@ -23,6 +23,9 @@ export default class KomgaSeriesService {
if (status) {
params.status = status
}
if (readStatus) {
params.read_status = readStatus
}
return (await this.http.get(API_SERIES, {
params: params,
paramsSerializer: params => qs.stringify(params, { indices: false }),

19
komga-webui/src/views/BrowseLibraries.vue
View file

@ -110,7 +110,8 @@ import LibraryActionsMenu from '@/components/LibraryActionsMenu.vue'
import PageSizeSelect from '@/components/PageSizeSelect.vue'
import SortMenuButton from '@/components/SortMenuButton.vue'
import ToolbarSticky from '@/components/ToolbarSticky.vue'
import { parseQuerySort } from '@/functions/query-params'
import { parseQueryFilter, parseQuerySort } from '@/functions/query-params'
import { ReadStatus } from '@/types/enum-books'
import { SeriesStatus } from '@/types/enum-series'
import Vue from 'vue'
@ -146,8 +147,8 @@ export default Vue.extend({
] as SortOption[],
sortActive: {} as SortActive,
sortDefault: { key: 'metadata.titleSort', order: 'asc' } as SortActive,
filterOptions: [{ name: 'STATUS', values: SeriesStatus }],
filters: [[]] as any[],
filterOptions: [{ name: 'STATUS', values: SeriesStatus }, { name: 'READ STATUS', values: ReadStatus }],
filters: [[], []] as any[],
sortUnwatch: null as any,
filterUnwatch: null as any,
pageUnwatch: null as any,
@ -190,7 +191,8 @@ export default Vue.extend({
// restore from query param
this.sortActive = this.parseQuerySortOrDefault(this.$route.query.sort)
this.filters.splice(0, 1, this.parseQueryFilterStatus(this.$route.query.status))
this.filters.splice(0, 1, parseQueryFilter(this.$route.query.status, SeriesStatus))
this.filters.splice(1, 1, parseQueryFilter(this.$route.query.readStatus, ReadStatus))
if (this.$route.query.page) this.page = Number(this.$route.query.page)
if (this.$route.query.pageSize) this.pageSize = Number(this.$route.query.pageSize)
@ -204,7 +206,8 @@ export default Vue.extend({
// reset
this.sortActive = this.parseQuerySortOrDefault(to.query.sort)
this.filters.splice(0, 1, this.parseQueryFilterStatus(to.query.status))
this.filters.splice(0, 1, parseQueryFilter(to.query.status, SeriesStatus))
this.filters.splice(1, 1, parseQueryFilter(to.query.readStatus, ReadStatus))
this.page = 1
this.totalPages = 1
this.totalElements = null
@ -273,9 +276,6 @@ export default Vue.extend({
parseQuerySortOrDefault (querySort: any): SortActive {
return parseQuerySort(querySort, this.sortOptions) || this.$_.clone(this.sortDefault)
},
parseQueryFilterStatus (queryStatus: any): string[] {
return queryStatus ? queryStatus.toString().split(',').filter((x: string) => Object.keys(SeriesStatus).includes(x)) : []
},
updateRoute () {
this.$router.replace({
name: this.$route.name,
@ -285,6 +285,7 @@ export default Vue.extend({
pageSize: `${this.pageSize}`,
sort: `${this.sortActive.key},${this.sortActive.order}`,
status: `${this.filters[0]}`,
readStatus: `${this.filters[1]}`,
},
}).catch(_ => {
})
@ -303,7 +304,7 @@ export default Vue.extend({
if (libraryId !== 0) {
requestLibraryId = libraryId
}
const seriesPage = await this.$komgaSeries.getSeries(requestLibraryId, pageRequest, undefined, this.filters[0])
const seriesPage = await this.$komgaSeries.getSeries(requestLibraryId, pageRequest, undefined, this.filters[0], this.filters[1])
this.totalPages = seriesPage.totalPages
this.totalElements = seriesPage.totalElements

6
komga-webui/src/views/BrowseSeries.vue
View file

@ -169,7 +169,7 @@ import ItemCard from '@/components/ItemCard.vue'
import PageSizeSelect from '@/components/PageSizeSelect.vue'
import SortMenuButton from '@/components/SortMenuButton.vue'
import ToolbarSticky from '@/components/ToolbarSticky.vue'
import { parseQuerySort } from '@/functions/query-params'
import { parseQueryFilter, parseQuerySort } from '@/functions/query-params'
import { seriesThumbnailUrl } from '@/functions/urls'
import { ReadStatus } from '@/types/enum-books'
import Vue from 'vue'
@ -277,7 +277,7 @@ export default Vue.extend({
// restore from query param
this.sortActive = this.parseQuerySortOrDefault(this.$route.query.sort)
this.filters.splice(0, 1, this.parseQueryFilterStatus(this.$route.query.readStatus))
this.filters.splice(0, 1, parseQueryFilter(this.$route.query.readStatus, ReadStatus))
if (this.$route.query.page) this.page = Number(this.$route.query.page)
if (this.$route.query.pageSize) this.pageSize = Number(this.$route.query.pageSize)
@ -291,7 +291,7 @@ export default Vue.extend({
// reset
this.sortActive = this.parseQuerySortOrDefault(to.query.sort)
this.filters.splice(0, 1, this.parseQueryFilterStatus(to.query.readStatus))
this.filters.splice(0, 1, parseQueryFilter(to.query.readStatus, ReadStatus))
this.page = 1
this.totalPages = 1
this.totalElements = null