Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaa689cb

Browse files
feat: add terminal in the task page (#20396)
**Demo:**<img width="1624" height="967" alt="Screenshot 2025-10-21 at 10 45 24"src="https://github.com/user-attachments/assets/b0ae724f-055a-4b13-b2a6-f11f4432de9b"/>Closescoder/internal#1077
1 parent1230cac commitaa689cb

File tree

2 files changed

+68
-25
lines changed

2 files changed

+68
-25
lines changed

‎site/src/pages/TaskPage/TaskAppIframe.tsx‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useProxy } from "contexts/ProxyContext";
1010
import{EllipsisVertical,ExternalLinkIcon,HouseIcon}from"lucide-react";
1111
import{useAppLink}from"modules/apps/useAppLink";
1212
importtype{Task,WorkspaceAppWithAgent}from"modules/tasks/tasks";
13-
import{typeFC,useRef}from"react";
13+
import{typeFC,typeHTMLProps,useRef}from"react";
1414
import{LinkasRouterLink}from"react-router";
1515
import{cn}from"utils/cn";
1616
import{TaskWildcardWarning}from"./TaskWildcardWarning";
@@ -85,14 +85,7 @@ export const TaskAppIFrame: FC<TaskAppIFrameProps> = ({
8585
)}
8686

8787
{app.health==="healthy"||app.health==="disabled" ?(
88-
<iframe
89-
ref={frameRef}
90-
src={link.href}
91-
title={link.label}
92-
loading="eager"
93-
className={"w-full h-full border-0"}
94-
allow="clipboard-read; clipboard-write"
95-
/>
88+
<TaskIframeref={frameRef}src={link.href}title={link.label}/>
9689
) :app.health==="unhealthy" ?(
9790
<divclassName="w-full h-full flex flex-col items-center justify-center p-4">
9891
<h3className="m-0 font-medium text-content-primary text-base text-center">
@@ -145,3 +138,16 @@ export const TaskAppIFrame: FC<TaskAppIFrameProps> = ({
145138
</div>
146139
);
147140
};
141+
142+
typeTaskIframeProps=HTMLProps<HTMLIFrameElement>;
143+
144+
exportconstTaskIframe:FC<TaskIframeProps>=({ className, ...props})=>{
145+
return(
146+
<iframe
147+
loading="eager"
148+
className={cn("w-full h-full border-0",className)}
149+
allow="clipboard-read; clipboard-write"
150+
{...props}
151+
/>
152+
);
153+
};

‎site/src/pages/TaskPage/TaskApps.tsx‎

Lines changed: 53 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,26 @@ import { ExternalImage } from "components/ExternalImage/ExternalImage";
99
import{InfoTooltip}from"components/InfoTooltip/InfoTooltip";
1010
import{Link}from"components/Link/Link";
1111
import{ScrollArea,ScrollBar}from"components/ScrollArea/ScrollArea";
12-
import{ChevronDownIcon,LayoutGridIcon}from"lucide-react";
12+
import{ChevronDownIcon,LayoutGridIcon,TerminalIcon}from"lucide-react";
13+
import{getTerminalHref}from"modules/apps/apps";
1314
import{useAppLink}from"modules/apps/useAppLink";
1415
import{
1516
getTaskApps,
1617
typeTask,
1718
typeWorkspaceAppWithAgent,
1819
}from"modules/tasks/tasks";
19-
importtypeReactfrom"react";
2020
import{typeFC,useState}from"react";
21-
import{LinkasRouterLink}from"react-router";
21+
import{typeLinkProps,LinkasRouterLink}from"react-router";
2222
import{cn}from"utils/cn";
2323
import{docs}from"utils/docs";
24-
import{TaskAppIFrame}from"./TaskAppIframe";
24+
import{TaskAppIFrame,TaskIframe}from"./TaskAppIframe";
2525

2626
typeTaskAppsProps={
2727
task:Task;
2828
};
2929

30+
constTERMINAL_TAB_ID="terminal";
31+
3032
exportconstTaskApps:FC<TaskAppsProps>=({ task})=>{
3133
constapps=getTaskApps(task).filter(
3234
// The Chat UI app will be displayed in the sidebar, so we don't want to
@@ -39,6 +41,13 @@ export const TaskApps: FC<TaskAppsProps> = ({ task }) => {
3941
const[activeAppId,setActiveAppId]=useState(embeddedApps.at(0)?.id);
4042
consthasAvailableAppsToDisplay=
4143
embeddedApps.length>0||externalApps.length>0;
44+
consttaskAgent=apps.at(0)?.agent;
45+
constterminalHref=getTerminalHref({
46+
username:task.workspace.owner_name,
47+
workspace:task.workspace.name,
48+
agent:taskAgent?.name,
49+
});
50+
constisTerminalActive=activeAppId===TERMINAL_TAB_ID;
4251

4352
return(
4453
<mainclassName="flex flex-col h-full">
@@ -58,6 +67,17 @@ export const TaskApps: FC<TaskAppsProps> = ({ task }) => {
5867
}}
5968
/>
6069
))}
70+
<TaskTab
71+
to={terminalHref}
72+
active={isTerminalActive}
73+
onClick={(e)=>{
74+
e.preventDefault();
75+
setActiveAppId(TERMINAL_TAB_ID);
76+
}}
77+
>
78+
<TerminalIcon/>
79+
Terminal
80+
</TaskTab>
6181
</div>
6282
<ScrollBarorientation="horizontal"className="h-2"/>
6383
</ScrollArea>
@@ -78,6 +98,14 @@ export const TaskApps: FC<TaskAppsProps> = ({ task }) => {
7898
task={task}
7999
/>
80100
))}
101+
102+
<TaskIframe
103+
src={terminalHref}
104+
title="Terminal"
105+
className={cn({
106+
hidden:!isTerminalActive,
107+
})}
108+
/>
81109
</div>
82110
) :(
83111
<divclassName="mx-auto my-auto flex flex-col items-center">
@@ -161,11 +189,30 @@ const TaskAppTab: FC<TaskAppTabProps> = ({ task, app, active, onClick }) => {
161189
workspace:task.workspace,
162190
});
163191

