Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Change data fetching for home page and /logs/[id]; Add file selection to homepage
Tomas Valentae2b20dae63e6
diff --git a/components/AgentContext.tsx b/components/AgentContext.tsxindex 3321b18f1..24cd54987 100644--- a/components/AgentContext.tsx+++ b/components/AgentContext.tsx@@ -38,7 +38,13 @@ function AgentContext({function open(idx: number) {setOpened(idx)onSelected(context[idx])- router.push(`/log/${router.query.logFileID}?selectedLog=${idx}`, undefined, { shallow: true })+ router.push({+ pathname: `/log/${router.query.logFileID}`,+ query: {+ ...router.query['filename'] && { filename: router.query['filename'] },+ selectedLog: idx.toString(),+ },+ }, undefined, { shallow: true })}function close() {diff --git a/components/AgentLogFilesList.tsx b/components/AgentLogFilesList.tsxindex 6dfa6da2d..f01bd5255 100644--- a/components/AgentLogFilesList.tsx+++ b/components/AgentLogFilesList.tsx@@ -6,22 +6,21 @@ import {Upload,File,} from 'lucide-react'-import Link from 'next/link'import clsx from 'clsx'import { useRouter } from 'next/router'-import { LogFile, RawFileLog } from 'utils/agentLogs'+import { Log, RawFileLog } from 'utils/agentLogs'import { useUploadLogs } from 'hooks/useUploadLogs'import { useDeleteLogs } from 'hooks/useRemoveLogs'export interface Props {- logFiles: LogFile[]+ logs: Log[]initialSelectedLogFileID?: stringdefaultProjectID: string}function AgentLogFilesList({- logFiles,+ logs,initialSelectedLogFileID,defaultProjectID,}: Props) {@@ -82,14 +81,20 @@ function AgentLogFilesList({}}- function toggleSelectedLogFileID(logFileID: string) {- if (selectedLogFileID === logFileID) {- setSelectedLogFileID('')- router.push('/?view=logs', undefined, { shallow: true })- } else {- setSelectedLogFileID(logFileID)- router.push(`/log/${logFileID}`, undefined, { shallow: true })- }+ function toggleSelectedLogFileID(logFileID: string, filename: string) {+ router.push({+ pathname: `/log/${logFileID}`,+ query: {+ filename,+ }+ }, undefined, { shallow: true })+ // if (selectedLogFileID === logFileID) {+ // router.push(`/log/${logFileID}`, undefined, { shallow: true })+ // setSelectedLogFileID('')+ // router.push('/?view=logs', undefined, { shallow: true })+ // } else {+ // setSelectedLogFileID(logFileID)+ // }}return (@@ -116,7 +121,7 @@ function AgentLogFilesList({</button></header>- {logFiles.length === 0 && (+ {logs.length === 0 && (<divclassName="flex flex-col space-y-4 p-4 sm:p-6 lg:px-8"onDrop={handleDrop}@@ -135,20 +140,19 @@ function AgentLogFilesList({</div>)}- {logFiles.length > 0 && (+ {logs.length > 0 && (<div className="flex flex-col space-y-4 p-4 sm:p-6 lg:px-8">- {logFiles.map((logFile, i) => (- <Link- key={logFile.id}- href={`/log/${logFile.id}`}+ {logs.map((log, i) => (+ <div+ key={log.id}+><divclassName={clsx('flex items-center space-x-2 p-2 cursor-pointer hover:bg-gray-700 transition-all rounded-md',- selectedLogFileID === logFile.id && 'bg-gray-700',- selectedLogFileID !== logFile.id && 'bg-gray-800',+ selectedLogFileID === log.id && 'bg-gray-500',+ selectedLogFileID !== log.id && 'bg-gray-600',)}- onClick={() => toggleSelectedLogFileID(logFile.id)}><File size={14} className="text-gray-500" /><span@@ -156,14 +160,37 @@ function AgentLogFilesList({'text-sm','cursor-pointer','font-semibold',- selectedLogFileID === logFile.id && 'font-semibold',+ selectedLogFileID === log.id && 'font-semibold',)}- onClick={() => toggleSelectedLogFileID(logFile.id)}>- {logFile.name}+ {log.id}</span></div>- </Link>+ {log.files.map((f, i) =>+ <div+ key={i}+ className={clsx(+ 'flex items-center space-x-2 p-2 cursor-pointer hover:bg-gray-700 transition-all rounded-md',+ selectedLogFileID === log.id && 'bg-gray-700',+ selectedLogFileID !== log.id && 'bg-gray-800',+ )}+ onClick={() => toggleSelectedLogFileID(log.id, f.name)}+ >+ <File size={14} className="text-gray-500" />+ <span+ className={clsx(+ 'text-sm',+ 'cursor-pointer',+ 'font-semibold',+ selectedLogFileID === log.id && 'font-semibold',+ )}+ >+ {f.name}+ </span>+ </div>+ )+ }+ </div>))}</div>)}diff --git a/components/DashboardHome.tsx b/components/DashboardHome.tsxindex 6b0f20946..acbd952a9 100644--- a/components/DashboardHome.tsx+++ b/components/DashboardHome.tsx@@ -2,14 +2,13 @@ import { useRouter } from 'next/router'import { usePostHog } from 'posthog-js/react'import { useSupabaseClient } from '@supabase/auth-helpers-react'-import { deployments, projects } from 'db/prisma'import AgentList from 'components/AgentList'import AgentRunsList from 'components/AgentRunsList'import AgentLogFilesList from 'components/AgentLogFilesList'-import { LogFile } from 'utils/agentLogs'+import { ProjectWithLogFiles } from 'pages'export interface Props {- projects: (projects & { logs: LogFile[], deployments: deployments[] })[]+ projects: ProjectWithLogFiles[]defaultProjectID: string}@@ -37,7 +36,7 @@ function DashboardHome({router.push(`/?view=runs&projectID=${projectID}`, undefined, { shallow: true })}- const logFiles = projects.flatMap(p => p.logs)+ const logs = projects.flatMap(p => p.logs)const projectsWithDeployments = projects.filter(p => {@@ -67,7 +66,7 @@ function DashboardHome({/>) : view === 'logs' ? (<AgentLogFilesList- logFiles={logFiles}+ logs={logs}defaultProjectID={defaultProjectID}initialSelectedLogFileID={selectedLogFileID}/>diff --git a/components/Feedback/index.tsx b/components/Feedback/index.tsxindex 15fff702b..2fc2adaec 100644--- a/components/Feedback/index.tsx+++ b/components/Feedback/index.tsx@@ -23,7 +23,7 @@ function Feedback() {<FeedbackModalonSend={() => setIsFinished(true)}isOpen={isFeedbackVisible}- onClose={() => setIsFeedbackVisible(f => !f)}+ onClose={() => setIsFeedbackVisible(false)}/></div></div>diff --git a/pages/index.tsx b/pages/index.tsxindex 65e71ec85..0e590b50a 100644--- a/pages/index.tsx+++ b/pages/index.tsx@@ -1,11 +1,16 @@import type { GetServerSideProps } from 'next'import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'+import { nanoid } from 'nanoid'import { deployments, prisma, projects } from 'db/prisma'import { serverCreds } from 'db/credentials'import DashboardHome from 'components/DashboardHome'-import { LogFile, RawFileLog } from 'utils/agentLogs'-import { nanoid } from 'nanoid'+import { RawFileLog, Log } from 'utils/agentLogs'++export type ProjectWithLogFiles = projects & {+ deployments: deployments[]+ logs: Log[]+}export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {// Select the 'deployed' view by default.@@ -148,19 +153,21 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {props: {defaultProjectID: defaultProject.id,projects: [defaultProject]- .map<projects & { logs: LogFile[], deployments: deployments[] }>(p => {+ .map<ProjectWithLogFiles>(p => {return {...p,// Don't send any deployments to the client.deployments: [],logs: p.logs- .filter(l => l.data !== null && l.data.length > 0)- .map<LogFile>(l => {- const log = l.data[0] as unknown as RawFileLog+ .filter(l => l.data !== null)+ .map(l => {return {id: l.id,- name: log.filename,+ files: (l.data as unknown as RawFileLog[]).map(f => ({+ name: f.filename,+ relativePath: f.metadata.relativePath,+ }))}})}@@ -170,7 +177,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {}export interface Props {- projects: (projects & { logs: LogFile[], deployments: deployments[] })[]+ projects: ProjectWithLogFiles[]defaultProjectID: string}