Skip to content

Commit 1147bdf

Browse files
maria-rcksclaude
andcommitted
refactor(web): mark remote projects with a machine icon instead of environment names
Local projects show nothing and no row spells out an environment name. A project with a member on another machine gets the machine icon used by thread rows, with the environment names in its tooltip. This drops the label field, the label search matching, and the wider popup from the first pass. Co-Authored-By: Claude Fable 5.1 <[email protected]>
1 parent fcf9f40 commit 1147bdf

8 files changed

Lines changed: 79 additions & 142 deletions
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import type { EnvironmentId, EnvironmentMachineKind } from "@t3tools/contracts";
2+
3+
import { cn } from "~/lib/utils";
4+
import type { SidebarProjectSnapshot } from "~/sidebarProjectGrouping";
5+
import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
6+
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
7+
8+
/**
9+
* Machine icon for a project picker row whose group has a member on another
10+
* environment, with the environment names in a tooltip. Projects that only
11+
* live on this device render nothing, the same rule thread rows use. Callers
12+
* render it only while the catalog spans environments (see
13+
* projectGroupsSpanEnvironments), so single-machine users see no change.
14+
*/
15+
export function ProjectEnvironmentBadge(props: {
16+
readonly group: Pick<SidebarProjectSnapshot, "memberProjects">;
17+
readonly primaryEnvironmentId: EnvironmentId | null;
18+
readonly machineByEnvironmentId: ReadonlyMap<EnvironmentId, EnvironmentMachineKind>;
19+
readonly className?: string;
20+
}) {
21+
const remoteMembers = props.group.memberProjects.filter(
22+
(member) => member.environmentId !== props.primaryEnvironmentId,
23+
);
24+
const first = remoteMembers[0];
25+
if (!first) return null;
26+
const labels = remoteMembers
27+
.map((member) => member.environmentLabel ?? "Remote")
28+
.filter((label, index, all) => all.indexOf(label) === index)
29+
.join(", ");
30+
return (
31+
<Tooltip>
32+
<TooltipTrigger
33+
render={
34+
<span
35+
aria-label={`Remote environment: ${labels}`}
36+
className={cn(
37+
"ml-auto inline-flex shrink-0 items-center text-muted-foreground",
38+
props.className,
39+
)}
40+
/>
41+
}
42+
>
43+
<EnvironmentMachineIcon
44+
aria-hidden
45+
kind={props.machineByEnvironmentId.get(first.environmentId) ?? "server"}
46+
className="size-3.5"
47+
/>
48+
</TooltipTrigger>
49+
<TooltipPopup side="top">{labels}</TooltipPopup>
50+
</Tooltip>
51+
);
52+
}

