Skip to content

feat: Widen logs dialog and simplify settings controls #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmarchevsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Widen logs dialog and simplify settings controls #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 55 additions & 91 deletions webui/src/components/LogDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ import {
} from '@/components/ui/dialog'
import { Badge } from '@/components/ui/badge'
import { instancesApi } from '@/lib/api'
import {
RefreshCw,
Download,
Copy,
CheckCircle,
import {
RefreshCw,
Download,
Copy,
CheckCircle,
AlertCircle,
Loader2,
Settings
Loader2
} from 'lucide-react'

interface LogsDialogProps {
Expand All @@ -41,8 +40,7 @@ const LogsDialog: React.FC<LogsDialogProps> = ({
const [lineCount, setLineCount] = useState(100)
const [autoRefresh, setAutoRefresh] = useState(false)
const [copied, setCopied] = useState(false)
const [showSettings, setShowSettings] = useState(false)


const logContainerRef = useRef<HTMLDivElement>(null)
const refreshIntervalRef = useRef<NodeJS.Timeout | null>(null)

Expand Down Expand Up @@ -130,12 +128,6 @@ const LogsDialog: React.FC<LogsDialogProps> = ({
setLineCount(num)
}

// Apply new line count
const applyLineCount = () => {
void fetchLogs(lineCount)
setShowSettings(false)
}

// Format logs with basic syntax highlighting
const formatLogs = (logText: string) => {
if (!logText) return ''
Expand Down Expand Up @@ -169,7 +161,7 @@ const LogsDialog: React.FC<LogsDialogProps> = ({

return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="sm:max-w-4xl max-w-[calc(100%-2rem)] max-h-[80vh] flex flex-col">
<DialogContent className="sm:max-w-6xl max-w-[calc(100%-2rem)] max-h-[80vh] flex flex-col">
<DialogHeader>
<div className="flex items-center justify-between">
<div>
Expand All @@ -183,70 +175,9 @@ const LogsDialog: React.FC<LogsDialogProps> = ({
Instance logs and output
</DialogDescription>
</div>

<div className="flex items-center gap-2">
<Button
variant="outline"
size="sm"
onClick={() => setShowSettings(!showSettings)}
>
<Settings className="h-4 w-4" />
</Button>

<Button
variant="outline"
size="sm"
onClick={() => void fetchLogs(lineCount)}
disabled={loading}
>
{loading ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<RefreshCw className="h-4 w-4" />
)}
</Button>
</div>
</div>
</DialogHeader>

{/* Settings Panel */}
{showSettings && (
<div className="border rounded-lg p-4 bg-muted/50">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2">
<Label htmlFor="lineCount">Lines:</Label>
<Input
id="lineCount"
type="number"
value={lineCount}
onChange={(e) => handleLineCountChange(e.target.value)}
className="w-24"
min="1"
max="10000"
/>
</div>

<div className="flex items-center gap-2">
<input
type="checkbox"
id="autoRefresh"
checked={autoRefresh}
onChange={(e) => setAutoRefresh(e.target.checked)}
disabled={!isRunning}
className="rounded"
/>
<Label htmlFor="autoRefresh">
Auto-refresh {!isRunning && '(instance not running)'}
</Label>
</div>

<Button size="sm" onClick={applyLineCount}>
Apply
</Button>
</div>
</div>
)}

{/* Log Content */}
<div className="flex-1 flex flex-col min-h-0">
{error && (
Expand All @@ -255,10 +186,10 @@ const LogsDialog: React.FC<LogsDialogProps> = ({
<span className="text-sm text-destructive">{error}</span>
</div>
)}
<div

<div
ref={logContainerRef}
className="flex-1 bg-gray-900 rounded-lg p-4 overflow-auto min-h-[400px] max-h-[500px]"
className="flex-1 bg-gray-900 rounded-lg p-4 overflow-auto min-h-[400px] max-h-[500px] mb-3"
>
{loading && !logs ? (
<div className="flex items-center justify-center h-full">
Expand All @@ -275,17 +206,50 @@ const LogsDialog: React.FC<LogsDialogProps> = ({
</div>
)}
</div>

{autoRefresh && isRunning && (
<div className="flex items-center gap-2 mt-2 text-sm text-muted-foreground">
<div className="w-2 h-2 bg-green-500 rounded-full animate-pulse"></div>
Auto-refreshing every 2 seconds
</div>
)}
</div>

<DialogFooter className="flex-shrink-0">
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-4 w-full flex-wrap">
<Button
variant="outline"
size="sm"
onClick={() => void fetchLogs(lineCount)}
disabled={loading}
>
{loading ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<RefreshCw className="h-4 w-4" />
)}
</Button>

<div className="flex items-center gap-2">
<Label htmlFor="lineCount">Lines:</Label>
<Input
id="lineCount"
type="number"
value={lineCount}
onChange={(e) => handleLineCountChange(e.target.value)}
className="w-24"
min="1"
max="10000"
/>
</div>

<div className="flex items-center gap-2">
<input
type="checkbox"
id="autoRefresh"
checked={autoRefresh}
onChange={(e) => setAutoRefresh(e.target.checked)}
disabled={!isRunning}
className="rounded"
/>
<Label htmlFor="autoRefresh">
Auto-refresh {!isRunning && '(instance not running)'}
</Label>
</div>

<Button
variant="outline"
onClick={() => void copyLogs()}
Expand All @@ -303,7 +267,7 @@ const LogsDialog: React.FC<LogsDialogProps> = ({
</>
)}
</Button>

<Button
variant="outline"
onClick={downloadLogs}
Expand All @@ -312,9 +276,9 @@ const LogsDialog: React.FC<LogsDialogProps> = ({
<Download className="h-4 w-4" />
Download
</Button>

<div className="flex-1" />

<Button onClick={() => onOpenChange(false)}>
Close
</Button>
Expand Down