Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/app/bops-app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2176,7 +2176,7 @@ export function Settings({
else if (pane === "bots")
body = (
<>
<PaneHead title="Bots" sub={`${wsName}'s bots. Each has a settings page of its own.`} />
<PaneHead title="Bots" sub={shared ? `${wsName}'s bots. Only the owner changes their settings.` : `${wsName}'s bots. Each has a settings page of its own.`} />
<WorkspaceBots state={state} onOpenBot={shared ? undefined : onOpenBot} />
</>
);
Expand Down
8 changes: 4 additions & 4 deletions components/app/computer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1219,12 +1219,12 @@ function NoComputer({ state, bot: b, host }: { state: AppState; bot: Bot; /** Th
</div>
);
// A workspace shared with the user: the computer (or the Mac) is the owner's, with nothing here to set up or watch.
// A plain line saying where its work shows, not an empty card the size of a screen.
if (readOnly(state))
return (
<div className="flex aspect-[16/10] w-full flex-col items-center justify-center gap-3 rounded-[20px] px-8 text-center" style={{ backgroundImage: botWash(b) }}>
<Mascot botId={b.id} color={b.color} size={44} />
<span className="max-w-[300px] text-[14px] leading-5">{`${b.name} works on ${b.runsOn === "mac" ? yourMac(state) : "the owner's computer"}.`}</span>
</div>
<p className="px-1 py-2 text-[14px] leading-5 text-[#6B6B6B]">
{`${b.name} works on ${b.runsOn === "mac" ? yourMac(state) : "the owner's computer"}. Its screens show only in the owner's Bops; its work shows in the chat.`}
</p>
);
return (
<div className="flex aspect-[16/10] w-full flex-col items-center justify-center gap-3 rounded-[20px] px-8 text-center" style={{ backgroundImage: botWash(b) }}>
Expand Down
7 changes: 6 additions & 1 deletion components/app/panel-tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,12 @@ function Tab({ state, tab: t, on, closable, onPick, onClose }: { state: AppState
const host = b ? computerOf(state, b) : undefined;
const label =
t.kind === "computer"
? host && host.id !== b?.id
? // A shared workspace's computers are its owner's, whichever bot's name the owner's Bops gives them.
state.shared
? b?.runsOn === "mac"
? "Owner's Mac"
: "Owner's computer"
: host && host.id !== b?.id
? `${host.name}'s computer`
: `${b?.name ?? "Bot"}'s computer`
: t.kind === "bot"
Expand Down
1 change: 1 addition & 0 deletions scripts/test-shared.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1342,6 +1342,7 @@ await check("the viewer's own Mac is never a shared workspace's: no Your Mac tab
// The tab, were it shown: no Working dot for the owner's work.
const bar = renderToStaticMarkup(h(TabBar, { state: st, tabs: [mac], active: "chat", chatBotId: "boppy", onPick: noop, onClose: noop, onNew: noop }));
assert.ok(!/title="Working"/.test(bar), bar);
assert.match(bar, />Owner&#x27;s computer</, "the chat's computer tab is the owner's, not named for another bot");
// The user's own: as always.
const mine = { ...own(), host: "mac", sessions: [{ ...c.state.sessions[0], botId: "boppy" }] };
assert.equal(tabsShown([mac], mine, opts(mine)).length, 1);
Expand Down
Loading