‎apps/web/src/components/ProjectEnvironmentLabel.tsx‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎apps/web/src/components/Sidebar.tsx‎

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ import type { SidebarThreadSummary } from "../types";
142142
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
143143
import { cn } from "~/lib/utils";
144144
import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
145-
import { ProjectEnvironmentLabel, resolveProjectGroupMachine } from "./ProjectEnvironmentLabel";
145+
import { ProjectEnvironmentBadge } from "./ProjectEnvironmentBadge";
146146
import { buildThreadActionMenuItems } from "./threadActionMenu.logic";
147147
import {
148148
animateSidebarLayoutChanges,
@@ -2335,18 +2335,17 @@ export default function Sidebar() {
23352335
// while the popup search filters the same collection.
23362336
const projectScopeItems = useMemo(
23372337
() => [
2338-
{ value: "all", label: "All projects", environmentLabels: [] as readonly string[] },
2338+
{ value: "all", label: "All projects" },
23392339
...projectGroups.map((project) => ({
23402340
value: project.projectKey,
23412341
label: project.displayName,
2342-
environmentLabels: project.environmentLabels,
23432342
})),
23442343
],
23452344
[projectGroups],
23462345
);
23472346
// Same-named projects on two machines are only told apart by where they
2348-
// live, so rows carry their environment once the catalog spans more than
2349-
// one; a single-machine catalog stays as it was.
2347+
// live, so rows on another machine carry its icon once the catalog spans
2348+
// more than one environment; a single-machine catalog stays as it was.
23502349
const showProjectEnvironments = useMemo(
23512350
() => projectGroupsSpanEnvironments(projectGroups),
23522351
[projectGroups],
@@ -2380,21 +2379,9 @@ export default function Sidebar() {
23802379
activeScopeKey: projectScopeKey,
23812380
query: projectScopeMenuState.query,
23822381
matches: (item, query) =>
2383-
projectScopeFilter.contains(item, query, (candidate) => candidate.label) ||
2384-
(showProjectEnvironments &&
2385-
projectScopeFilter.contains(
2386-
item.environmentLabels.join(" · "),
2387-
query,
2388-
(candidate) => candidate,
2389-
)),
2382+
projectScopeFilter.contains(item, query, (candidate) => candidate.label),
23902383
}),
2391-
[
2392-
projectScopeFilter,
2393-
projectScopeItems,
2394-
projectScopeKey,
2395-
projectScopeMenuState.query,
2396-
showProjectEnvironments,
2397-
],
2384+
[projectScopeFilter, projectScopeItems, projectScopeKey, projectScopeMenuState.query],
23982385
);
23992386
const scopedProjectGroup = useMemo(
24002387
() =>
@@ -4472,31 +4459,17 @@ export default function Sidebar() {
44724459
{scopedProjectGroup?.displayName ?? "All projects"}
44734460
</span>
44744461
{scopedProjectGroup && showProjectEnvironments ? (
4475-
<ProjectEnvironmentLabel
4476-
// The trigger has no tooltip, so at narrow sidebar
4477-
// widths the label yields to the project name.
4478-
className="shrink"
4479-
labels={scopedProjectGroup.environmentLabels}
4480-
machine={resolveProjectGroupMachine({
4481-
group: scopedProjectGroup,
4482-
primaryEnvironmentId,
4483-
machineByEnvironmentId: environmentMachineById,
4484-
})}
4462+
<ProjectEnvironmentBadge
4463+
group={scopedProjectGroup}
4464+
primaryEnvironmentId={primaryEnvironmentId}
4465+
machineByEnvironmentId={environmentMachineById}
44854466
/>
44864467
) : null}
44874468
<ChevronDownIcon className="-mr-px size-4 shrink-0" />
44884469
</ComboboxTrigger>
44894470
<ComboboxPopup
44904471
align="start"
4491-
// Anchor-wide by default; grows past the trigger only when
4492-
// rows carry environment labels, up to 20rem, so a project
4493-
// name and where it lives both stay readable.
4494-
className={cn(
4495-
"min-w-0 overflow-hidden",
4496-
showProjectEnvironments
4497-
? "w-max min-w-(--anchor-width) max-w-[min(20rem,var(--available-width))]"
4498-
: "w-(--anchor-width)",
4499-
)}
4472+
className="w-(--anchor-width) min-w-0 overflow-hidden"
45004473
>
45014474
<ComboboxSearchInput
45024475
aria-label="Search projects"
@@ -4548,13 +4521,10 @@ export default function Sidebar() {
45484521
)}
45494522
<span className="min-w-0 flex-1 truncate text-sm">{item.label}</span>
45504523
{project && showProjectEnvironments ? (
4551-
<ProjectEnvironmentLabel
4552-
labels={project.environmentLabels}
4553-
machine={resolveProjectGroupMachine({
4554-
group: project,
4555-
primaryEnvironmentId,
4556-
machineByEnvironmentId: environmentMachineById,
4557-
})}
4524+
<ProjectEnvironmentBadge
4525+
group={project}
4526+
primaryEnvironmentId={primaryEnvironmentId}
4527+
machineByEnvironmentId={environmentMachineById}
45584528
/>
45594529
) : null}
45604530
{project ? (

‎apps/web/src/components/chat/DraftHeroHeadline.tsx‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
} from "~/sidebarProjectGrouping";
1717
import { useProjects, useThreadShells } from "~/state/entities";
1818
import { useEnvironments, usePrimaryEnvironmentId } from "~/state/environments";
19-
import { ProjectEnvironmentLabel, resolveProjectGroupMachine } from "../ProjectEnvironmentLabel";
19+
import { ProjectEnvironmentBadge } from "../ProjectEnvironmentBadge";
2020
import { ProjectFavicon } from "../ProjectFavicon";
2121
import { sortLogicalProjectsForSidebar } from "../Sidebar.logic";
2222
import {
@@ -86,8 +86,8 @@ export function DraftHeroHeadline({
8686
],
8787
);
8888
// Same-named projects on two machines are only told apart by where they
89-
// live, so rows carry their environment once the catalog spans more than
90-
// one; a single-machine catalog stays as it was.
89+
// live, so rows on another machine carry its icon once the catalog spans
90+
// more than one environment; a single-machine catalog stays as it was.
9191
const showProjectEnvironments = useMemo(
9292
() => projectGroupsSpanEnvironments(projectGroups),
9393
[projectGroups],
@@ -189,10 +189,6 @@ export function DraftHeroHeadline({
189189
}}
190190
>
191191
{projectPickerEntries.map(({ group }) => {
192-
const environmentLabel =
193-
showProjectEnvironments && group.environmentLabels.length > 0
194-
? group.environmentLabels.join(" · ")
195-
: null;
196192
return (
197193
<MenuRadioItem
198194
key={group.projectKey}
@@ -206,19 +202,14 @@ export function DraftHeroHeadline({
206202
{group.displayName}
207203
</TooltipTrigger>
208204
<TooltipPopup side="top" className="max-w-80">
209-
{environmentLabel
210-
? `${group.displayName} · ${environmentLabel}`
211-
: group.displayName}
205+
{group.displayName}
212206
</TooltipPopup>
213207
</Tooltip>
214-
{environmentLabel ? (
215-
<ProjectEnvironmentLabel
216-
labels={group.environmentLabels}
217-
machine={resolveProjectGroupMachine({
218-
group,
219-
primaryEnvironmentId,
220-
machineByEnvironmentId: environmentMachineById,
221-
})}
208+
{showProjectEnvironments ? (
209+
<ProjectEnvironmentBadge
210+
group={group}
211+
primaryEnvironmentId={primaryEnvironmentId}
212+
machineByEnvironmentId={environmentMachineById}
222213
/>
223214
) : null}
224215
</MenuRadioItem>

‎apps/web/src/components/settings/scopedSettings.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ const group: SidebarProjectSnapshot = {
9090
allRemoteMembersAreDesktopLocal: false,
9191
allRemoteMembersAreWsl: false,
9292
remoteEnvironmentLabels: [server.label, laptop.label],
93-
environmentLabels: ["Local", server.label, laptop.label],
9493
};
9594
const project = resolveSettingsScope({ project: group.projectKey }, [group], environments);
9695
const checkout = resolveSettingsScope(

‎apps/web/src/components/settings/settingsScope.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ function group(
5454
allRemoteMembersAreDesktopLocal: false,
5555
allRemoteMembersAreWsl: false,
5656
remoteEnvironmentLabels: [],
57-
environmentLabels: ["Local"],
5857
};
5958
}
6059

‎apps/web/src/environmentGrouping.test.ts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe("environment grouping", () => {
8282
expect(projectGroupCount).toBe(1);
8383
});
8484

85-
it("labels where each project group lives once the catalog spans environments", () => {
85+
it("reports whether the project groups span more than one environment", () => {
8686
const grouped = makeProject({ repositoryIdentity });
8787
const groupedRemote = makeProject({
8888
id: ProjectId.make("project-remote"),
@@ -110,21 +110,10 @@ describe("environment grouping", () => {
110110
});
111111

112112
const groups = build([groupedRemote, grouped, separateLocal, separateRemote]);
113-
expect(groups.map((group) => group.environmentLabels)).toEqual([
114-
["Local", "Mac mini"],
115-
["Local"],
116-
["Mac mini"],
117-
]);
113+
expect(groups).toHaveLength(3);
118114
expect(projectGroupsSpanEnvironments(groups)).toBe(true);
119115
expect(projectGroupsSpanEnvironments(build([grouped, separateLocal]))).toBe(false);
120-
121-
const unlabeled = buildSidebarProjectSnapshots({
122-
projects: [grouped, groupedRemote],
123-
settings: defaultGroupingSettings,
124-
primaryEnvironmentId,
125-
resolveEnvironmentLabel: () => null,
126-
});
127-
expect(unlabeled[0]?.environmentLabels).toEqual(["Local", "Remote"]);
116+
expect(projectGroupsSpanEnvironments(build([separateRemote]))).toBe(false);
128117
});
129118

130119
it("keeps projects without repository identity physically scoped", () => {

‎apps/web/src/sidebarProjectGrouping.ts‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ export interface SidebarProjectSnapshot extends Project {
2424
memberProjects: readonly SidebarProjectGroupMember[];
2525
memberProjectRefs: readonly ScopedProjectRef[];
2626
remoteEnvironmentLabels: readonly string[];
27-
// Where the group lives, in member order: "Local" for the primary
28-
// environment, the saved label for every other one. Project pickers show
29-
// this when the catalog spans environments so two projects with the same
30-
// name stay apart; see projectGroupsSpanEnvironments.
31-
environmentLabels: readonly string[];
3227
}
3328

3429
export function projectGroupsSpanEnvironments(
@@ -114,14 +109,6 @@ export function buildSidebarProjectSnapshots(input: {
114109
const remoteEnvironmentLabels = remoteMembers
115110
.flatMap((member) => (member.environmentLabel ? [member.environmentLabel] : []))
116111
.filter((label, index, labels) => labels.indexOf(label) === index);
117-
// "Local" leads regardless of member order, which follows registration
118-
// order and so can differ between sessions.
119-
const environmentLabels = [
120-
...(hasLocal ? ["Local"] : []),
121-
...members
122-
.filter((member) => member.environmentId !== input.primaryEnvironmentId)
123-
.map((member) => member.environmentLabel ?? "Remote"),
124-
].filter((label, index, labels) => labels.indexOf(label) === index);
125112
const isDesktopLocal = input.isDesktopLocalEnvironment ?? (() => false);
126113
const isWsl = input.isWslEnvironment ?? (() => false);
127114
const allRemoteMembersAreDesktopLocal =
@@ -142,7 +129,6 @@ export function buildSidebarProjectSnapshots(input: {
142129
memberProjects: members,
143130
memberProjectRefs: group.memberProjectRefs,
144131
remoteEnvironmentLabels,
145-
environmentLabels,
146132
};
147133
});
148134
}

0 commit comments

Comments
 (0)