Skip to content

Commit 0834e15

Browse files
Merge branch 'main' into feat/linting
2 parents 71c6605 + 0e1a7c0 commit 0834e15

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

frontend/src/components/views/manager.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,13 @@ export const SessionManager: React.FC = () => {
364364

365365
const chatViews = useMemo(() => {
366366
return sessions.map((s: Session) => {
367+
<<<<<<< feat/linting
367368
const status = s.id ? sessionRunStatuses[s.id] as RunStatus : undefined;
368369
const isSessionPotentiallyActive = status ? [
370+
=======
371+
const status = (s.id ? sessionRunStatuses[s.id] : undefined) as RunStatus;
372+
const isSessionPotentiallyActive = [
373+
>>>>>>> main
369374
"active",
370375
"awaiting_input",
371376
"pausing",

frontend/src/components/views/sidebar.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
111111
return (
112112
<div key={s.id} className="relative">
113113
<div
114-
className={`group flex items-center justify-between p-2 py-1 text-sm ${
114+
className={`group flex items-center p-2 py-1 text-sm ${
115115
isLoading
116116
? "pointer-events-none opacity-50"
117117
: "cursor-pointer hover:bg-tertiary"
@@ -131,18 +131,17 @@ export const Sidebar: React.FC<SidebarProps> = ({
131131
tabIndex={isLoading ? -1 : 0}
132132
aria-label={`Select session ${s.name}`}
133133
>
134-
<div className="flex items-center gap-2 flex-1">
135-
<span className="truncate text-sm">
136-
{s.name.slice(0, 20)}
137-
{s.name.length > 20 ? "..." : ""}
134+
<div className="flex items-center gap-2 flex-1 min-w-0">
135+
<span className="truncate text-sm max-w-[140px]">
136+
{s.name}
138137
</span>
139138
{s.id && (
140139
<SessionRunStatusIndicator
141140
status={sessionRunStatuses[s.id]}
142141
/>
143142
)}
144143
</div>
145-
<div className="flex gap-2 opacity-0 group-hover:opacity-100 transition-opacity">
144+
<div className="flex gap-2 opacity-0 group-hover:opacity-100 transition-opacity w-8 justify-end flex-shrink-0">
146145
<Dropdown
147146
trigger={["click"]}
148147
overlay={

src/magentic_ui/tools/playwright/browser/headless_docker_playwright_browser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HeadlessDockerPlaywrightBrowser(
3535
3636
Properties:
3737
browser_address (str): Returns the WebSocket address for connecting to the browser.
38-
Format: "ws://localhost:{playwright_port}"
38+
Format: "ws://127.0.0.1:{playwright_port}" (or container name if inside_docker=True)
3939
4040
Example:
4141
```python
@@ -61,7 +61,7 @@ def __init__(
6161
self._hostname = (
6262
f"magentic-ui-headless-browser_{self._playwright_port}"
6363
if inside_docker
64-
else "localhost"
64+
else "127.0.0.1"
6565
)
6666

6767
@property

src/magentic_ui/tools/playwright/browser/vnc_docker_playwright_browser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def __init__(
9797
self._hostname = (
9898
f"magentic-ui-vnc-browser_{self._playwright_websocket_path}_{self._novnc_port}"
9999
if inside_docker
100-
else "localhost"
100+
else "127.0.0.1"
101101
)
102102
self._docker_name = f"magentic-ui-vnc-browser_{self._playwright_websocket_path}_{self._novnc_port}"
103103

@@ -117,7 +117,7 @@ def _generate_new_browser_address(self) -> None:
117117
self._hostname = (
118118
f"magentic-ui-vnc-browser_{self._playwright_websocket_path}_{self._novnc_port}"
119119
if self._inside_docker
120-
else "localhost"
120+
else "127.0.0.1"
121121
)
122122
self._docker_name = f"magentic-ui-vnc-browser_{self._playwright_websocket_path}_{self._novnc_port}"
123123
playwright_sock.close()

0 commit comments

Comments
 (0)