-
+
@@ -157,6 +157,12 @@ export default {
coverPath() {
return this.media.coverPath
},
+ coverUrl() {
+ if (!this.coverPath) {
+ return this.$store.getters['globals/getPlaceholderCoverSrc']
+ }
+ return this.$store.getters['globals/getLibraryItemCoverSrcById'](this.libraryItemId, this.libraryItemUpdatedAt, true)
+ },
mediaMetadata() {
return this.media.metadata || {}
},
diff --git a/client/components/modals/player/QueueItemRow.vue b/client/components/modals/player/QueueItemRow.vue
index 2eb1bc3b6..9ac01a167 100644
--- a/client/components/modals/player/QueueItemRow.vue
+++ b/client/components/modals/player/QueueItemRow.vue
@@ -55,7 +55,7 @@ export default {
return this.item.coverPath
},
coverUrl() {
- if (!this.coverPath) return `${this.$config.routerBasePath}/book_placeholder.jpg`
+ if (!this.coverPath) return this.$store.getters['globals/getPlaceholderCoverSrc']
return this.$store.getters['globals/getLibraryItemCoverSrcById'](this.libraryItemId)
},
bookCoverAspectRatio() {
diff --git a/client/cypress/tests/components/cards/AuthorCard.cy.js b/client/cypress/tests/components/cards/AuthorCard.cy.js
index 21c638e18..4c4a1cb88 100644
--- a/client/cypress/tests/components/cards/AuthorCard.cy.js
+++ b/client/cypress/tests/components/cards/AuthorCard.cy.js
@@ -19,7 +19,9 @@ describe('AuthorCard', () => {
const mocks = {
$strings: {
LabelBooks: 'Books',
- ButtonQuickMatch: 'Quick Match'
+ ButtonQuickMatch: 'Quick Match',
+ ToastAuthorUpdateSuccess: 'Author updated',
+ ToastAuthorUpdateSuccessNoImageFound: 'Author updated (no image found)'
},
$store: {
getters: {
@@ -167,7 +169,7 @@ describe('AuthorCard', () => {
cy.get('&match').click()
cy.get('&spinner').should('be.hidden')
- cy.get('@success').should('have.been.calledOnceWithExactly', 'Author John Doe was updated (no image found)')
+ cy.get('@success').should('have.been.calledOnceWithExactly', 'Author updated (no image found)')
cy.get('@error').should('not.have.been.called')
cy.get('@info').should('not.have.been.called')
})
@@ -189,7 +191,7 @@ describe('AuthorCard', () => {
cy.get('&match').click()
cy.get('&spinner').should('be.hidden')
- cy.get('@success').should('have.been.calledOnceWithExactly', 'Author John Doe was updated')
+ cy.get('@success').should('have.been.calledOnceWithExactly', 'Author updated')
cy.get('@error').should('not.have.been.called')
cy.get('@info').should('not.have.been.called')
})
diff --git a/client/cypress/tests/components/cards/LazyBookCard.cy.js b/client/cypress/tests/components/cards/LazyBookCard.cy.js
index c39c03023..dbe33f81d 100644
--- a/client/cypress/tests/components/cards/LazyBookCard.cy.js
+++ b/client/cypress/tests/components/cards/LazyBookCard.cy.js
@@ -172,6 +172,7 @@ describe('LazyBookCard', () => {
})
it('shows titleImageNotReady and sets opacity 0 on coverImage when image not ready', () => {
+ mountOptions.mocks.$store.getters['globals/getLibraryItemCoverSrc'] = () => 'https://my.server.com/notfound.jpg'
cy.mount(LazyBookCard, mountOptions)
cy.get('&titleImageNotReady').should('be.visible')
@@ -257,7 +258,7 @@ describe('LazyBookCard', () => {
cy.get('#book-card-0').trigger('mouseover')
cy.get('&titleImageNotReady').should('be.hidden')
- cy.get('&seriesNameOverlay').should('be.visible').and('have.text', 'Middle Earth Chronicles')
+ cy.get('&seriesNameOverlay').should('be.visible').and('have.text', 'The Lord of the Rings')
})
it('shows the seriesSequenceList when collapsed series has a sequence list', () => {
diff --git a/client/cypress/tests/components/cards/LazySeriesCard.cy.js b/client/cypress/tests/components/cards/LazySeriesCard.cy.js
index c637c604e..346259d27 100644
--- a/client/cypress/tests/components/cards/LazySeriesCard.cy.js
+++ b/client/cypress/tests/components/cards/LazySeriesCard.cy.js
@@ -30,6 +30,14 @@ describe('LazySeriesCard', () => {
}
const mocks = {
+ $getString: (id, args) => {
+ switch (id) {
+ case 'LabelAddedDate':
+ return `Added ${args[0]}`
+ default:
+ return null
+ }
+ },
$store: {
getters: {
'user/getUserCanUpdate': true,
diff --git a/client/pages/share/_slug.vue b/client/pages/share/_slug.vue
index e7d00f005..bcc779d96 100644
--- a/client/pages/share/_slug.vue
+++ b/client/pages/share/_slug.vue
@@ -64,7 +64,7 @@ export default {
return this.mediaItemShare.playbackSession
},
coverUrl() {
- if (!this.playbackSession.coverPath) return `${this.$config.routerBasePath}/book_placeholder.jpg`
+ if (!this.playbackSession.coverPath) return this.$store.getters['globals/getPlaceholderCoverSrc']
return `${this.$config.routerBasePath}/public/share/${this.mediaItemShare.slug}/cover`
},
downloadUrl() {
diff --git a/client/store/globals.js b/client/store/globals.js
index 65878fb44..7b416196a 100644
--- a/client/store/globals.js
+++ b/client/store/globals.js
@@ -87,7 +87,7 @@ export const getters = {
getLibraryItemCoverSrc:
(state, getters, rootState, rootGetters) =>
(libraryItem, placeholder = null, raw = false) => {
- if (!placeholder) placeholder = `${rootState.routerBasePath}/book_placeholder.jpg`
+ if (!placeholder) placeholder = getters.getPlaceholderCoverSrc
if (!libraryItem) return placeholder
const media = libraryItem.media
if (!media?.coverPath || media.coverPath === placeholder) return placeholder
@@ -95,7 +95,6 @@ export const getters = {
// Absolute URL covers (should no longer be used)
if (media.coverPath.startsWith('http:') || media.coverPath.startsWith('https:')) return media.coverPath
- const userToken = rootGetters['user/getToken']
const lastUpdate = libraryItem.updatedAt || Date.now()
const libraryItemId = libraryItem.libraryItemId || libraryItem.id // Workaround for /users/:id page showing media progress covers
return `${rootState.routerBasePath}/api/items/${libraryItemId}/cover?ts=${lastUpdate}${raw ? '&raw=1' : ''}`
@@ -103,11 +102,13 @@ export const getters = {
getLibraryItemCoverSrcById:
(state, getters, rootState, rootGetters) =>
(libraryItemId, timestamp = null, raw = false) => {
- const placeholder = `${rootState.routerBasePath}/book_placeholder.jpg`
- if (!libraryItemId) return placeholder
- const userToken = rootGetters['user/getToken']
+ if (!libraryItemId) return getters.getPlaceholderCoverSrc
+
return `${rootState.routerBasePath}/api/items/${libraryItemId}/cover?${raw ? '&raw=1' : ''}${timestamp ? `&ts=${timestamp}` : ''}`
},
+ getPlaceholderCoverSrc: (state, getters, rootState, rootGetters) => {
+ return `${rootState.routerBasePath}/book_placeholder.jpg`
+ },
getIsBatchSelectingMediaItems: (state) => {
return state.selectedMediaItems.length
}