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

feat(webui): add media status condition in books view filters

Browse source
This commit is contained in:
Gauthier Roebroeck 2025-02-20 18:04:35 +08:00
parent 1b8fa45ef2
commit 9563310c71
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
komga-webui/src/locales/en.json
View file

@ -839,6 +839,7 @@
"language": "language", "language": "language",
"library": "library", "library": "library",
"media_profile": "Media profile", "media_profile": "Media profile",
"media_status": "Media status",
"oneshot": "One-shot", "oneshot": "One-shot",
"publisher": "publisher", "publisher": "publisher",
"read": "Read", "read": "Read",

18
komga-webui/src/views/BrowseBooks.vue
View file

@ -124,7 +124,7 @@ import LibraryNavigation from '@/components/LibraryNavigation.vue'
import LibraryActionsMenu from '@/components/menus/LibraryActionsMenu.vue' import LibraryActionsMenu from '@/components/menus/LibraryActionsMenu.vue'
import PageSizeSelect from '@/components/PageSizeSelect.vue' import PageSizeSelect from '@/components/PageSizeSelect.vue'
import {parseQuerySort} from '@/functions/query-params' import {parseQuerySort} from '@/functions/query-params'
import {MediaProfile, ReadStatus} from '@/types/enum-books' import {MediaProfile, MediaStatus, ReadStatus} from '@/types/enum-books'
import { import {
BOOK_ADDED, BOOK_ADDED,
BOOK_CHANGED, BOOK_CHANGED,
@ -161,6 +161,7 @@ import {
SearchConditionDeleted, SearchConditionDeleted,
SearchConditionLibraryId, SearchConditionLibraryId,
SearchConditionMediaProfile, SearchConditionMediaProfile,
SearchConditionMediaStatus,
SearchConditionOneShot, SearchConditionOneShot,
SearchConditionReadStatus, SearchConditionReadStatus,
SearchConditionSeries, SearchConditionSeries,
@ -381,6 +382,13 @@ export default Vue.extend({
nValue: new SearchConditionMediaProfile(new SearchOperatorIsNot(x)), nValue: new SearchConditionMediaProfile(new SearchOperatorIsNot(x)),
} as NameValue)), } as NameValue)),
}, },
mediaStatus: {
name: this.$t('filter.media_status').toString(), values: Object.values(MediaStatus).map(x => ({
name: i18n.t(`enums.media_status.${x}`),
value: new SearchConditionMediaStatus(new SearchOperatorIs(x)),
nValue: new SearchConditionMediaStatus(new SearchOperatorIsNot(x)),
} as NameValue)),
},
} as FiltersOptions } as FiltersOptions
authorRoles.forEach((role: string) => { authorRoles.forEach((role: string) => {
r[role] = { r[role] = {
@ -446,12 +454,14 @@ export default Vue.extend({
// get filter from query params or local storage and validate with available filter values // get filter from query params or local storage and validate with available filter values
let activeFilters: any let activeFilters: any
if (route.query.readStatus || route.query.tag || authorRoles.some(role => role in route.query) || route.query.oneshot || route.query.deleted) { if (route.query.readStatus || route.query.tag || authorRoles.some(role => role in route.query) || route.query.oneshot || route.query.deleted || route.query.mediaProfile || route.query.mediaStatus) {
activeFilters = { activeFilters = {
readStatus: route.query.readStatus || [], readStatus: route.query.readStatus || [],
tag: route.query.tag || [], tag: route.query.tag || [],
oneshot: route.query.oneshot || [], oneshot: route.query.oneshot || [],
deleted: route.query.deleted || [], deleted: route.query.deleted || [],
mediaProfile: route.query.mediaProfile || [],
mediaStatus: route.query.mediaStatus || [],
} }
authorRoles.forEach((role: string) => { authorRoles.forEach((role: string) => {
activeFilters[role] = route.query[role] || [] activeFilters[role] = route.query[role] || []
@ -483,6 +493,8 @@ export default Vue.extend({
tag: this.$_.intersectionWith(filters.tag, extractFilterOptionsValues(this.filterOptions.tag), objIsEqual) || [], tag: this.$_.intersectionWith(filters.tag, extractFilterOptionsValues(this.filterOptions.tag), objIsEqual) || [],
oneshot: this.$_.intersectionWith(filters.oneshot, extractFilterOptionsValues(this.filterOptionsList.oneshot.values), objIsEqual) || [], oneshot: this.$_.intersectionWith(filters.oneshot, extractFilterOptionsValues(this.filterOptionsList.oneshot.values), objIsEqual) || [],
deleted: this.$_.intersectionWith(filters.deleted, extractFilterOptionsValues(this.filterOptionsList.deleted.values), objIsEqual) || [], deleted: this.$_.intersectionWith(filters.deleted, extractFilterOptionsValues(this.filterOptionsList.deleted.values), objIsEqual) || [],
mediaProfile: this.$_.intersectionWith(filters.mediaProfile, extractFilterOptionsValues(this.filterOptionsPanel.mediaProfile.values), objIsEqual) || [],
mediaStatus: this.$_.intersectionWith(filters.mediaStatus, extractFilterOptionsValues(this.filterOptionsPanel.mediaStatus.values), objIsEqual) || [],
} as any } as any
authorRoles.forEach((role: string) => { authorRoles.forEach((role: string) => {
validFilter[role] = filters[role] || [] validFilter[role] = filters[role] || []
@ -594,6 +606,8 @@ export default Vue.extend({
if (this.filters.oneshot && this.filters.oneshot.length > 0) conditions.push(...this.filters.oneshot) if (this.filters.oneshot && this.filters.oneshot.length > 0) conditions.push(...this.filters.oneshot)
if (this.filters.mediaProfile && this.filters.mediaProfile.length > 0) this.filtersMode?.mediaProfile?.allOf ? conditions.push(new SearchConditionAllOfBook(this.filters.mediaProfile)) : conditions.push(new SearchConditionAnyOfBook(this.filters.mediaProfile)) if (this.filters.mediaProfile && this.filters.mediaProfile.length > 0) this.filtersMode?.mediaProfile?.allOf ? conditions.push(new SearchConditionAllOfBook(this.filters.mediaProfile)) : conditions.push(new SearchConditionAnyOfBook(this.filters.mediaProfile))
if (this.filters.deleted && this.filters.deleted.length > 0) conditions.push(...this.filters.deleted) if (this.filters.deleted && this.filters.deleted.length > 0) conditions.push(...this.filters.deleted)
if (this.filters.mediaProfile && this.filters.mediaProfile.length > 0) conditions.push(new SearchConditionAnyOfBook(this.filters.mediaProfile))
if (this.filters.mediaStatus && this.filters.mediaStatus.length > 0) conditions.push(new SearchConditionAnyOfBook(this.filters.mediaStatus))
authorRoles.forEach((role: string) => { authorRoles.forEach((role: string) => {
if (role in this.filters) { if (role in this.filters) {
const authorConditions = this.filters[role].map((name: string) => { const authorConditions = this.filters[role].map((name: string) => {