cache-and-network

TabbyML · Mar 20, 2024 · f5772f2 · f5772f2
1 parent 3739197
commit f5772f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/ee/tabby-ui/app/(dashboard)/settings/general/components/network-form.tsx b/ee/tabby-ui/app/(dashboard)/settings/general/components/network-form.tsx
@@ -107,9 +107,7 @@ const NetworkForm: React.FC<NetworkFormProps> = ({
 }
 
 export const GeneralNetworkForm = () => {
-  const [{ data, stale }, reexecuteQuery] = useNetworkSetting({
-    requestPolicy: 'network-only'
-  })
+  const [{ data, stale }, reexecuteQuery] = useNetworkSetting()
 
   const onSuccess = () => {
     toast.success('Network configuration is updated')

diff --git a/ee/tabby-ui/app/(dashboard)/settings/general/components/security-form.tsx b/ee/tabby-ui/app/(dashboard)/settings/general/components/security-form.tsx
@@ -227,9 +227,8 @@ function buildListValuesFromField(fieldListValue?: Array<{ value: string }>) {
 }
 
 export const GeneralSecurityForm = () => {
-  const [{ data }, reexecuteQuery] = useQuery({
-    query: securitySetting,
-    requestPolicy: 'network-only'
+  const [{ data, stale }, reexecuteQuery] = useQuery({
+    query: securitySetting
   })
   const onSuccess = () => {
     toast.success('Security configuration is updated')
@@ -242,7 +241,7 @@ export const GeneralSecurityForm = () => {
     )
   }
 
-  return data ? (
+  return data && !stale ? (
     <SecurityForm defaultValues={defaultValues} onSuccess={onSuccess} />
   ) : (
     <FormSkeleton />

diff --git a/ee/tabby-ui/lib/hooks/use-network-setting.tsx b/ee/tabby-ui/lib/hooks/use-network-setting.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { useQuery, UseQueryArgs } from 'urql'
+import { useQuery } from 'urql'
 
 import { graphql } from '../gql/generates'
 import { isClientSide } from '../utils'
@@ -12,10 +12,8 @@ const networkSettingQuery = graphql(/* GraphQL */ `
   }
 `)
 
-const useNetworkSetting = (
-  options?: Pick<UseQueryArgs, 'requestPolicy' | 'pause'>
-) => {
-  return useQuery({ query: networkSettingQuery, ...options })
+const useNetworkSetting = () => {
+  return useQuery({ query: networkSettingQuery })
 }
 
 const useExternalURL = () => {