From 7116ab9c293f6b59ae8490b234dd99c72d5dd72b Mon Sep 17 00:00:00 2001 From: Brandon Keiji Date: Wed, 14 May 2025 00:12:04 +0000 Subject: fix: pass startup warnings to app as prop (#342) --- packages/cli/src/ui/App.tsx | 12 +++++---- packages/cli/src/ui/hooks/useAppEffects.ts | 42 ------------------------------ 2 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 packages/cli/src/ui/hooks/useAppEffects.ts (limited to 'packages/cli/src/ui') diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx index 39cbaf47..a838f524 100644 --- a/packages/cli/src/ui/App.tsx +++ b/packages/cli/src/ui/App.tsx @@ -16,7 +16,6 @@ import { LoadingIndicator } from './components/LoadingIndicator.js'; import { EditorState, InputPrompt } from './components/InputPrompt.js'; import { Footer } from './components/Footer.js'; import { ThemeDialog } from './components/ThemeDialog.js'; -import { useStartupWarnings } from './hooks/useAppEffects.js'; import { shortenPath, type Config } from '@gemini-code/server'; import { Colors } from './colors.js'; import { Help } from './components/Help.js'; @@ -33,16 +32,21 @@ interface AppProps { config: Config; settings: LoadedSettings; cliVersion: string; + startupWarnings?: string[]; } -export const App = ({ config, settings, cliVersion }: AppProps) => { +export const App = ({ + config, + settings, + cliVersion, + startupWarnings = [], +}: AppProps) => { const { history, addItem, clearItems } = useHistory(); const [staticKey, setStaticKey] = useState(0); const refreshStatic = useCallback(() => { setStaticKey((prev) => prev + 1); }, [setStaticKey]); - const [startupWarnings, setStartupWarnings] = useState([]); const [debugMessage, setDebugMessage] = useState(''); const [showHelp, setShowHelp] = useState(false); const [themeError, setThemeError] = useState(null); @@ -74,8 +78,6 @@ export const App = ({ config, settings, cliVersion }: AppProps) => { const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState); - useStartupWarnings(setStartupWarnings); - const handleFinalSubmit = useCallback( (submittedValue: string) => { const trimmedValue = submittedValue.trim(); diff --git a/packages/cli/src/ui/hooks/useAppEffects.ts b/packages/cli/src/ui/hooks/useAppEffects.ts deleted file mode 100644 index da1ab203..00000000 --- a/packages/cli/src/ui/hooks/useAppEffects.ts +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import { useEffect } from 'react'; -import fs from 'fs'; -import path from 'path'; -import os from 'os'; -import { getErrorMessage } from '@gemini-code/server'; - -const warningsFilePath = path.join(os.tmpdir(), 'gemini-code-cli-warnings.txt'); - -// Effect to handle startup warnings -export function useStartupWarnings( - setStartupWarnings: React.Dispatch>, -) { - useEffect(() => { - try { - if (fs.existsSync(warningsFilePath)) { - const warningsContent = fs.readFileSync(warningsFilePath, 'utf-8'); - setStartupWarnings( - warningsContent.split('\n').filter((line) => line.trim() !== ''), - ); - try { - fs.unlinkSync(warningsFilePath); - } catch { - setStartupWarnings((prev) => [ - ...prev, - `Warning: Could not delete temporary warnings file.`, - ]); - } - } - } catch (err: unknown) { - setStartupWarnings((prev) => [ - ...prev, - `Error checking/reading warnings file: ${getErrorMessage(err)}`, - ]); - } - }, [setStartupWarnings]); // Include setStartupWarnings in dependency array -} -- cgit v1.2.3