Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Fix FS expansion for links to opened log files

Tomas Valenta66846efc39d5
diff --git a/components/AgentLogFileContent.tsx b/components/AgentLogFileContent.tsx
index 6271f69ac..096811393 100644
--- a/components/AgentLogFileContent.tsx
+++ b/components/AgentLogFileContent.tsx
@@ -5,20 +5,20 @@ import { useRouter } from 'next/router'
import Splitter from '@devbookhq/splitter'
import clsx from 'clsx'
-import { log_files } from 'db/prisma'
import {
SystemPromptLog,
UserPromptLog,
AssistantPromptLog,
AgentPromptLogs,
AgentNextActionLog,
+ LiteLogFile,
} from 'utils/agentLogs'
import AgentPrompLogDetail from 'components/AgentPromptLogDetail'
import AgentPromptLogsList from 'components/AgentPromptLogsList'
import AgentNextActionLogDetail from 'components/AgentNextActionLogDetail'
export interface Props {
- logFile?: Omit<log_files, 'project_id' | 'type' | 'size' | 'log_upload_id' | 'content' | 'last_modified'> & { content: AgentPromptLogs | AgentNextActionLog }
+ logFile?: LiteLogFile
}
function AgentLogFileContent({
diff --git a/components/AgentLogFilesList.tsx b/components/AgentLogFilesList.tsx
index 6445502d6..3d34ef4e2 100644
--- a/components/AgentLogFilesList.tsx
+++ b/components/AgentLogFilesList.tsx
@@ -1,4 +1,5 @@
import {
+ useEffect,
useMemo,
useRef,
useState,
@@ -15,8 +16,7 @@ import { useUploadLogs } from 'hooks/useUploadLogs'
import LogFolderUploadButton from 'components/LogFolderUploadButton'
import {
LiteLogUpload,
- AgentPromptLogs,
- AgentNextActionLog,
+ LiteLogFile,
} from 'utils/agentLogs'
import Spinner from 'components/Spinner'
import AgentLogFileContent from 'components/AgentLogFileContent'
@@ -32,16 +32,27 @@ function AgentLogFilesList({
defaultProjectID,
}: Props) {
const [isUploading, setIsUploading] = useState(false)
- const [openedLogUploads, setOpeneLogUploads] = useState<string[]>([])
+ const [openLogUploads, setOpenLogUploads] = useState<{ [key: string]: boolean }>({})
+ const [selectedLogFile, setSelectedLogFile] = useState<LiteLogFile>()
const router = useRouter()
const fileInput = useRef<HTMLInputElement>(null)
const uploadFiles = useUploadLogs(defaultProjectID)
- const selectedLogFile = useMemo<undefined | Omit<log_files, 'project_id' | 'type' | 'size' | 'log_upload_id' | 'content' | 'last_modified'> & { content: AgentPromptLogs | AgentNextActionLog }>(() => {
- const id = router.query.logFileID || router.query.logfileid
+ useEffect(function handleLogFileSelection() {
+ const id = router.query.logFileID
if (!id) return
- return logUploads.flatMap(logUpload => logUpload.log_files).find(f => f.id === id)
- }, [router.query, logUploads])
+ 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
@@ -101,10 +112,16 @@ function AgentLogFilesList({
}
function toggleLogUpload(logUploadID: string) {
- if (openedLogUploads.includes(logUploadID)) {
- setOpeneLogUploads(prev => prev.filter(id => id !== logUploadID))
+ if (openLogUploads[logUploadID]) {
+ setOpenLogUploads(prev => ({
+ ...prev,
+ [logUploadID]: false,
+ }))
} else {
- setOpeneLogUploads(prev => [...prev, logUploadID])
+ setOpenLogUploads(prev => ({
+ ...prev,
+ [logUploadID]: true,
+ }))
}
}
@@ -164,8 +181,8 @@ function AgentLogFilesList({
<div
className={clsx(
'p-1 cursor-pointer hover:bg-gray-700 transition-all rounded-md',
- openedLogUploads.includes(logUpload.id) && 'bg-gray-700',
- !openedLogUploads.includes(logUpload.id) && 'bg-gray-800',
+ openLogUploads[logUpload.id] && 'bg-gray-700',
+ !openLogUploads[logUpload.id] && 'bg-gray-800',
)}
onClick={() => toggleLogUpload(logUpload.id)}
>
@@ -173,7 +190,7 @@ function AgentLogFilesList({
'text-gray-400',
'transition-all',
'select-none',
- openedLogUploads.includes(logUpload.id) && 'rotate-90',
+ openLogUploads[logUpload.id] && 'rotate-90',
)} />
</div>
<span
@@ -190,10 +207,11 @@ function AgentLogFilesList({
</span>
</div>
- {openedLogUploads.includes(logUpload.id) && (
+ {openLogUploads[logUpload.id] && (
<div className="flex flex-col space-y-3 border-l border-gray-800 pl-2 ml-[11px] flex-1">
<UploadTree
logUpload={logUpload}
+ selectedLogFile={logUpload.id === selectedLogFile?.log_upload_id ? selectedLogFile : undefined}
/>
</div>
)}
diff --git a/components/Filesystem/Dir.tsx b/components/Filesystem/Dir.tsx
index 127273dbe..9301f6fd8 100644
--- a/components/Filesystem/Dir.tsx
+++ b/components/Filesystem/Dir.tsx
@@ -60,8 +60,9 @@ function Dir({
'rounded',
'space-x-1',
'cursor-pointer',
- 'hover:bg-gray-700/80',
+ 'border-gray-800',
'text-gray-300',
+ 'hover:bg-gray-700/80',
{ 'bg-gray-700': isSelected },
{ 'bg-transparent': !isSelected },
)}
@@ -82,7 +83,7 @@ function Dir({
ml-[11px]
pl-3
border-l
- border-gray-700
+ border-gray-800
"
>
{children}
diff --git a/components/Filesystem/File.tsx b/components/Filesystem/File.tsx
index e9deccec4..3a1d6d416 100644
--- a/components/Filesystem/File.tsx
+++ b/components/Filesystem/File.tsx
@@ -11,6 +11,7 @@ import {
FileProps,
NodeType,
} from '../../filesystem'
+import { useRouter } from 'next/router'
function File({
name,
@@ -20,6 +21,9 @@ function File({
metadata,
fs,
}: FileProps) {
+ const router = useRouter()
+ const isSelectedViaRouter = router.query.logFileID === metadata['href']['query']['logFileID']
+
function handleOnClick(e: any) {
// This conditions prevents deselecting when user clicks on a file that's already selected.
if (filePath !== fs.selectedPath) {
@@ -78,8 +82,8 @@ function File({
'items-center',
'space-x-1',
'hover:bg-gray-700/80',
- { 'bg-gray-700': isSelected },
- { 'bg-transparent': !isSelected }
+ { 'bg-gray-700': isSelected || isSelectedViaRouter },
+ { 'bg-transparent': !isSelected && !isSelectedViaRouter }
)}
onClick={handleOnClick}
shallow
diff --git a/components/Filesystem/index.tsx b/components/Filesystem/index.tsx
index f42ad9fcb..29b4f44ec 100644
--- a/components/Filesystem/index.tsx
+++ b/components/Filesystem/index.tsx
@@ -3,6 +3,7 @@ import {
useEffect,
} from 'react'
import clsx from 'clsx'
+import path from 'path-browserify'
import FilesystemPrimitive, {
DirNode,
@@ -28,6 +29,7 @@ export interface Props {
ignore?: string[]
onFiletreeClick?: (path: string, type: NodeType) => void
fetchContent: (dirpath: string) => (FileInfo & { id?: string })[]
+ expandedPath?: string
}
function Filesystem({
@@ -36,9 +38,9 @@ function Filesystem({
ignore,
fetchContent,
onFiletreeClick,
+ expandedPath,
}: Props) {
const fs = useFilesystem({ rootPath })
-
const fetchDirContent = useCallback(async (dirpath: string) => {
const files = fetchContent(dirpath)
const ns = files.map(f => (f.isDir
@@ -96,6 +98,23 @@ function Filesystem({
fetchDirContent,
],)
+ useEffect(function expandPath() {
+ if (expandedPath) {
+ const dir = path.dirname(expandedPath)
+ dir.split('/').forEach((v, i, a) => {
+ const currentDir = a.slice(0, i + 1).join('/') || '/'
+ fetchDirContent(currentDir)
+ if (currentDir === '/') return
+ fs.setIsDirExpanded(currentDir, true)
+ })
+ }
+ }, [
+ fs,
+ handleNodeSelect,
+ fetchDirContent,
+ expandedPath,
+ ])
+
useEffect(function mountFilesystem() {
fetchDirContent(rootPath)
}, [
diff --git a/components/Uploadtree/index.tsx b/components/Uploadtree/index.tsx
index 45600f98b..d9be6a4df 100644
--- a/components/Uploadtree/index.tsx
+++ b/components/Uploadtree/index.tsx
@@ -2,18 +2,17 @@ import { useCallback } from 'react'
import path from 'path-browserify'
import Filesystem, { FileInfo } from 'components/Filesystem'
-import { AgentNextActionLog, AgentPromptLogs, LiteLogUpload } from 'utils/agentLogs'
+import { LiteLogFile, LiteLogUpload } from 'utils/agentLogs'
import { FiletreeProvider } from 'hooks/useFiletree'
-import { log_files } from 'db/prisma'
export interface Props {
logUpload: LiteLogUpload
- onFileSelect?: (file: Omit<log_files, 'project_id' | 'type' | 'size' | 'log_upload_id' | 'content' | 'last_modified'> & { content: AgentPromptLogs | AgentNextActionLog }) => void
+ selectedLogFile?: LiteLogFile
}
function UploadTree({
logUpload,
- onFileSelect,
+ selectedLogFile,
}: Props) {
const fetchLogDirContent = useCallback<(dirpath: string) => (FileInfo & { id?: string })[]>(dirpath => {
const currentDir = dirpath.slice(1)
@@ -61,16 +60,7 @@ function UploadTree({
<div className="flex flex-col items-start justify-start">
<FiletreeProvider>
<Filesystem
- // onFiletreeClick={(path, type) => {
- // console.log('select file', path, type)
- // const pathWithoutLeadingSlash = path.slice(1)
- // if (type === NodeType.File) {
- // const file = logUpload.log_files.find(f => f.relativePath === pathWithoutLeadingSlash)
- // if (file) {
- // onFileSelect(file)
- // }
- // }
- // }}
+ expandedPath={'/' + selectedLogFile?.relativePath}
rootPath='/'
fetchContent={fetchLogDirContent}
/>
diff --git a/pages/index.tsx b/pages/index.tsx
index c8225e373..f2135e43c 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -18,7 +18,7 @@ function getLastTwoDirsAndFile(fullPath: string): string {
return path.join(lastTwoDirs, fileName)
}
-function formatLogFileContent(logFile: Omit<log_files, 'project_id' | 'type' | 'size' | 'log_upload_id' | 'last_modified'>) {
+function formatLogFileContent(logFile: Omit<log_files, 'project_id' | 'type' | 'size' | 'last_modified'>) {
const parsedFileContent = JSON.parse(logFile.content)
const relativePath = getLastTwoDirsAndFile(logFile.relativePath)
@@ -100,6 +100,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
log_files: {
select: {
id: true,
+ log_upload_id: true,
created_at: true,
filename: true,
relativePath: true,
diff --git a/pages/log/[logFileID].tsx b/pages/log/[logFileID].tsx
index d5f9e0f6b..816ea45fb 100644
--- a/pages/log/[logFileID].tsx
+++ b/pages/log/[logFileID].tsx
@@ -6,7 +6,7 @@ import clsx from 'clsx'
import Splitter from '@devbookhq/splitter'
import Link from 'next/link'
-import { log_files, prisma } from 'db/prisma'
+import { prisma } from 'db/prisma'
import { serverCreds } from 'db/credentials'
import {
SystemPromptLog,
@@ -14,6 +14,7 @@ import {
AssistantPromptLog,
AgentPromptLogs,
AgentNextActionLog,
+ LiteLogFile,
} from 'utils/agentLogs'
import AgentPrompLogDetail from 'components/AgentPromptLogDetail'
import AgentPromptLogsList from 'components/AgentPromptLogsList'
@@ -25,7 +26,7 @@ interface PathProps extends ParsedUrlQuery {
}
export interface Props {
- logFile: Omit<log_files, 'content'> & { content: AgentPromptLogs | AgentNextActionLog }
+ logFile: LiteLogFile
}
export const getServerSideProps: GetServerSideProps<Props, PathProps> = async (ctx) => {
diff --git a/utils/agentLogs.ts b/utils/agentLogs.ts
index 946354107..29274084c 100644
--- a/utils/agentLogs.ts
+++ b/utils/agentLogs.ts
@@ -1,7 +1,11 @@
import { log_files, log_uploads } from 'db/prisma'
+export interface LiteLogFile extends Omit<log_files, 'project_id' | 'type' | 'size' | 'content' | 'last_modified'> {
+ content: AgentPromptLogs | AgentNextActionLog
+}
+
export interface LiteLogUpload extends Omit<log_uploads, 'log_files' | 'project_id'> {
- log_files: (Omit<log_files, 'project_id' | 'type' | 'size' | 'log_upload_id' | 'content' | 'last_modified'> & { content: AgentPromptLogs | AgentNextActionLog })[]
+ log_files: LiteLogFile[]
}
export interface AgentPromptLogs {