Merge pull request #7266 from ouchihao/codex/bug-subscription-loading-reset

fix(subscriptions): reset loading when clearing state

frontend/src/stores/__tests__/subscriptions.clear.spec.ts

@@ -0,0 +1,56 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createPinia, setActivePinia } from 'pinia'
+import { useSubscriptionStore } from '../subscriptions'
+import type { UserSubscription } from '@/types'
+
+const getActive = vi.hoisted(() => vi.fn())
+vi.mock('@/api/subscriptions', () => ({ default: { getActiveSubscriptions: getActive } }))
+
+function deferred() {
+  let resolve!: (value: UserSubscription[]) => void
+  let reject!: (error: Error) => void
+  const promise = new Promise<UserSubscription[]>((yes, no) => { resolve = yes; reject = no })
+  return { promise, resolve, reject }
+}
+
+beforeEach(() => {
+  setActivePinia(createPinia())
+  getActive.mockReset()
+  vi.spyOn(console, 'error').mockImplementation(() => {})
+})
+afterEach(() => vi.restoreAllMocks())
+
+describe('clearing in-flight subscriptions', () => {
+  it.each(['resolve', 'reject'] as const)('resets loading immediately and after the old request %s', async (outcome) => {
+    const pending = deferred()
+    getActive.mockReturnValueOnce(pending.promise)
+    const store = useSubscriptionStore()
+    const request = store.fetchActiveSubscriptions().catch(() => [])
+    expect(store.loading).toBe(true)
+    store.clear()
+    expect(store.loading).toBe(false)
+    if (outcome === 'resolve') pending.resolve([{ id: 1 } as UserSubscription])
+    else pending.reject(new Error('offline'))
+    await request
+    expect(store.loading).toBe(false)
+    expect(store.activeSubscriptions).toEqual([])
+  })
+
+  it('keeps a new request loading when an older cleared request finishes', async () => {
+    const older = deferred()
+    const newer = deferred()
+    getActive.mockReturnValueOnce(older.promise).mockReturnValueOnce(newer.promise)
+    const store = useSubscriptionStore()
+    const first = store.fetchActiveSubscriptions()
+    store.clear()
+    const second = store.fetchActiveSubscriptions()
+    older.resolve([{ id: 1 } as UserSubscription])
+    await first
+    expect(store.loading).toBe(true)
+    expect(store.activeSubscriptions).toEqual([])
+    newer.resolve([{ id: 2 } as UserSubscription])
+    await second
+    expect(store.loading).toBe(false)
+    expect(store.activeSubscriptions.map(item => item.id)).toEqual([2])
+  })
+})

frontend/src/stores/subscriptions.ts

@@ -111,6 +111,7 @@ export const useSubscriptionStore = defineStore('subscriptions', () => {
   function clear() {
     requestGeneration++
     activePromise = null
+    loading.value = false
     activeSubscriptions.value = []
     loaded.value = false
     lastFetchedAt.value = null