move health to datacontext

Author: truearken

frontend/src/app/page.tsx

@@ -12,7 +12,7 @@ import Toast from '@/components/Toast';
 import SettingsCard from '@/components/SettingsCard';
 import ConfirmationModal from '@/components/ConfirmationModal';
 import { Preset, LoadoutItemV1 } from '@/lib/types';
-import { getPlayerLoadout, applyLoadout, getPresets, savePresets, getHealth } from '@/services/api';
+import { getPlayerLoadout, applyLoadout, getPresets, savePresets } from '@/services/api';
 import { getSettings, saveSettings } from '@/services/settings';
 import { LocalClientError } from '@/lib/errors';
 import { useData } from '@/context/DataContext';
@@ -26,7 +26,7 @@ const defaultPreset: Preset = {
 };
 
 export default function Home() {
-    const { agents, loading: dataContextLoading } = useData();
+    const { agents, loading: dataContextLoading, isClientHealthy } = useData();
     const [currentLoadout, setCurrentLoadout] = useState<Record<string, LoadoutItemV1>>(defaultPreset.loadout);
     const [presets, setPresets] = useState<Preset[]>([]);
     const [selectedPreset, setSelectedPreset] = useState<Preset | null>(defaultPreset);
@@ -49,6 +49,7 @@ export default function Home() {
 
     const loadData = useCallback(async () => {
         try {
+            setIsLoading(true);
             const [playerLoadout, fetchedPresets, settings] = await Promise.all([
                 getPlayerLoadout(),
                 getPresets(),
@@ -66,7 +67,6 @@ export default function Home() {
             setIsLoading(false);
         } catch (error) {
             if (error instanceof LocalClientError) {
-                setLoadingMessage("Waiting for VALORANT to start...");
                 setIsLoading(true);
             } else {
                 console.error(error);
@@ -78,25 +78,14 @@ export default function Home() {
     }, []);
 
     useEffect(() => {
-        loadData();
-    }, [loadData]);
-
-    useEffect(() => {
-        const healthCheck = async () => {
-            const isHealthy = await getHealth();
-            if (isHealthy && isLoading) {
-                loadData();
-            } else if (!isHealthy && !isLoading) {
-                setIsLoading(true);
-                setLoadingMessage("Waiting for VALORANT to start...");
-            }
-        };
-
-        healthCheck();
-        const intervalId = setInterval(healthCheck, 3000);
-
-        return () => clearInterval(intervalId);
-    }, [isLoading, loadData]);
+        if (isClientHealthy) {
+            setLoadingMessage('Loading application data...');
+            loadData();
+        } else {
+            setIsLoading(true);
+            setLoadingMessage("Waiting for VALORANT to start...");
+        }
+    }, [isClientHealthy, loadData]);
 
     useEffect(() => {
         if (autoSelectAgent !== undefined) {
@@ -255,14 +244,12 @@ export default function Home() {
             if (error instanceof LocalClientError) {
                 setErrorMessage(error.message);
                 setShowErrorModal(true);
-            } else {
-                console.error(error);
             }
+        } finally {
+            setIsEditing(false);
+            setEditingPreset(null);
+            setOriginalPreset(null);
         }
-
-        setIsEditing(false);
-        setEditingPreset(null);
-        setOriginalPreset(null);
     };
 
     const handlePresetDelete = (presetId: string) => {
@@ -417,7 +404,7 @@ export default function Home() {
                     </div>
                 </div>
             </main>
-            {isEditing && <Footer onSave={handleSave} onCancel={handleCancel} onSaveAsNew={() => handleOpenPresetNameModal(false)} onApply={handleApply} showSaveButton={originalPreset?.uuid !== 'default-preset'} />}
+            {isEditing && <Footer onSave={handleSave} onCancel={handleCancel} onSaveAsNew={() => handleOpenPresetNameModal(false)} onApply={handleApply} showSaveButton={originalPreset?.uuid !== 'default-preset'} />} 
             <PresetNameModal show={showPresetNameModal} onClose={handleClosePresetNameModal} onSave={handleSavePresetName} initialName={renamingPreset?.name} />
             <ErrorModal show={showErrorModal} onClose={handleCloseErrorModal} message={errorMessage} />
             <Toast show={showToast} onClose={() => setShowToast(false)} message={toastMessage} />
@@ -430,4 +417,4 @@ export default function Home() {
             />
         </>
     );
-}
+}

frontend/src/context/DataContext.tsx

@@ -14,6 +14,7 @@ interface DataContextType {
     ownedChromaIDs: string[];
     ownedBuddyIDs: string[];
     loading: boolean;
+    isClientHealthy: boolean;
 }
 
 const DataContext = createContext<DataContextType | undefined>(undefined);
@@ -27,6 +28,7 @@ export function DataProvider({ children }: { children: ReactNode }) {
     const [ownedChromaIDs, setOwnedChromaIDs] = useState<string[]>([]);
     const [ownedBuddyIDs, setOwnedBuddyIDs] = useState<string[]>([]);
     const [loading, setLoading] = useState(true);
+    const [isClientHealthy, setIsClientHealthy] = useState(false);
 
     const loadData = useCallback(async () => {
         try {
@@ -64,27 +66,29 @@ export function DataProvider({ children }: { children: ReactNode }) {
         }
     }, []);
 
-    useEffect(() => {
-        loadData();
-    }, [loadData]);
-
     useEffect(() => {
         const healthCheck = async () => {
             const isHealthy = await getHealth();
-            if (isHealthy && loading) {
-                loadData();
-            } else if (!isHealthy && loading) {
-                setLoading(true);
+            setIsClientHealthy(isHealthy);
+            if (isHealthy) {
+                if (loading) {
+                    loadData();
+                }
+            } else {
+                if (!loading) {
+                    setLoading(true);
+                }
             }
         };
 
+        healthCheck();
         const intervalId = setInterval(healthCheck, 3000);
 
         return () => clearInterval(intervalId);
     }, [loading, loadData]);
 
     return (
-        <DataContext.Provider value={{ agents, weapons, ownedBuddies, contentTiers, ownedLevelIDs, ownedChromaIDs, ownedBuddyIDs, loading }}>
+        <DataContext.Provider value={{ agents, weapons, ownedBuddies, contentTiers, ownedLevelIDs, ownedChromaIDs, ownedBuddyIDs, loading, isClientHealthy }}>
             {children}
         </DataContext.Provider>
     );
@@ -96,4 +100,4 @@ export function useData() {
         throw new Error('useData must be used within a DataProvider');
     }
     return context;
-}
+}