From ef1871c1fcd55415acf7b039dbbaafa5999a77a3 Mon Sep 17 00:00:00 2001
From: johndoe6345789 <john.doe6345789@gmail.com>
Date: Sun, 18 Jan 2026 01:03:03 +0000
Subject: [PATCH] Refactor conflict resolution page state

---
 src/components/ConflictResolutionPage.tsx | 74 +++--------------
 src/hooks/use-conflict-resolution-page.ts | 96 +++++++++++++++++++++++
 2 files changed, 109 insertions(+), 61 deletions(-)
 create mode 100644 src/hooks/use-conflict-resolution-page.ts

diff --git a/src/components/ConflictResolutionPage.tsx b/src/components/ConflictResolutionPage.tsx
index 8a0dc0f..4d9fa32 100644
--- a/src/components/ConflictResolutionPage.tsx
+++ b/src/components/ConflictResolutionPage.tsx
@@ -1,6 +1,4 @@
-import { useState, useEffect } from 'react'
-import { useConflictResolution } from '@/hooks/use-conflict-resolution'
-import { ConflictItem, ConflictResolutionStrategy } from '@/types/conflicts'
+import { useConflictResolutionPage } from '@/hooks/use-conflict-resolution-page'
 import conflictResolutionCopy from '@/data/conflict-resolution.json'
 import { ConflictResolutionHeader } from '@/components/conflict-resolution/ConflictResolutionHeader'
 import { ConflictResolutionStatsSection } from '@/components/conflict-resolution/ConflictResolutionStats'
@@ -9,13 +7,10 @@ import { ConflictResolutionFilters } from '@/components/conflict-resolution/Conf
 import { ConflictResolutionList } from '@/components/conflict-resolution/ConflictResolutionList'
 import { ConflictResolutionError } from '@/components/conflict-resolution/ConflictResolutionError'
 import { ConflictResolutionDetails } from '@/components/conflict-resolution/ConflictResolutionDetails'
