Skip to content

Commit 5177979

Browse files
committed
fix(web): keep grouped project icons consistent in settings
1 parent bd89c13 commit 5177979

3 files changed

Lines changed: 151 additions & 17 deletions

File tree

‎apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts‎

Lines changed: 120 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,125 @@
1+
import { EnvironmentId, ProjectId } from "@t3tools/contracts";
12
import { describe, expect, it } from "vite-plus/test";
23

3-
import { projectGroupTitleNeedsUpdate } from "./ProjectSettingsPanel.logic";
4+
import { buildSidebarProjectSnapshots } from "../../sidebarProjectGrouping";
5+
import type { Project } from "../../types";
6+
import {
7+
projectGroupTitleNeedsUpdate,
8+
scopeProjectSettingsGroup,
9+
} from "./ProjectSettingsPanel.logic";
10+
11+
const localEnvironmentId = EnvironmentId.make("local");
12+
const remoteEnvironmentId = EnvironmentId.make("remote");
13+
const customIcon = { kind: "lucide", name: "cloud", color: "red" } as const;
14+
15+
function makeProject(environmentId: EnvironmentId, overrides: Partial<Project> = {}): Project {
16+
return {
17+
environmentId,
18+
id: ProjectId.make(`${environmentId}-project`),
19+
title: "repo",
20+
workspaceRoot: `/${environmentId}/repo`,
21+
repositoryIdentity: {
22+
canonicalKey: "github.com/owner/repo",
23+
locator: {
24+
source: "git-remote",
25+
remoteName: "origin",
26+
remoteUrl: "https://github.com/owner/repo.git",
27+
},
28+
provider: "github",
29+
owner: "owner",
30+
name: "repo",
31+
displayName: "owner/repo",
32+
},
33+
defaultModelSelection: null,
34+
faviconPath: null,
35+
projectIcon: null,
36+
scripts: [],
37+
createdAt: "2026-07-01T00:00:00.000Z",
38+
updatedAt: "2026-07-01T00:00:00.000Z",
39+
...overrides,
40+
};
41+
}
42+
43+
function projectGroup(projects: Project[]) {
44+
return buildSidebarProjectSnapshots({
45+
projects,
46+
settings: { sidebarProjectGroupingMode: "repository", sidebarProjectGroupingOverrides: {} },
47+
primaryEnvironmentId: localEnvironmentId,
48+
resolveEnvironmentLabel: (id) => id,
49+
})[0]!;
50+
}
51+
52+
describe("scopeProjectSettingsGroup", () => {
53+
it("keeps the sidebar icon when the remote checkout was registered first", () => {
54+
const group = projectGroup([
55+
makeProject(remoteEnvironmentId),
56+
makeProject(localEnvironmentId, { projectIcon: customIcon }),
57+
]);
58+
const scoped = scopeProjectSettingsGroup(group, group.memberProjects);
59+
60+
expect(scoped.environmentId).toBe(localEnvironmentId);
61+
expect(scoped.projectIcon).toEqual(customIcon);
62+
expect(scoped.memberProjects).toHaveLength(2);
63+
expect(scoped.memberProjects[0]?.projectIcon).toBeNull();
64+
});
65+
66+
it("keeps the favicon source and automatic title with the sidebar representative", () => {
67+
const group = projectGroup([
68+
makeProject(remoteEnvironmentId, { title: "Remote repo", faviconPath: "remote.svg" }),
69+
makeProject(localEnvironmentId, { title: "Local repo", faviconPath: "local.svg" }),
70+
]);
71+
const scoped = scopeProjectSettingsGroup(group, group.memberProjects);
72+
73+
expect(scoped).toMatchObject({
74+
environmentId: localEnvironmentId,
75+
workspaceRoot: "/local/repo",
76+
title: "Local repo",
77+
faviconPath: "local.svg",
78+
});
79+
});
80+
81+
it("uses the selected environment when it excludes the sidebar representative", () => {
82+
const group = projectGroup([
83+
makeProject(remoteEnvironmentId, { faviconPath: "remote.svg" }),
84+
makeProject(localEnvironmentId, { projectIcon: customIcon }),
85+
]);
86+
const members = group.memberProjects.filter(
87+
(member) => member.environmentId === remoteEnvironmentId,
88+
);
89+
const scoped = scopeProjectSettingsGroup(group, members);
90+
91+
expect(scoped).toMatchObject({
92+
environmentId: remoteEnvironmentId,
93+
id: "remote-project",
94+
workspaceRoot: "/remote/repo",
95+
faviconPath: "remote.svg",
96+
projectIcon: null,
97+
});
98+
expect(scoped.memberProjects).toHaveLength(1);
99+
expect(group.projectIcon).toEqual(customIcon);
100+
});
101+
102+
it("uses the selected physical checkout among siblings on the same environment", () => {
103+
const group = projectGroup([
104+
makeProject(localEnvironmentId, { projectIcon: customIcon }),
105+
makeProject(localEnvironmentId, {
106+
id: ProjectId.make("other-checkout"),
107+
workspaceRoot: "/local/other-repo",
108+
projectIcon: { kind: "emoji", emoji: "🐦" },
109+
}),
110+
]);
111+
const members = group.memberProjects.filter((member) => member.id === "other-checkout");
112+
const scoped = scopeProjectSettingsGroup(group, members);
113+
114+
expect(scoped).toMatchObject({
115+
environmentId: localEnvironmentId,
116+
id: "other-checkout",
117+
workspaceRoot: "/local/other-repo",
118+
projectIcon: { kind: "emoji", emoji: "🐦" },
119+
});
120+
expect(scoped.memberProjects).toHaveLength(1);
121+
});
122+
});
4123

