- Notifications
You must be signed in to change notification settings - Fork906
feat: embed chat ui in the task sidebar#18216
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Changes fromall commits
File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import type { WorkspaceApp } from "api/typesGenerated"; | ||
import { useAppLink } from "modules/apps/useAppLink"; | ||
import type { Task } from "modules/tasks/tasks"; | ||
import type { FC } from "react"; | ||
import { cn } from "utils/cn"; | ||
type TaskAppIFrameProps = { | ||
task: Task; | ||
app: WorkspaceApp; | ||
active: boolean; | ||
}; | ||
export const TaskAppIFrame: FC<TaskAppIFrameProps> = ({ | ||
task, | ||
app, | ||
active, | ||
}) => { | ||
const agent = task.workspace.latest_build.resources | ||
.flatMap((r) => r.agents) | ||
.filter((a) => !!a) | ||
.find((a) => a.apps.some((a) => a.id === app.id)); | ||
if (!agent) { | ||
throw new Error(`Agent for app ${app.id} not found in task workspace`); | ||
} | ||
const link = useAppLink(app, { | ||
agent, | ||
workspace: task.workspace, | ||
}); | ||
return ( | ||
<iframe | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Is it possible we might want to eventually use a static reference for the iframe? Wondering if there might be cases where the iframe is recreated and the user loses their position in the iframe, since React seems to re-render so much. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Right now it is working as expected but we definitely can improve it if that is the case. | ||
src={link.href} | ||
title={link.label} | ||
loading="eager" | ||
className={cn([active ? "block" : "hidden", "w-full h-full border-0"])} | ||
/> | ||
); | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,169 @@ | ||
import type { WorkspaceApp } from "api/typesGenerated"; | ||
import { Button } from "components/Button/Button"; | ||
import { | ||
DropdownMenu, | ||
DropdownMenuContent, | ||
DropdownMenuItem, | ||
DropdownMenuTrigger, | ||
} from "components/DropdownMenu/DropdownMenu"; | ||
import { ExternalImage } from "components/ExternalImage/ExternalImage"; | ||
import { ChevronDownIcon, LayoutGridIcon } from "lucide-react"; | ||
import { useAppLink } from "modules/apps/useAppLink"; | ||
import type { Task } from "modules/tasks/tasks"; | ||
import type React from "react"; | ||
import { type FC, useState } from "react"; | ||
import { Link as RouterLink } from "react-router-dom"; | ||
import { cn } from "utils/cn"; | ||
import { TaskAppIFrame } from "./TaskAppIframe"; | ||
import { AI_APP_CHAT_SLUG } from "./constants"; | ||
type TaskAppsProps = { | ||
task: Task; | ||
}; | ||
export const TaskApps: FC<TaskAppsProps> = ({ task }) => { | ||
const agents = task.workspace.latest_build.resources | ||
.flatMap((r) => r.agents) | ||
.filter((a) => !!a); | ||
// The Chat UI app will be displayed in the sidebar, so we don't want to show | ||
// it here | ||
const apps = agents | ||
.flatMap((a) => a?.apps) | ||
.filter((a) => !!a && a.slug !== AI_APP_CHAT_SLUG); | ||
const [activeAppId, setActiveAppId] = useState<string>(() => { | ||
const appId = task.workspace.latest_app_status?.app_id; | ||
if (!appId) { | ||
throw new Error("No active app found in task"); | ||
} | ||
return appId; | ||
}); | ||
const activeApp = apps.find((app) => app.id === activeAppId); | ||
if (!activeApp) { | ||
throw new Error(`Active app with ID ${activeAppId} not found in task`); | ||
} | ||
const agent = agents.find((a) => | ||
a.apps.some((app) => app.id === activeAppId), | ||
); | ||
if (!agent) { | ||
throw new Error(`Agent for app ${activeAppId} not found in task workspace`); | ||
} | ||
const embeddedApps = apps.filter((app) => !app.external); | ||
const externalApps = apps.filter((app) => app.external); | ||
return ( | ||
<main className="flex-1 flex flex-col"> | ||
<div className="border-0 border-b border-border border-solid w-full p-1 flex gap-2"> | ||
{embeddedApps.map((app) => ( | ||
<TaskAppButton | ||
key={app.id} | ||
task={task} | ||
app={app} | ||
active={app.id === activeAppId} | ||
onClick={(e) => { | ||
e.preventDefault(); | ||
setActiveAppId(app.id); | ||
}} | ||
/> | ||
))} | ||
{externalApps.length > 0 && ( | ||
<div className="ml-auto"> | ||
<DropdownMenu> | ||
<DropdownMenuTrigger asChild> | ||
<Button size="sm" variant="subtle"> | ||
Open locally | ||
<ChevronDownIcon /> | ||
</Button> | ||
</DropdownMenuTrigger> | ||
<DropdownMenuContent> | ||
{externalApps.map((app) => { | ||
const link = useAppLink(app, { | ||
agent, | ||
workspace: task.workspace, | ||
}); | ||
return ( | ||
<DropdownMenuItem key={app.id} asChild> | ||
<RouterLink to={link.href}> | ||
{app.icon ? ( | ||
<ExternalImage src={app.icon} /> | ||
) : ( | ||
<LayoutGridIcon /> | ||
)} | ||
{link.label} | ||
</RouterLink> | ||
</DropdownMenuItem> | ||
); | ||
})} | ||
</DropdownMenuContent> | ||
</DropdownMenu> | ||
</div> | ||
)} | ||
</div> | ||
<div className="flex-1"> | ||
{embeddedApps.map((app) => { | ||
return ( | ||
<TaskAppIFrame | ||
key={app.id} | ||
active={activeAppId === app.id} | ||
app={app} | ||
task={task} | ||
/> | ||
); | ||
})} | ||
</div> | ||
</main> | ||
); | ||
}; | ||
type TaskAppButtonProps = { | ||
task: Task; | ||
app: WorkspaceApp; | ||
active: boolean; | ||
onClick: (e: React.MouseEvent<HTMLAnchorElement>) => void; | ||
}; | ||
const TaskAppButton: FC<TaskAppButtonProps> = ({ | ||
task, | ||
app, | ||
active, | ||
onClick, | ||
}) => { | ||
const agent = task.workspace.latest_build.resources | ||
.flatMap((r) => r.agents) | ||
.filter((a) => !!a) | ||
.find((a) => a.apps.some((a) => a.id === app.id)); | ||
if (!agent) { | ||
throw new Error(`Agent for app ${app.id} not found in task workspace`); | ||
} | ||
const link = useAppLink(app, { | ||
agent, | ||
workspace: task.workspace, | ||
}); | ||
return ( | ||
<Button | ||
size="sm" | ||
variant="subtle" | ||
key={app.id} | ||
asChild | ||
className={cn([ | ||
{ "text-content-primary": active }, | ||
{ "opacity-75 hover:opacity-100": !active }, | ||
])} | ||
> | ||
<RouterLink to={link.href} onClick={onClick}> | ||
{app.icon ? <ExternalImage src={app.icon} /> : <LayoutGridIcon />} | ||
{link.label} | ||
</RouterLink> | ||
</Button> | ||
); | ||
}; |
Uh oh!
There was an error while loading.Please reload this page.
Uh oh!
There was an error while loading.Please reload this page.