Fix read-article handling across feed filter switches in article view
Article view marks the displayed article read in place (feed.read =
true) without removing it, so currentIndex stays valid while paging.
leaveArticleView() already dropped those afterward, but switching the
feed filter while still in article view never did — so an
already-read article could resurface (re-selecting its feed
re-projected it from allItems as if still unread). Extracted the drop
into a shared dropReadArticles() and call it from setFeedFilter() too.
Also, switching the filter while in article view immediately displays
the new feed's article in full, which is a genuine view — same as
paging or toggling into article view — but nothing marked it read, so
a single-article feed could never be marked read that way at all. This
was deliberately excluded (see commit 169c294) after a generic watch
proved too broad; setFeedFilter() now marks it explicitly, scoped to
article view only, so list view's scroll-driven read-marking is
unaffected.
This commit is contained in:
1 parent
41a17eba6d
commit
c290513ed1
2 files changed
+80
-7
No files matched your search
@@ -12,7 +12,7 @@ class FakeIntersectionObserver {
|
||||
vi.stubGlobal('IntersectionObserver', FakeIntersectionObserver)
|
||||
|
||||
describe('useFeeds', () => {
|
||||
const { feeds, allItems, feedFilter, feedTitles, feedUnreadCounts, unreadCount, displayedFeedUnreadCounts, refreshUnreadDisplay, setFeedFilter, showMessage, message, showModal, fetchData, sync, getReadable, setInitialLoad, handleIntersection, markAllRead, markRead, setupIntersectionObserver } = useFeeds()
|
||||
const { feeds, allItems, feedFilter, feedTitles, feedUnreadCounts, unreadCount, displayedFeedUnreadCounts, refreshUnreadDisplay, setFeedFilter, showMessage, message, viewMode, fetchData, sync, getReadable, setInitialLoad, handleIntersection, markAllRead, markRead, markCurrentArticleRead, setupIntersectionObserver } = useFeeds()
|
||||
|
||||
beforeEach(() => {
|
||||
localStorage.setItem('user-token', 'test-token')
|
||||
@@ -24,7 +24,7 @@ describe('useFeeds', () => {
|
||||
feedFilter.value = null
|
||||
showMessage.value = false
|
||||
message.value = ''
|
||||
showModal.value = false
|
||||
viewMode.value = 'list'
|
||||
})
|
||||
|
||||
it('fetches and flattens articles for the current user', async () => {
|
||||
@@ -423,6 +423,60 @@ describe('useFeeds', () => {
|
||||
expect(feeds.value.map(f => f.id)).toEqual([2, 1])
|
||||
})
|
||||
|
||||
it('does not resurrect an article-view read-in-place article when re-selecting its feed', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
axios.put.mockResolvedValue({ status: 200 })
|
||||
await fetchData()
|
||||
|
||||
await setFeedFilter('Feed B')
|
||||
expect(feeds.value.map(f => f.id)).toEqual([2])
|
||||
|
||||
// Article view marks the displayed article read in place (feed.read =
|
||||
// true) without removing it, so currentIndex stays valid while paging —
|
||||
// see markCurrentArticleRead. It's still in the list at this point.
|
||||
markCurrentArticleRead()
|
||||
expect(feeds.value.map(f => f.id)).toEqual([2])
|
||||
|
||||
// Switching to another feed and back must not resurrect it as if it
|
||||
// were still unread.
|
||||
await setFeedFilter('Feed A')
|
||||
await setFeedFilter('Feed B')
|
||||
|
||||
expect(feeds.value).toEqual([])
|
||||
})
|
||||
|
||||
it('marks the newly displayed article read when the filter is switched while in article view', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
axios.put.mockResolvedValue({ status: 200 })
|
||||
await fetchData()
|
||||
viewMode.value = 'article'
|
||||
|
||||
// Switching into Feed B while in article view immediately displays its
|
||||
// one article's full content — that counts as "viewed", so it's marked
|
||||
// read the same way toggleViewMode()/nextArticle()/prevArticle() do.
|
||||
await setFeedFilter('Feed B')
|
||||
|
||||
expect(axios.put).toHaveBeenCalledWith('/api/v1/article/read/2', null, expect.anything())
|
||||
expect(feeds.value[0].read).toBe(true)
|
||||
|
||||
// It doesn't resurface either, once dropped on the next switch.
|
||||
await setFeedFilter('Feed A')
|
||||
await setFeedFilter('Feed B')
|
||||
expect(feeds.value).toEqual([])
|
||||
})
|
||||
|
||||
it('does not mark the newly displayed article read when the filter is switched in list view', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
await fetchData()
|
||||
|
||||
// List view only shows titles — switching filters there must not mark
|
||||
// anything read; that's still driven solely by scroll (handleIntersection).
|
||||
await setFeedFilter('Feed B')
|
||||
|
||||
expect(axios.put).not.toHaveBeenCalled()
|
||||
expect(feeds.value[0].read).toBeUndefined()
|
||||
})
|
||||
|
||||
it('keeps an emptied filtered feed selected and selectable, showing "All caught up"', async () => {
|
||||
axios.get.mockResolvedValueOnce(twoFeedsResponse)
|
||||
axios.put.mockResolvedValue({ status: 200 })
|
||||
|
||||
Reference in new issue
Block a user