mirror of
https://github.com/laoxong/nofx.git
synced 2026-06-04 09:58:22 +08:00
fix: auto re-fetch system config after invalidation
- invalidateSystemConfig() now dispatches a custom event - useSystemConfig() listens for the event and re-fetches automatically - Fixes stale initialized=false after register/logout causing incorrect redirect to SetupPage
This commit is contained in:
@@ -1,13 +1,15 @@
|
|||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState, useCallback } from 'react'
|
||||||
import { getSystemConfig, type SystemConfig } from '../lib/config'
|
import { getSystemConfig, invalidateSystemConfig, type SystemConfig } from '../lib/config'
|
||||||
|
|
||||||
export function useSystemConfig() {
|
export function useSystemConfig() {
|
||||||
const [config, setConfig] = useState<SystemConfig | null>(null)
|
const [config, setConfig] = useState<SystemConfig | null>(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
|
const [fetchKey, setFetchKey] = useState(0)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let mounted = true
|
let mounted = true
|
||||||
|
setLoading(true)
|
||||||
getSystemConfig()
|
getSystemConfig()
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
if (!mounted) return
|
if (!mounted) return
|
||||||
@@ -23,7 +25,18 @@ export function useSystemConfig() {
|
|||||||
return () => {
|
return () => {
|
||||||
mounted = false
|
mounted = false
|
||||||
}
|
}
|
||||||
|
}, [fetchKey])
|
||||||
|
|
||||||
|
// Listen for invalidation events and re-fetch automatically
|
||||||
|
useEffect(() => {
|
||||||
|
const handler = () => setFetchKey((k) => k + 1)
|
||||||
|
window.addEventListener('system-config-invalidated', handler)
|
||||||
|
return () => window.removeEventListener('system-config-invalidated', handler)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
return { config, loading, error }
|
const refresh = useCallback(() => {
|
||||||
|
invalidateSystemConfig()
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
return { config, loading, error, refresh }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,4 +26,5 @@ export function getSystemConfig(): Promise<SystemConfig> {
|
|||||||
export function invalidateSystemConfig() {
|
export function invalidateSystemConfig() {
|
||||||
cachedConfig = null
|
cachedConfig = null
|
||||||
configPromise = null
|
configPromise = null
|
||||||
|
window.dispatchEvent(new Event('system-config-invalidated'))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user