feat(webui): show in progress books as unread

closes #526
This commit is contained in:
Gauthier Roebroeck 2021-05-05 14:53:42 +08:00
parent 36c132b07d
commit db955447f9
2 changed files with 14 additions and 4 deletions

View file

@ -1,3 +1,5 @@
import {without} from 'lodash'
export enum ReadingDirection {
LEFT_TO_RIGHT = 'LEFT_TO_RIGHT',
RIGHT_TO_LEFT = 'RIGHT_TO_LEFT',
@ -16,7 +18,15 @@ export enum MediaStatus {
export enum ReadStatus {
UNREAD = 'UNREAD',
IN_PROGRESS = 'IN_PROGRESS',
READ = 'READ'
READ = 'READ',
UNREAD_AND_IN_PROGRESS = 'UNREAD_AND_IN_PROGRESS'
}
export function replaceCompositeReadStatus(list: string[]): string[] {
if(list.includes(ReadStatus.UNREAD_AND_IN_PROGRESS)){
return [...without(list, ReadStatus.UNREAD_AND_IN_PROGRESS), ReadStatus.UNREAD, ReadStatus.IN_PROGRESS]
}
else return list
}
export enum CopyMode {

View file

@ -372,7 +372,7 @@ import SeriesActionsMenu from '@/components/menus/SeriesActionsMenu.vue'
import PageSizeSelect from '@/components/PageSizeSelect.vue'
import {parseQueryParamAndFilter, parseQuerySort} from '@/functions/query-params'
import {seriesFileUrl, seriesThumbnailUrl} from '@/functions/urls'
import {ReadStatus} from '@/types/enum-books'
import {ReadStatus, replaceCompositeReadStatus} from '@/types/enum-books'
import {BOOK_CHANGED, LIBRARY_DELETED, READLIST_CHANGED, SERIES_CHANGED} from '@/types/events'
import Vue from 'vue'
import {Location} from 'vue-router'
@ -447,7 +447,7 @@ export default Vue.extend({
},
filterOptionsList(): FiltersOptions {
return {
readStatus: {values: [{name: this.$t('filter.unread').toString(), value: ReadStatus.UNREAD}]},
readStatus: {values: [{name: this.$t('filter.unread').toString(), value: ReadStatus.UNREAD_AND_IN_PROGRESS}]},
} as FiltersOptions
},
filterOptionsPanel(): FiltersOptions {
@ -667,7 +667,7 @@ export default Vue.extend({
}))
})
const booksPage = await this.$komgaSeries.getBooks(seriesId, pageRequest, this.filters.readStatus, this.filters.tag, authorsFilter)
const booksPage = await this.$komgaSeries.getBooks(seriesId, pageRequest, replaceCompositeReadStatus(this.filters.readStatus), this.filters.tag, authorsFilter)
this.totalPages = booksPage.totalPages
this.totalElements = booksPage.totalElements