diff --git a/komga-webui/src/locales/en.json b/komga-webui/src/locales/en.json index 1b2a85fbf..26293d93a 100644 --- a/komga-webui/src/locales/en.json +++ b/komga-webui/src/locales/en.json @@ -202,6 +202,7 @@ "roles": "Roles", "series": "Series", "tags": "Tags", + "unavailable": "Unavailable", "use_filter_panel_to_change_filter": "Use the filter panel to change the active filter", "year": "year" }, diff --git a/komga-webui/src/types/items.ts b/komga-webui/src/types/items.ts index 96afa0338..1b715c38c 100644 --- a/komga-webui/src/types/items.ts +++ b/komga-webui/src/types/items.ts @@ -66,13 +66,13 @@ export class BookItem extends Item { } body (): string { + if(this.item.deleted) return `
${i18n.t('common.unavailable')}
` switch (this.item.media.status) { case MediaStatus.ERROR: return `
${i18n.t('book_card.error')}
` case MediaStatus.UNSUPPORTED: return `
${i18n.t('book_card.unsupported')}
` case MediaStatus.UNKNOWN: return `
${i18n.t('book_card.unknown')}
` default: return `
${i18n.tc('common.pages_n', this.item.media.pagesCount)}
` } - } to (): RawLocation { @@ -106,6 +106,7 @@ export class SeriesItem extends Item { } body (): string { + if(this.item.deleted) return `
${i18n.t('common.unavailable')}
` return `${i18n.tc('common.books_n', this.item.booksCount)}` } diff --git a/komga-webui/src/types/komga-books.ts b/komga-webui/src/types/komga-books.ts index ea0398f4f..bf7713670 100644 --- a/komga-webui/src/types/komga-books.ts +++ b/komga-webui/src/types/komga-books.ts @@ -13,7 +13,8 @@ export interface BookDto { size: string, media: MediaDto, metadata: BookMetadataDto, - readProgress?: ReadProgressDto + readProgress?: ReadProgressDto, + deleted: boolean, // custom fields context: Context diff --git a/komga-webui/src/types/komga-series.ts b/komga-webui/src/types/komga-series.ts index 7057be1b1..7a8134d53 100644 --- a/komga-webui/src/types/komga-series.ts +++ b/komga-webui/src/types/komga-series.ts @@ -12,6 +12,7 @@ export interface SeriesDto { booksInProgressCount: number, metadata: SeriesMetadataDto, booksMetadata: SeriesBooksMetadataDto, + deleted: boolean, } export interface SeriesMetadataDto { diff --git a/komga-webui/src/views/BrowseBook.vue b/komga-webui/src/views/BrowseBook.vue index 3b03cfddc..a8989b5f2 100644 --- a/komga-webui/src/views/BrowseBook.vue +++ b/komga-webui/src/views/BrowseBook.vue @@ -112,7 +112,7 @@ - + {{ book.metadata.number }} ยท {{ $tc('common.pages_n', book.media.pagesCount) }} @@ -121,6 +121,11 @@ new Intl.DateTimeFormat($i18n.locale, {dateStyle: 'long'}).format(new Date(book.metadata.releaseDate)) }} + + + {{ $t('common.unavailable') }} + + @@ -131,7 +136,7 @@ small :title="$t('browse_book.read_book')" :to="{name: 'read-book', params: { bookId: bookId}, query: { context: context.origin, contextId: context.id}}" - :disabled="book.media.status !== 'READY' || !canReadPages" + :disabled="!canRead" > mdi-book-open-page-variant {{ $t('common.read') }} @@ -142,7 +147,7 @@ mdi-incognito {{ $t('common.read') }} @@ -177,7 +182,7 @@ small :title="$t('browse_book.read_book')" :to="{name: 'read-book', params: { bookId: bookId}, query: { context: context.origin, contextId: context.id}}" - :disabled="book.media.status !== 'READY' || !canReadPages" + :disabled="!canRead" > mdi-book-open-page-variant {{ $t('common.read') }} @@ -188,7 +193,7 @@ mdi-incognito {{ $t('common.read') }} @@ -397,11 +402,11 @@ export default Vue.extend({ isAdmin(): boolean { return this.$store.getters.meAdmin }, - canReadPages(): boolean { - return this.$store.getters.mePageStreaming + canRead(): boolean { + return this.book.media.status === 'READY' && this.$store.getters.mePageStreaming && !this.book.deleted }, canDownload(): boolean { - return this.$store.getters.meFileDownload + return this.$store.getters.meFileDownload && !this.book.deleted }, thumbnailUrl(): string { return bookThumbnailUrl(this.bookId) diff --git a/komga-webui/src/views/BrowseSeries.vue b/komga-webui/src/views/BrowseSeries.vue index 0cfed1276..6d5878b19 100644 --- a/komga-webui/src/views/BrowseSeries.vue +++ b/komga-webui/src/views/BrowseSeries.vue @@ -119,26 +119,30 @@ {{ $t(`enums.series_status.${series.metadata.status}`) }} - - + {{ series.metadata.ageRating }}+ - + {{ languageDisplay }} - - + + {{ $t(`enums.reading_direction.${series.metadata.readingDirection}`) }} + + + {{ $t('common.unavailable') }} + +