diff --git a/komga-webui/src/types/enum-books.ts b/komga-webui/src/types/enum-books.ts index b509c53a1..a826d210d 100644 --- a/komga-webui/src/types/enum-books.ts +++ b/komga-webui/src/types/enum-books.ts @@ -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 { diff --git a/komga-webui/src/views/BrowseSeries.vue b/komga-webui/src/views/BrowseSeries.vue index 027adc8f0..bedf7fd4b 100644 --- a/komga-webui/src/views/BrowseSeries.vue +++ b/komga-webui/src/views/BrowseSeries.vue @@ -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