192+
return(
193+
<TaskTabactive={active}to={link.href}onClick={onClick}>
194+
{app.icon ?<ExternalImagesrc={app.icon}/> :<LayoutGridIcon/>}
195+
{link.label}
196+
{app.health==="unhealthy"&&(
197+
<InfoTooltip
198+
title="This app is unhealthy."
199+
message="The health check failed."
200+
type="warning"
201+
/>
202+
)}
203+
</TaskTab>
204+
);
205+
};
206+
207+
typeTaskTabProps=LinkProps&{
208+
active:boolean;
209+
};
210+
211+
constTaskTab:FC<TaskTabProps>=({ active, ...routerLinkProps})=>{
164212
return(
165213
<Button
166214
size="sm"
167215
variant="subtle"
168-
key={app.id}
169216
asChild
170217
className={cn([
171218
"px-3",
@@ -176,17 +223,7 @@ const TaskAppTab: FC<TaskAppTabProps> = ({ task, app, active, onClick }) => {
176223
{"opacity-75 hover:opacity-100":!active},
177224
])}
178225
>
179-
<RouterLinkto={link.href}onClick={onClick}>
180-
{app.icon ?<ExternalImagesrc={app.icon}/> :<LayoutGridIcon/>}
181-
{link.label}
182-
{app.health==="unhealthy"&&(
183-
<InfoTooltip
184-
title="This app is unhealthy."
185-
message="The health check failed."
186-
type="warning"
187-
/>
188-
)}
189-
</RouterLink>
226+
<RouterLink{...routerLinkProps}/>
190227
</Button>
191228
);
192229
};

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp