Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Finish dashboard for deployment logs [WIP]

Tomas Valenta46ee7a6f4b92
diff --git a/components/AgentDeploymentLogList.tsx b/components/AgentDeploymentLogList.tsx
new file mode 100644
index 000000000..132228b67
--- /dev/null
+++ b/components/AgentDeploymentLogList.tsx
@@ -0,0 +1,130 @@
+import {
+ useMemo,
+ useState,
+} from 'react'
+import {
+ ChevronRight,
+} from 'lucide-react'
+import clsx from 'clsx'
+
+import {
+ LiteDeployment,
+} from 'utils/agentLogs'
+
+import UploadTree from './UploadFiletree'
+
+export interface Props {
+ deployments: LiteDeployment[]
+}
+
+function AgentDeploymentLogList({
+ deployments,
+}: Props) {
+ const [openDeployments, setOpenDeployments] = useState<{ [key: string]: boolean }>({})
+ const sortedDeployments = useMemo(() => deployments
+ // deployments 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(d => {
+ const sortedLogs = d.log_files.sort((a, b) => {
+ if (a.relativePath > b.relativePath) return 1
+ if (a.relativePath < b.relativePath) return -1
+ return 0
+ })
+
+ return {
+ ...d,
+ log_files: sortedLogs,
+ }
+ }), [deployments])
+
+ function toggleDeployments(logUploadID: string) {
+ if (openDeployments[logUploadID]) {
+ setOpenDeployments(prev => ({
+ ...prev,
+ [logUploadID]: false,
+ }))
+ } else {
+ setOpenDeployments(prev => ({
+ ...prev,
+ [logUploadID]: true,
+ }))
+ }
+ }
+
+ return (
+ <main className="overflow-hidden flex flex-col max-h-full flex-1">
+ <header className="flex items-center justify-between p-4 sm:p-6 lg:px-8 min-h-[88px]">
+ <h1 className="text-2xl font-semibold text-white">Agent Deployments</h1>
+ </header>
+ {sortedDeployments.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>
+ )}
+
+ {sortedDeployments.length > 0 && (
+ <div className="flex-col space-y-4 py-2 sm:px-4 lg:px-8 flex-1 flex pr-2 overflow-auto">
+ {sortedDeployments.map(deployment => (
+ <div
+ key={deployment.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-gray-700 transition-all rounded-md',
+ openDeployments[deployment.id] && 'bg-gray-700',
+ !openDeployments[deployment.id] && 'bg-gray-800',
+ )}
+ onClick={() => toggleDeployments(deployment.id)}
+ >
+ <ChevronRight size={14} className={clsx(
+ 'text-gray-400',
+ 'transition-all',
+ 'select-none',
+ openDeployments[deployment.id] && 'rotate-90',
+ )} />
+ </button>
+ <span
+ className={clsx(
+ 'text-sm',
+ 'font-semibold',
+ 'text-gray-200',
+ 'whitespace-nowrap',
+ )}
+ // This prevents hydration warning for timestamps rendered via SSR
+ suppressHydrationWarning
+ >
+ {deployment.enabled}
+ <span>
+ {deployment.projects.name}
+ </span>
+ </span>
+ </div>
+
+ {openDeployments[deployment.id] && (
+ <div className="flex flex-col space-y-3 border-l border-gray-800 pl-2 ml-[11px] flex-1">
+ <UploadTree
+ log={deployment}
+ />
+ </div>
+ )}
+ </div>
+ </div>
+ ))}
+ </div>
+ )}
+ </main >
+ )
+}
+
+export default AgentDeploymentLogList
diff --git a/components/AgentLogFilesList.tsx b/components/AgentLogFilesList.tsx
index 3acf6b979..a53130670 100644
--- a/components/AgentLogFilesList.tsx
+++ b/components/AgentLogFilesList.tsx
@@ -272,7 +272,7 @@ function AgentLogFilesList({
{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}
+ log={logUpload}
selectedLogFile={logUpload.id === selectedLogFile?.log_upload_id ? selectedLogFile : undefined}
/>
</div>
diff --git a/components/AuthForm.tsx b/components/AuthForm.tsx
index de33cb65a..973cca9c6 100644
--- a/components/AuthForm.tsx
+++ b/components/AuthForm.tsx
@@ -80,7 +80,6 @@ function AuthForm({ authType }: Props) {
useEffect(
function autofocusEmailInput() {
- console.log('user', user)
if (isLoading) return
if (!emailRef.current?.value) {
diff --git a/components/DashboardHome.tsx b/components/DashboardHome.tsx
index 55b32797c..df47a38b1 100644
--- a/components/DashboardHome.tsx
+++ b/components/DashboardHome.tsx
@@ -1,12 +1,14 @@
import AgentLogFilesList from 'components/AgentLogFilesList'
-import { deployments, projects } from 'db/prisma'
+import { projects } from 'db/prisma'
+import { useRouter } from 'next/router'
import { useMemo } from 'react'
-import { LiteLogUpload } from 'utils/agentLogs'
+import { LiteDeployment, LiteLogUpload } from 'utils/agentLogs'
+import AgentDeploymentLogList from './AgentDeploymentLogList'
export interface Props {
- projects: (projects & { log_uploads: LiteLogUpload[], deployments: deployments[] })[]
+ projects: (projects & { log_uploads: LiteLogUpload[], deployments: LiteDeployment[] })[]
defaultProjectID: string
- view: 'deployments' | 'uploads'
+ view: 'deployments' | 'logs'
}
function DashboardHome({
@@ -14,6 +16,8 @@ function DashboardHome({
defaultProjectID,
view,
}: Props) {
+ const router = useRouter()
+ const showView = router.query['view'] === 'logs' ? 'logs' : view
const projectsWithDeployments = useMemo(() => projects
.filter(p => {
@@ -22,7 +26,7 @@ function DashboardHome({
const deployment = p.deployments[0]
const auth = deployment.auth as any
if (!auth) return false
- return deployment.enabled
+ return true
})
.map(p => ({
project: p,
@@ -31,13 +35,12 @@ function DashboardHome({
return (
<>
- {view === 'deployments' &&
- <AgentLogFilesList
- logUploads={projects.flatMap(p => p.deployments)}
- defaultProjectID={defaultProjectID}
+ {showView === 'deployments' &&
+ <AgentDeploymentLogList
+ deployments={projectsWithDeployments.flatMap(p => p.deployment)}
/>
}
- {view === 'uploads' &&
+ {showView === 'logs' &&
<AgentLogFilesList
logUploads={projects.flatMap(p => p.log_uploads)}
defaultProjectID={defaultProjectID}
diff --git a/components/Feedback/FeedbackModal.tsx b/components/Feedback/FeedbackModal.tsx
index 458bfc8b4..bb51ef855 100644
--- a/components/Feedback/FeedbackModal.tsx
+++ b/components/Feedback/FeedbackModal.tsx
@@ -40,7 +40,7 @@ function FeedbackModal({ isOpen, onClose, onSend }: Props) {
}
return (
- <div className="relative flex flex-row-reverse pt-1">
+ <div className="relative flex flex-row-reverse">
{isOpen &&
<form
ref={ref}
@@ -50,6 +50,7 @@ function FeedbackModal({ isOpen, onClose, onSend }: Props) {
className="
flex
p-3
+ mt-1
border
z-50
bg-gray-900
diff --git a/components/Feedback/index.tsx b/components/Feedback/index.tsx
index 2fc2adaec..660d2d317 100644
--- a/components/Feedback/index.tsx
+++ b/components/Feedback/index.tsx
@@ -10,22 +10,20 @@ function Feedback() {
return (
<div className="flex flex-col items-end flex-1">
- <div>
- <FeedbackButton
- isOpen={isFeedbackVisible || isFinished}
- onClick={(e) => {
- e.preventDefault()
- e.stopPropagation()
- setIsFeedbackVisible(f => !f)
- }}
- isFinished={isFinished}
- />
- <FeedbackModal
- onSend={() => setIsFinished(true)}
- isOpen={isFeedbackVisible}
- onClose={() => setIsFeedbackVisible(false)}
- />
- </div>
+ <FeedbackButton
+ isOpen={isFeedbackVisible || isFinished}
+ onClick={(e) => {
+ e.preventDefault()
+ e.stopPropagation()
+ setIsFeedbackVisible(f => !f)
+ }}
+ isFinished={isFinished}
+ />
+ <FeedbackModal
+ onSend={() => setIsFinished(true)}
+ isOpen={isFeedbackVisible}
+ onClose={() => setIsFeedbackVisible(false)}
+ />
</div>
)
}
diff --git a/components/UploadFiletree.tsx b/components/UploadFiletree.tsx
index d9be6a4df..6d4e863a8 100644
--- a/components/UploadFiletree.tsx
+++ b/components/UploadFiletree.tsx
@@ -2,16 +2,16 @@ import { useCallback } from 'react'
import path from 'path-browserify'
import Filesystem, { FileInfo } from 'components/Filesystem'
-import { LiteLogFile, LiteLogUpload } from 'utils/agentLogs'
+import { LiteDeployment, LiteLogFile, LiteLogUpload } from 'utils/agentLogs'
import { FiletreeProvider } from 'hooks/useFiletree'
export interface Props {
- logUpload: LiteLogUpload
+ log: LiteLogUpload | LiteDeployment
selectedLogFile?: LiteLogFile
}
function UploadTree({
- logUpload,
+ log: logUpload,
selectedLogFile,
}: Props) {
const fetchLogDirContent = useCallback<(dirpath: string) => (FileInfo & { id?: string })[]>(dirpath => {
diff --git a/hooks/useRenameLogUpload.ts b/hooks/useRenameLogUpload.ts
index ac23e5fd3..45037f755 100644
--- a/hooks/useRenameLogUpload.ts
+++ b/hooks/useRenameLogUpload.ts
@@ -26,4 +26,4 @@ export function useRenameLogUpload() {
return useCallback(async (args: PatchLogUpload) =>
rename(args), [rename])
-}
\ No newline at end of file
+}
diff --git a/pages/deployed/[projectID]/run/[runID].tsx b/pages/deployed/[projectID]/run/[runID].tsx
index 089ed0331..34f1268f6 100644
--- a/pages/deployed/[projectID]/run/[runID].tsx
+++ b/pages/deployed/[projectID]/run/[runID].tsx
@@ -13,20 +13,11 @@ interface PathProps extends ParsedUrlQuery {
export const getServerSideProps: GetServerSideProps<Props, PathProps> = async (ctx) => {
const projectID = ctx.params?.projectID
+ const logID = ctx.params?.logID
if (!projectID) {
return {
redirect: {
- destination: '/?view=deployed',
- permanent: false,
- }
- }
- }
-
- const runID = ctx.params?.runID
- if (!runID) {
- return {
- redirect: {
- destination: `/?view=runs& projectID=${projectID}`,
+ destination: '/',
permanent: false,
}
}
@@ -83,7 +74,7 @@ export const getServerSideProps: GetServerSideProps<Props, PathProps> = async (c
return {
props: {
project,
- runID,
+ logID,
}
}
}
@@ -101,12 +92,6 @@ function ProjectPage({
<AgentRun
/>
)
- // return (
- // <AgentDetail
- // project={project}
- // runID={runID}
- // />
- // )
}
export default ProjectPage
diff --git a/pages/index.tsx b/pages/index.tsx
index f05e68879..cf49d05b6 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -3,15 +3,15 @@ import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'
import { nanoid } from 'nanoid'
import path from 'path'
-import { prisma, projects, deployments, log_files } from 'db/prisma'
+import { prisma, projects, log_files } from 'db/prisma'
import { serverCreds } from 'db/credentials'
import DashboardHome from 'components/DashboardHome'
-import { AgentNextActionLog, AgentPromptLogs, LiteLogUpload } from 'utils/agentLogs'
+import { AgentNextActionLog, AgentPromptLogs, LiteDeployment, LiteLogUpload } from 'utils/agentLogs'
export interface Props {
- projects: (projects & { log_uploads: LiteLogUpload[], deployments: deployments[] })[]
+ projects: (projects & { log_uploads: LiteLogUpload[], deployments: LiteDeployment[] })[]
defaultProjectID: string
- view: 'deployments' | 'uploads'
+ view: 'deployments' | 'logs'
}
function getLastTwoDirsAndFile(fullPath: string): string {
@@ -95,7 +95,6 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
is_default: true,
projects: {
where: {
- is_default: true,
},
include: {
log_uploads: {
@@ -105,6 +104,11 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
},
deployments: {
include: {
+ projects: {
+ select: {
+ name: true,
+ },
+ },
log_files: true,
},
},
@@ -144,6 +148,11 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
},
deployments: {
include: {
+ projects: {
+ select: {
+ name: true,
+ },
+ },
log_files: true,
},
},
@@ -162,6 +171,11 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
},
deployments: {
include: {
+ projects: {
+ select: {
+ name: true,
+ },
+ },
log_files: true,
},
},
@@ -212,22 +226,24 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
},
deployments: {
include: {
+ projects: {
+ select: {
+ name: true,
+ },
+ },
log_files: true,
},
},
},
})
-
-
-
return {
props: {
- view: showUploadedLogs ? 'uploads' : 'deployments',
+ view: showUploadedLogs ? 'logs' : 'deployments',
defaultProjectID: defaultProject.id,
projects: [
defaultProject,
- ...teams.flatMap(t => t.projects),
+ ...teams.flatMap(t => t.projects).filter(p => p.id !== defaultProject.id),
]
.map(p => ({
...p,
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 961802a3a..b76e35e89 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -68,6 +68,7 @@ model mfa_challenges {
ip_address String @db.Inet
mfa_factors mfa_factors @relation(fields: [factor_id], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "mfa_challenges_auth_factor_id_fkey")
+ @@index([created_at(sort: Desc)], map: "mfa_challenge_created_at_idx")
@@schema("auth")
}
@@ -327,8 +328,8 @@ model log_files {
created_at DateTime @default(now()) @db.Timestamptz(6)
content String @default("")
filename String @default("")
- relativePath String
- last_modified DateTime @db.Timestamptz(6)
+ relativePath String @default("")
+ last_modified DateTime? @db.Timestamptz(6)
project_id String
log_upload_id String? @db.Uuid
deployment_id String? @db.Uuid
diff --git a/utils/agentLogs.ts b/utils/agentLogs.ts
index ddef5c611..437fe9926 100644
--- a/utils/agentLogs.ts
+++ b/utils/agentLogs.ts
@@ -1,4 +1,15 @@
-import { log_files, log_uploads } from 'db/prisma'
+import { deployments, log_files, log_uploads } from 'db/prisma'
+
+export interface LiteDeploymentLog extends Omit<log_files, 'content'> {
+ content: AgentPromptLogs | AgentNextActionLog | string
+}
+
+export interface LiteDeployment extends Omit<deployments, 'log_files'> {
+ log_files: LiteDeploymentLog[]
+ projects: {
+ name: string
+ }
+}
export interface LiteLogFile extends Omit<log_files, 'content'> {
content: AgentPromptLogs | AgentNextActionLog | string