@prenta/admin 1.17.3 → 1.17.5

package/src/views/settings/useUpdates.ts

@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { toast } from 'sonner'
 
 import { cmsApi } from '../../lib/api.js'
@@ -74,6 +74,10 @@ export function useUpdates({ role }: { role?: string }) {
   const [form, setForm] = useState<GithubForm>({ githubRepo: '', githubToken: '' })
   const [baseline, setBaseline] = useState<GithubForm>({ githubRepo: '', githubToken: '' })
   const [saveState, setSaveState] = useState<'idle' | 'saving' | 'success' | 'error'>('idle')
+  // The check request is in flight across renders. Read the baseline from the
+  // render that started it, not from a later save or keystroke.
+  const baselineRef = useRef(baseline)
+  baselineRef.current = baseline
 
   // Optimistic until the check response confirms the server-side permission.
   const canManage = info?.canManage ?? canManageUpdates(role)
@@ -82,14 +86,21 @@ export function useUpdates({ role }: { role?: string }) {
     setChecking(true)
     setError('')
     setPrResult(null)
+    const baselineAtStart = baselineRef.current
     const res = await cmsApi<UpdateInfo>('/updates/check')
     if (res.error) {
       setError(res.error)
     } else if (res.data) {
       setInfo(res.data)
-      const repo = res.data.githubRepo ?? ''
-      setForm({ githubRepo: repo, githubToken: '' })
-      setBaseline({ githubRepo: repo, githubToken: '' })
+      const next = { githubRepo: res.data.githubRepo ?? '', githubToken: '' }
+      // A mount-time check can take seconds. Only replace the fields when the
+      // user has not typed since this request started (#929).
+      setForm((current) => {
+        const untouched =
+          current.githubRepo === baselineAtStart.githubRepo && current.githubToken.trim() === ''
+        return untouched ? next : current
+      })
+      setBaseline(next)
     }
     setChecking(false)
     setHasChecked(true)