refactor(use-fetch-state): fallback

moeru-ai · Feb 1, 2025 · 7a8a72e · 7a8a72e
1 parent d67929e
commit 7a8a72e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/components/settings/settings-chat.tsx b/src/components/settings/settings-chat.tsx
@@ -17,7 +17,7 @@ export const SettingsChat = () => {
   const badgeColor = isOnline ? 'green' : 'red'
   const badgeText = isOnline ? 'Online' : 'Offline'
 
-  const { error: modelsError, models } = useListModels(chatProvider, [chatProvider])
+  const { models } = useListModels(chatProvider, [chatProvider])
 
   return (
     <>
@@ -86,7 +86,7 @@ export const SettingsChat = () => {
           Chat Model
         </Text>
         {/* eslint-disable-next-line @masknet/jsx-no-logical */}
-        {modelsError
+        {models.length === 0
           ? (
               <DebouncedTextField onBlurValueChange={setChatModel} value={chatModel} />
             )
@@ -105,7 +105,7 @@ export const SettingsChat = () => {
           Embed Model
         </Text>
         {/* eslint-disable-next-line @masknet/jsx-no-logical */}
-        {modelsError
+        {models.length === 0
           ? (
               <DebouncedTextField onBlurValueChange={setEmbedModel} value={embedModel} />
             )

diff --git a/src/hooks/xsai/_use-fetch-state.ts b/src/hooks/xsai/_use-fetch-state.ts
@@ -7,18 +7,22 @@ import { useState } from 'react'
 export const useFetchState = <T>(getData: (signal: AbortSignal) => Promise<T>, initialState: T, deps: DependencyList) => {
   const [data, setData] = useState<T>(initialState)
   const [error, setError] = useState<Error | undefined>()
-  const [isLoading, setIsLoading] = useState(true)
+  const [isLoading, setIsLoading] = useState(false)
 
   useAbortableEffect((signal) => {
+    setIsLoading(true)
     // eslint-disable-next-line @masknet/no-then
     getData(signal)
       .then((data) => {
         if (!signal.aborted)
           setData(data)
       })
       .catch((error: Error) => {
-        if (!signal.aborted)
+        // eslint-disable-next-line @masknet/prefer-early-return
+        if (!signal.aborted) {
+          setData(initialState)
           setError(error)
+        }
       })
       .finally(() => {
         if (!signal.aborted)