Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix upload log list component

Tomas Valenta757200b54373
diff --git a/components/AgentLogFilesList.tsx b/components/AgentLogFilesList.tsx
deleted file mode 100644
index 07d3fa758..000000000
--- a/components/AgentLogFilesList.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-import {
- useCallback,
- useEffect,
- useMemo,
- useRef,
- useState,
-} from 'react'
-import {
- ChevronRight,
-} from 'lucide-react'
-import clsx from 'clsx'
-import { useRouter } from 'next/router'
-import Splitter, { SplitDirection } from '@devbookhq/splitter'
-
-import { log_files } from 'db/prisma'
-import { useUploadLogUpload } from 'hooks/useUploadLogUpload'
-import { useRenameLogUpload } from 'hooks/useRenameLogUpload'
-import LogFolderUploadButton from 'components/LogFolderUploadButton'
-import {
- LiteLogUpload,
- LiteLogFile,
-} from 'utils/agentLogs'
-import AgentLogFileContent from 'components/AgentLogFileContent'
-import UploadTree from 'components/UploadFiletree'
-import RenameLogUploadButton from 'components/RenameLogUploadButton'
-import { useLocalStorage } from 'hooks/useLocalStorage'
-
-export interface Props {
- logUploads: LiteLogUpload[]
- defaultProjectID: string
-}
-
-function AgentLogFilesList({
- logUploads,
- defaultProjectID,
-}: Props) {
- const [isUploading, setIsUploading] = useState(false)
- const [openLogUploads, setOpenLogUploads] = useState<{ [key: string]: boolean }>({})
- const [selectedLogFile, setSelectedLogFile] = useState<LiteLogFile>()
- const router = useRouter()
- const fileInput = useRef<HTMLInputElement>(null)
- const uploadFiles = useUploadLogUpload(defaultProjectID)
- const renameLogUpload = useRenameLogUpload()
- const [splitterSizes, setSplitterSizes] = useLocalStorage('log-file-list-splitter', [40, 60])
-
- // ID of the log upload that is being renamed.
- const [renamingLogUploadID, setIsRenamingLogUploadID] = useState('')
-
- // Just a helpful object to keep track of the renamed log uploads in the UI.
- const [renamedLogUploads, setRenamedLogUploads] = useState<{ [key: string]: string }>({})
-
- const setSizes = useCallback((_: number, sizes: number[]) => {
- setSplitterSizes(sizes)
- }, [setSplitterSizes])
-
- useEffect(function handleLogFileSelection() {
- const id = router.query.logFileID
- if (!id) return
- const logFile = logUploads.flatMap(logUpload => logUpload.log_files).find(f => f.id === id)
- setSelectedLogFile(logFile)
- if (logFile) {
- const logUpload = logUploads.find(lu => lu.log_files.some(f => f.id === id))
- if (logUpload) {
- setOpenLogUploads(prev => ({
- ...prev,
- [logUpload.id]: true,
- }))
- }
- }
- }, [router.query, logUploads, setSelectedLogFile, setOpenLogUploads])
-
- const sortedLogUploads = useMemo(() => logUploads
- // logUploads sorted by created_at - the newest first
- .sort((a, b) => {
- if (a.created_at > b.created_at) return -1
- if (a.created_at < b.created_at) return 1
- return 0
- })
- // Sort the log_files inside logUploads alphabtetical by relativePath
- .map(logUpload => {
- const sortedLogFiles = logUpload.log_files.sort((a, b) => {
- if (a.relativePath > b.relativePath) return 1
- if (a.relativePath < b.relativePath) return -1
- return 0
- })
-
- return {
- ...logUpload,
- log_files: sortedLogFiles,
- }
- }), [logUploads])
-
- function handleClickOnUpload() {
- // trigger the click event of the file input
- fileInput.current?.click()
- }
-
- async function handleUpload(files: FileList) {
- const logFiles: Pick<log_files, 'content' | 'filename' | 'relativePath' | 'last_modified'>[] = []
-
- for (let i = 0; i < files.length; i++) {
- const file = files[i]
- const content = await file.text()
-
- if (file.name.startsWith('.')) continue
-
- logFiles.push({
- filename: file.name,
- relativePath: file.webkitRelativePath,
- content,
- last_modified: new Date(file.lastModified),
- })
- }
-
- await uploadFiles(logFiles)
- // Reload to refresh the list of log files
- router.reload()
- }
-
- async function handleFileChange(event: any) {
- if (event.target.files.length === 0) return
- setIsUploading(true)
- await handleUpload(event.target.files)
- setIsUploading(false)
- }
-
- function toggleLogUpload(logUploadID: string) {
- if (openLogUploads[logUploadID]) {
- setOpenLogUploads(prev => ({
- ...prev,
- [logUploadID]: false,
- }))
- } else {
- setOpenLogUploads(prev => ({
- ...prev,
- [logUploadID]: true,
- }))
- }
- }
-
- async function handleRenameLogUpload(logUploadID: string) {
- if (renamingLogUploadID) return
-
- const newName = prompt('Enter a new name for the logs')
- if (!newName) return
-
- setIsRenamingLogUploadID(logUploadID)
- try {
- await renameLogUpload({ logUploadID, displayName: newName })
- setRenamedLogUploads(val => ({
- ...val,
- [logUploadID]: newName,
- }))
- } catch (err: any) {
- console.error(`failed to rename log upload ${logUploadID}`)
- console.error(err)
- }
- setIsRenamingLogUploadID('')
- }
-
- return (
- <main className="rounded-md overflow-hidden flex flex-col max-h-full flex-1">
- <input
- type="file"
- style={{ display: 'none' }}
- ref={fileInput}
- onChange={handleFileChange}
- // @ts-ignore
- directory=""
- webkitdirectory=""
- mozdirectory=""
- allowdirs=""
- multiple
- />
- <header className="flex items-center justify-between px-4 py-2 border-b border-b-white/5">
- <h1 className="text-xl font-semibold text-white">Log Files</h1>
- <LogFolderUploadButton
- onClick={handleClickOnUpload}
- isUploading={isUploading}
- />
- </header>
-
- {sortedLogUploads.length === 0 && (
- <div
- className="flex items-center justify-center flex-1"
- >
- <p className="text-gray-400 text-lg">No log files uploaded yet</p>
- </div>
- )}
-
- <div className="my-4 overflow-hidden flex flex-col flex-1">
- {sortedLogUploads.length > 0 && (
- <Splitter
- gutterClassName={clsx(
- 'bg-gray-900 hover:bg-[#6366F1] transition-all delay-75 duration-[400ms] px-0.5 rounded-sm group',
- )}
- draggerClassName={clsx(
- 'bg-white/5 group-hover:bg-[#6366F1] transition-all delay-75 duration-[400ms] w-0.5 h-full',
- )}
- direction={SplitDirection.Horizontal}
- classes={['flex pr-2 overflow-auto', 'bg-gray-900 flex pl-2']}
- initialSizes={splitterSizes}
- onResizeFinished={setSizes}
- minWidths={[120, 120]}
- >
- <div className="flex flex-col space-y-4 sm:px-4 lg:px-8 flex-1 relative">
- {sortedLogUploads.map((logUpload, i) => (
- <div
- key={logUpload.id}
- >
- <div
- className="flex flex-col space-y-2 flex-1"
- >
- <div className="flex items-center space-x-2">
- <button
- className={clsx(
- 'h-6 w-6 flex items-center justify-center px-1 cursor-pointer hover:bg-[#6366F1] transition-all rounded-md',
- openLogUploads[logUpload.id] && 'bg-[#6366F1] text-gray-200',
- !openLogUploads[logUpload.id] && 'bg-[#1F2437] text-gray-200',
- )}
- onClick={() => toggleLogUpload(logUpload.id)}
- >
- <ChevronRight size={14} className={clsx(
- 'transition-all',
- 'select-none',
- openLogUploads[logUpload.id] && 'rotate-90',
- )} />
- </button>
-
- <RenameLogUploadButton
- isRenaming={renamingLogUploadID === logUpload.id}
- onClick={() => handleRenameLogUpload(logUpload.id)}
- />
-
- <span
- className={clsx(
- 'text-sm',
- 'font-semibold',
- 'text-gray-200',
- 'whitespace-nowrap',
- )}
- // This prevents hydration warning for timestamps rendered via SSR
- suppressHydrationWarning
- >
- {logUpload.display_name && !renamedLogUploads[logUpload.id] && logUpload.display_name}
- {logUpload.display_name && renamedLogUploads[logUpload.id] && renamedLogUploads[logUpload.id]}
- {!logUpload.display_name && (
- `Upload from ${logUpload.created_at.toLocaleString()}`
- )}
- </span>
- </div>
-
- {openLogUploads[logUpload.id] && (
- <div className="flex flex-col space-y-3 border-l border-white/5 pl-2 ml-[11px] flex-1">
- <UploadTree
- log={logUpload}
- selectedLogFile={logUpload.id === selectedLogFile?.log_upload_id ? selectedLogFile : undefined}
- />
- </div>
- )}
- </div>
- </div>
- ))}
- </div>
- <AgentLogFileContent
- logFile={selectedLogFile}
- />
- </Splitter>
- )}
- </div>
- </main >
- )
-}
-
-export default AgentLogFilesList
diff --git a/components/AgentLogFilesList/UploadedLogsDetail.tsx b/components/AgentLogFilesList/UploadedLogsDetail.tsx
new file mode 100644
index 000000000..85cc5f306
--- /dev/null
+++ b/components/AgentLogFilesList/UploadedLogsDetail.tsx
@@ -0,0 +1,102 @@
+import clsx from 'clsx'
+import { ChevronRight } from 'lucide-react'
+import { useEffect, useState } from 'react'
+import { useRouter } from 'next/router'
+
+import RenameLogUploadButton from 'components/RenameLogUploadButton'
+import UploadTree from 'components/UploadFiletree'
+import { useRenameLogUpload } from 'hooks/useRenameLogUpload'
+import { LiteLogFile, LiteLogUpload } from 'utils/agentLogs'
+
+export interface Props {
+ logUpload: LiteLogUpload
+ onSelectLogFile: (logFile: LiteLogFile) => void
+ selectedLogFile?: LiteLogFile
+}
+
+function UploadedLogsDetail({ logUpload, onSelectLogFile, selectedLogFile }: Props) {
+ const [isOpen, setIsOpen] = useState(false)
+ const router = useRouter()
+ const renameLogUpload = useRenameLogUpload()
+ const [uploadName, setUploadName] = useState(logUpload.display_name || `Upload from ${logUpload.created_at.toLocaleString()}`)
+ const [isRenaming, setIsRenaming] = useState(false)
+ const openLogFile = logUpload.id === selectedLogFile?.log_upload_id ? selectedLogFile : undefined
+
+ useEffect(function handleLogFileSelection() {
+ const id = router.query.logFileID
+ if (!id) return
+ const logFile = logUpload.log_files.find(f => f.id === id)
+ if (!logFile) return
+ onSelectLogFile(logFile)
+ setIsOpen(true)
+ }, [router.query, logUpload, onSelectLogFile])
+
+ async function handleRenameLogUpload() {
+ const newName = prompt('Enter a new name for the logs')
+ if (!newName) return
+
+ setUploadName(newName)
+ try {
+ setIsRenaming(true)
+ await renameLogUpload({ logUploadID: logUpload.id, displayName: newName })
+ } catch (err) {
+ console.error(`failed to rename log upload ${logUpload.id}`, err)
+ } finally {
+ setIsRenaming(false)
+ }
+ }
+
+ return (
+ <div>
+ <div className="flex flex-col space-y-2 flex-1">
+ <div className="flex items-center space-x-2">
+ <button
+ className={clsx(
+ 'h-6 w-6 flex items-center justify-center px-1 cursor-pointer hover:bg-[#6366F1] transition-all rounded-md',
+ {
+ 'bg-[#6366F1] text-gray-200': isOpen,
+ 'bg-[#1F2437] text-gray-200': !isOpen,
+ },
+ )}
+ onClick={() => setIsOpen(o => !o)}
+ >
+ <ChevronRight size={14} className={clsx(
+ 'transition-all',
+ 'select-none',
+ { 'rotate-90': isOpen },
+ )} />
+ </button>
+
+ <RenameLogUploadButton
+ isRenaming={isRenaming}
+ onClick={handleRenameLogUpload}
+ />
+
+ <span
+ className={clsx(
+ 'text-sm',
+ 'font-semibold',
+ 'text-gray-200',
+ 'whitespace-nowrap',
+ )}
+ // This prevents hydration warning for timestamps rendered via SSR
+ suppressHydrationWarning
+ >
+ {uploadName}
+ </span>
+ </div>
+
+ {isOpen && (
+ <div className="flex flex-col space-y-3 border-l border-white/5 pl-2 ml-[11px] flex-1">
+ <UploadTree
+ log={logUpload}
+ selectedLogFile={openLogFile}
+ />
+ </div>
+ )}
+ </div>
+ </div>
+ )
+}
+
+export default UploadedLogsDetail
diff --git a/components/AgentLogFilesList/index.tsx b/components/AgentLogFilesList/index.tsx
index 4328857cc..8df88887c 100644
--- a/components/AgentLogFilesList/index.tsx
+++ b/components/AgentLogFilesList/index.tsx
@@ -1,26 +1,20 @@
import {
useCallback,
- useEffect,
useMemo,
useState,
} from 'react'
-import {
- ChevronRight,
-} from 'lucide-react'
import clsx from 'clsx'
-import { useRouter } from 'next/router'
import Splitter, { SplitDirection } from '@devbookhq/splitter'
-import { useRenameLogUpload } from 'hooks/useRenameLogUpload'
import {
- LiteLogUpload,
LiteLogFile,
+ LiteLogUpload,
} from 'utils/agentLogs'
import AgentLogFileContent from 'components/AgentLogFileContent'
-import UploadTree from 'components/UploadFiletree'
-import RenameLogUploadButton from 'components/RenameLogUploadButton'
import { useLocalStorage } from 'hooks/useLocalStorage'
+
import Upload from './Upload'
+import UploadedLogsDetail from './UploadedLogsDetail'
export interface Props {
logUploads: LiteLogUpload[]
@@ -31,38 +25,13 @@ function AgentLogFilesList({
logUploads,
defaultProjectID,
}: Props) {
- const [openLogUploads, setOpenLogUploads] = useState<{ [key: string]: boolean }>({})
- const [selectedLogFile, setSelectedLogFile] = useState<LiteLogFile>()
- const router = useRouter()
- const renameLogUpload = useRenameLogUpload()
const [splitterSizes, setSplitterSizes] = useLocalStorage('log-file-list-splitter', [40, 60])
-
- // ID of the log upload that is being renamed.
- const [renamingLogUploadID, setIsRenamingLogUploadID] = useState('')
-
- // Just a helpful object to keep track of the renamed log uploads in the UI.
- const [renamedLogUploads, setRenamedLogUploads] = useState<{ [key: string]: string }>({})
+ const [selectedLogFile, setSelectedLogFile] = useState<LiteLogFile>()
const setSizes = useCallback((_: number, sizes: number[]) => {
setSplitterSizes(sizes)
}, [setSplitterSizes])
- useEffect(function handleLogFileSelection() {
- const id = router.query.logFileID
- if (!id) return
- const logFile = logUploads.flatMap(logUpload => logUpload.log_files).find(f => f.id === id)
- setSelectedLogFile(logFile)
- if (logFile) {
- const logUpload = logUploads.find(lu => lu.log_files.some(f => f.id === id))
- if (logUpload) {
- setOpenLogUploads(prev => ({
- ...prev,
- [logUpload.id]: true,
- }))
- }
- }
- }, [router.query, logUploads, setSelectedLogFile, setOpenLogUploads])
-
const sortedLogUploads = useMemo(() => logUploads
// logUploads sorted by created_at - the newest first
.sort((a, b) => {
@@ -77,47 +46,12 @@ function AgentLogFilesList({
if (a.relativePath < b.relativePath) return -1
return 0
})
-
return {
...logUpload,
log_files: sortedLogFiles,
}
}), [logUploads])
- function toggleLogUpload(logUploadID: string) {
- if (openLogUploads[logUploadID]) {
- setOpenLogUploads(prev => ({
- ...prev,
- [logUploadID]: false,
- }))
- } else {
- setOpenLogUploads(prev => ({
- ...prev,
- [logUploadID]: true,
- }))
- }
- }
-
- async function handleRenameLogUpload(logUploadID: string) {
- if (renamingLogUploadID) return
-
- const newName = prompt('Enter a new name for the logs')
- if (!newName) return
-
- setIsRenamingLogUploadID(logUploadID)
- try {
- await renameLogUpload({ logUploadID, displayName: newName })
- setRenamedLogUploads(val => ({
- ...val,
- [logUploadID]: newName,
- }))
- } catch (err: any) {
- console.error(`failed to rename log upload ${logUploadID}`)
- console.error(err)
- }
- setIsRenamingLogUploadID('')
- }
-
return (
<main className="rounded-md border-white/5 border overflow-hidden pb-6 flex flex-col max-h-full flex-1">
<header className="flex items-center justify-between py-4 sm:px-6 lg:px-8 border-b border-b-white/5">
@@ -148,60 +82,14 @@ function AgentLogFilesList({
onResizeFinished={setSizes}
minWidths={[120, 120]}
>
- <div className="flex flex-col space-y-4 sm:px-4 lg:px-8 flex-1 relative">
- {sortedLogUploads.map((logUpload, i) => (
- <div
+ <div className="flex flex-col sm:px-4 lg:px-8 flex-1 relative space-y-4">
+ {sortedLogUploads.map(logUpload => (
+ <UploadedLogsDetail
+ logUpload={logUpload}
key={logUpload.id}
- className="flex flex-col space-y-2 flex-1"
- >
- <div className="flex items-center space-x-2">
- <button
- className={clsx(
- 'h-6 w-6 flex items-center justify-center px-1 cursor-pointer hover:bg-[#6366F1] transition-all rounded-md',
- openLogUploads[logUpload.id] && 'bg-[#6366F1] text-gray-200',
- !openLogUploads[logUpload.id] && 'bg-[#1F2437] text-gray-200',
- )}
- onClick={() => toggleLogUpload(logUpload.id)}
- >
- <ChevronRight size={14} className={clsx(
- 'transition-all',
- 'select-none',
- openLogUploads[logUpload.id] && 'rotate-90',
- )} />
- </button>
-
- <RenameLogUploadButton
- isRenaming={renamingLogUploadID === logUpload.id}
- onClick={() => handleRenameLogUpload(logUpload.id)}
- />
-
- <span
- className={clsx(
- 'text-sm',
- 'font-semibold',
- 'text-gray-200',
- 'whitespace-nowrap',
- )}
- // This prevents hydration warning for timestamps rendered via SSR
- suppressHydrationWarning
- >
- {logUpload.display_name && !renamedLogUploads[logUpload.id] && logUpload.display_name}
- {logUpload.display_name && renamedLogUploads[logUpload.id] && renamedLogUploads[logUpload.id]}
- {!logUpload.display_name && (
- `Upload from ${logUpload.created_at.toLocaleString()}`
- )}
- </span>
- </div>
-
- {openLogUploads[logUpload.id] && (
- <div className="flex flex-col space-y-3 border-l border-white/5 pl-2 ml-[11px] flex-1">
- <UploadTree
- log={logUpload}
- selectedLogFile={logUpload.id === selectedLogFile?.log_upload_id ? selectedLogFile : undefined}
- />
- </div>
- )}
- </div>
+ onSelectLogFile={setSelectedLogFile}
+ selectedLogFile={selectedLogFile}
+ />
))}
</div>
<AgentLogFileContent
diff --git a/filesystem/filesystem.ts b/filesystem/filesystem.ts
index a8672fcd3..fb8e385b8 100644
--- a/filesystem/filesystem.ts
+++ b/filesystem/filesystem.ts
@@ -5,7 +5,7 @@ import { logger } from '../utils/logger'
import Dir from './dir'
import Node, { NodeType } from './node'
-const log = logger('filesystem')
+const log = logger('filesystem', 'orange', false)
type DirListener = (path: string, children: IterableIterator<Node>) => void
type MetadataListener<T = any> = (path: string, {
diff --git a/utils/logger.ts b/utils/logger.ts
index 27d39c69a..2dbc20230 100644
--- a/utils/logger.ts
+++ b/utils/logger.ts
@@ -1,5 +1,6 @@
-export function logger(namespace: string, color: string = 'orange') {
+export function logger(namespace: string, color: string = 'orange', enabled: boolean = true) {
return function (...args: any[]) {
+ if (!enabled) return
console.groupCollapsed(`%c[${namespace}]`, `color:${color};`, ...args)
console.trace()
console.groupEnd()