-import type {
-  ConflictResolutionCopy,
-  ConflictResolutionFilters as ConflictResolutionFilterType,
-} from '@/components/conflict-resolution/types'
-import { toast } from 'sonner'
+import type { ConflictResolutionCopy } from '@/components/conflict-resolution/types'
 
 export function ConflictResolutionPage() {
+  const copy = conflictResolutionCopy as ConflictResolutionCopy
   const {
     conflicts,
     stats,
@@ -24,61 +19,18 @@ export function ConflictResolutionPage() {
     resolvingConflict,
     error,
     hasConflicts,
-    detect,
-    resolve,
-    resolveAll,
     clear,
     setAutoResolve,
-  } = useConflictResolution()
-
-  const [selectedConflict, setSelectedConflict] = useState<ConflictItem | null>(null)
-  const [detailsDialogOpen, setDetailsDialogOpen] = useState(false)
-  const [filterType, setFilterType] = useState<ConflictResolutionFilterType>('all')
-  const copy = conflictResolutionCopy as ConflictResolutionCopy
-
-  useEffect(() => {
-    detect().catch(() => {})
-  }, [])
-
-  const handleDetect = async () => {
-    try {
-      const detected = await detect()
-      if (detected.length === 0) {
-        toast.success(copy.toasts.noConflictsDetected)
-      } else {
-        const label =
-          detected.length === 1 ? copy.labels.conflictSingular : copy.labels.conflictPlural
-        toast.info(copy.toasts.foundConflicts
-          .replace('{count}', String(detected.length))
-          .replace('{label}', label))
-      }
-    } catch (err: any) {
-      toast.error(err.message || copy.toasts.detectFailed)
-    }
-  }
-
-  const handleResolve = async (conflictId: string, strategy: ConflictResolutionStrategy) => {
-    try {
-      await resolve(conflictId, strategy)
-      toast.success(copy.toasts.resolved.replace('{strategy}', strategy))
-    } catch (err: any) {
-      toast.error(err.message || copy.toasts.resolveFailed)
-    }
-  }
-
-  const handleResolveAll = async (strategy: ConflictResolutionStrategy) => {
-    try {
-      await resolveAll(strategy)
-      toast.success(copy.toasts.resolvedAll.replace('{strategy}', strategy))
-    } catch (err: any) {
-      toast.error(err.message || copy.toasts.resolveAllFailed)
-    }
-  }
-
-  const handleViewDetails = (conflict: ConflictItem) => {
-    setSelectedConflict(conflict)
-    setDetailsDialogOpen(true)
-  }
+    filterType,
+    setFilterType,
+    selectedConflict,
+    detailsDialogOpen,
+    setDetailsDialogOpen,
+    handleDetect,
+    handleResolve,
+    handleResolveAll,
+    handleViewDetails,
+  } = useConflictResolutionPage(copy)
 
   const filteredConflicts = filterType === 'all'
     ? conflicts
diff --git a/src/hooks/use-conflict-resolution-page.ts b/src/hooks/use-conflict-resolution-page.ts
new file mode 100644
index 0000000..c087819
--- /dev/null
+++ b/src/hooks/use-conflict-resolution-page.ts
@@ -0,0 +1,96 @@
+import { useEffect, useState } from 'react'
+import { toast } from 'sonner'
+import { useConflictResolution } from '@/hooks/use-conflict-resolution'
+import { ConflictItem, ConflictResolutionStrategy } from '@/types/conflicts'
+import type {
+  ConflictResolutionCopy,
+  ConflictResolutionFilters as ConflictResolutionFilterType,
+} from '@/components/conflict-resolution/types'
+
+export function useConflictResolutionPage(copy: ConflictResolutionCopy) {
+  const {
+    conflicts,
+    stats,
+    autoResolveStrategy,
+    detectingConflicts,
+    resolvingConflict,
+    error,
+    hasConflicts,
+    detect,
+    resolve,
+    resolveAll,
+    clear,
+    setAutoResolve,
+  } = useConflictResolution()
+
+  const [selectedConflict, setSelectedConflict] = useState<ConflictItem | null>(null)
+  const [detailsDialogOpen, setDetailsDialogOpen] = useState(false)
+  const [filterType, setFilterType] = useState<ConflictResolutionFilterType>('all')
+
+  useEffect(() => {
+    detect().catch(() => {})
+  }, [detect])
+
+  const handleDetect = async () => {
+    try {
+      const detected = await detect()
+      if (detected.length === 0) {
+        toast.success(copy.toasts.noConflictsDetected)
+      } else {
+        const label =
+          detected.length === 1 ? copy.labels.conflictSingular : copy.labels.conflictPlural
+        toast.info(
+          copy.toasts.foundConflicts
+            .replace('{count}', String(detected.length))
+            .replace('{label}', label)
+        )
+      }
+    } catch (err: any) {
+      toast.error(err.message || copy.toasts.detectFailed)
+    }
+  }
+
+  const handleResolve = async (conflictId: string, strategy: ConflictResolutionStrategy) => {
+    try {
+      await resolve(conflictId, strategy)
+      toast.success(copy.toasts.resolved.replace('{strategy}', strategy))
+    } catch (err: any) {
+      toast.error(err.message || copy.toasts.resolveFailed)
+    }
+  }
+
+  const handleResolveAll = async (strategy: ConflictResolutionStrategy) => {
+    try {
+      await resolveAll(strategy)
+      toast.success(copy.toasts.resolvedAll.replace('{strategy}', strategy))
+    } catch (err: any) {
+      toast.error(err.message || copy.toasts.resolveAllFailed)
+    }
+  }
+
+  const handleViewDetails = (conflict: ConflictItem) => {
+    setSelectedConflict(conflict)
+    setDetailsDialogOpen(true)
+  }
+
+  return {
+    conflicts,
+    stats,
+    autoResolveStrategy,
+    detectingConflicts,
+    resolvingConflict,
+    error,
+    hasConflicts,
+    clear,
+    setAutoResolve,
+    filterType,
+    setFilterType,
+    selectedConflict,
+    detailsDialogOpen,
+    setDetailsDialogOpen,
+    handleDetect,
+    handleResolve,
+    handleResolveAll,
+    handleViewDetails,
+  }
+}