5124
describe("projectGroupTitleNeedsUpdate", () => {
6125
it("updates divergent member titles even when the next title is the derived group label", () => {

‎apps/web/src/components/settings/ProjectSettingsPanel.logic.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
import type {
2+
SidebarProjectGroupMember,
3+
SidebarProjectSnapshot,
4+
} from "../../sidebarProjectGrouping";
5+
6+
/** Keep the group representative unless the selected scope excludes its checkout. */
7+
export function scopeProjectSettingsGroup(
8+
group: SidebarProjectSnapshot,
9+
members: readonly SidebarProjectGroupMember[],
10+
): SidebarProjectSnapshot {
11+
const representative =
12+
members.find(
13+
(member) => member.environmentId === group.environmentId && member.id === group.id,
14+
) ?? members[0]!;
15+
return { ...group, ...representative, memberProjects: members };
16+
}
17+
118
export function projectGroupTitleNeedsUpdate(
219
memberTitles: ReadonlyArray<string>,
320
nextTitle: string,

‎apps/web/src/components/settings/ProjectSettingsPanel.tsx‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ import {
4141
} from "./ProjectFaviconPickerDialog";
4242
import { ProjectActionsSettings } from "./ProjectActionsSettings";
4343
import { ProjectDefaultsSettings } from "./ProjectDefaultsSettings";
44-
import { projectGroupTitleNeedsUpdate } from "./ProjectSettingsPanel.logic";
44+
import {
45+
projectGroupTitleNeedsUpdate,
46+
scopeProjectSettingsGroup,
47+
} from "./ProjectSettingsPanel.logic";
4548
import { useSettingsProjectGroups } from "./useSettingsProjectGroups";
4649

4750
const ProjectIconPickerDialog = lazy(() =>
@@ -142,12 +145,7 @@ export function ProjectSettingsPanel({
142145
This checkout is no longer available in the selected project and environment.
143146
</p>
144147
);
145-
const scopedGroup = {
146-
...selected,
147-
memberProjects: members,
148-
environmentId: members[0]!.environmentId,
149-
id: members[0]!.id,
150-
};
148+
const scopedGroup = scopeProjectSettingsGroup(selected, members);
151149
return (
152150
<ProjectDetail
153151
key={`${selected.projectKey}:${environmentId ?? "all"}:${checkoutKey ?? "all"}`}
@@ -171,7 +169,7 @@ function ProjectDetail({
171169
() => new Map(environments.map((environment) => [environment.environmentId, environment])),
172170
[environments],
173171
);
174-
const representative =
172+
const filePickerProject =
175173
group.memberProjects.find(
176174
(member) => environmentById.get(member.environmentId)?.serverConfig != null,
177175
) ?? group.memberProjects[0]!;
@@ -180,8 +178,8 @@ function ProjectDetail({
180178
const deleteProject = useAtomCommand(projectEnvironment.delete, { reportFailure: false });
181179
const projectNameEditedRef = useRef(false);
182180

183-
const faviconPath = representative.faviconPath ?? null;
184-
const projectIcon = representative.projectIcon ?? null;
181+
const faviconPath = group.faviconPath ?? null;
182+
const projectIcon = group.projectIcon ?? null;
185183
const pickProjectFavicon =
186184
typeof window !== "undefined" &&
187185
group.memberProjects.every(
@@ -464,7 +462,7 @@ function ProjectDetail({
464462
}
465463
control={
466464
<div className="flex items-center gap-2">
467-
<ProjectFavicon project={representative} className="size-6" />
465+
<ProjectFavicon project={group} className="size-6" />
468466
<Button
469467
size="sm"
470468
variant="outline"
@@ -527,12 +525,12 @@ function ProjectDetail({
527525
</SettingsPageContainer>
528526

529527
<ProjectFaviconPickerDialog
530-
key={`${representative.environmentId}:${representative.workspaceRoot}:${faviconPickerOpen}`}
531-
cwd={representative.workspaceRoot}
532-
environmentId={representative.environmentId}
528+
key={`${filePickerProject.environmentId}:${filePickerProject.workspaceRoot}:${faviconPickerOpen}`}
529+
cwd={filePickerProject.workspaceRoot}
530+
environmentId={filePickerProject.environmentId}
533531
onOpenChange={setFaviconPickerOpen}
534532
{...(pickProjectFavicon
535-
? { onPickExternal: () => pickProjectFavicon(representative.workspaceRoot) }
533+
? { onPickExternal: () => pickProjectFavicon(filePickerProject.workspaceRoot) }
536534
: {})}
537535
onSelect={(path) => void setProjectIcon({ faviconPath: path, projectIcon: null })}
538536
open={faviconPickerOpen}
@@ -542,7 +540,7 @@ function ProjectDetail({
542540
<Suspense fallback={null}>
543541
<ProjectIconPickerDialog
544542
current={projectIcon}
545-
projectName={representative.title}
543+
projectName={group.title}
546544
open
547545
onOpenChange={setIconPickerOpen}
548546
onSelect={(icon) => void setProjectIcon({ faviconPath: null, projectIcon: icon })}

0 commit comments

Comments
 (0)