The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 23:30 UTC
fix(web): keep grouped project icons consistent in settings (#14493)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Henrique committed
Nov 11, 2026 at 16:55 UTC
0e1f01ec85f13d75b54c26c11f7acc45bb8176f2
3 files changed
+117
-16
apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts
+91
-1
@@ -1,7 +1,97 @@
1
import { describe, expect, it } from "vite-plus/test";
2
-import { EnvironmentId, ProjectId, ThreadId } from "@t3tools/contracts";
2
+import { EnvironmentId, ProjectId, SourceControlProviderKind, ThreadId } from "@t3tools/contracts";
3
import { planProjectRemoval } from "@t3tools/client-runtime/state/projects";
4
5
+import { buildSidebarProjectSnapshots } from "../../sidebarProjectGrouping";
6
+import type { Project } from "../../types";
7
+import { scopeProjectSettingsGroup } from "./ProjectSettingsPanel.logic";
8
+
9
+const localEnvironmentId = EnvironmentId.make("local");
10
+const remoteEnvironmentId = EnvironmentId.make("remote");
11
+const customIcon = { kind: "lucide", name: "cloud", color: "red" } as const;
12
+
13
+function makeProject(environmentId: EnvironmentId, overrides: Partial<Project> = {}): Project {
14
+ return {
15
+ environmentId,
16
+ id: ProjectId.make(`${environmentId}-project`),
17
+ title: "repo",
18
+ workspaceRoot: `/${environmentId}/repo`,
19
+ repositoryIdentity: {
20
+ canonicalKey: "github.com/owner/repo",
21
+ locator: {
22
+ source: "git-remote",
23
+ remoteName: "origin",
24
+ remoteUrl: "https://github.com/owner/repo.git",
25
+ },
26
+ provider: SourceControlProviderKind.make("github"),
27
+ owner: "owner",
28
+ name: "repo",
29
+ displayName: "owner/repo",
30
+ },
31
+ defaultModelSelection: null,
32
+ faviconPath: null,
33
+ projectIcon: null,
34
+ scripts: [],
35
+ createdAt: "2026-07-01T00:00:00.000Z",
36
+ updatedAt: "2026-07-01T00:00:00.000Z",
37
+ ...overrides,
38
+ };
39
+}
40
+
41
+function projectGroup(projects: Project[]) {
42
+ return buildSidebarProjectSnapshots({
43
+ projects,
44
+ settings: { sidebarProjectGroupingMode: "repository", sidebarProjectGroupingOverrides: {} },
45
+ primaryEnvironmentId: localEnvironmentId,
46
+ resolveEnvironmentLabel: (id) => id,
47
+ })[0]!;
48
+}
49
+
50
+describe("scopeProjectSettingsGroup", () => {
51
+ it("keeps the sidebar preview identity and edit targets when the remote checkout was registered first", () => {
52
+ const local = makeProject(localEnvironmentId, {
53
+ title: "Local repo",
54
+ faviconPath: "local.svg",
55
+ projectIcon: customIcon,
56
+ });
57
+ const remote = makeProject(remoteEnvironmentId, {
58
+ title: "Remote repo",
59
+ faviconPath: "remote.svg",
60
+ });
61
+ const group = projectGroup([remote, local]);
62
+ const scoped = scopeProjectSettingsGroup(group, group.memberProjects);
63
+
64
+ expect(group).toMatchObject(local);
65
+ expect(scoped).toMatchObject(local);
66
+ expect(scoped.memberProjects).toBe(group.memberProjects);
67
+ expect(scoped.memberProjects).toMatchObject([remote, local]);
68
+ });
69
+
70
+ it.each([
71
+ [remoteEnvironmentId, "local-project"],
72
+ [localEnvironmentId, "other-checkout"],
73
+ ])("uses the complete selected checkout identity for %s/%s", (environmentId, id) => {
74
+ const local = makeProject(localEnvironmentId, { projectIcon: customIcon });
75
+ const selected = makeProject(environmentId, {
76
+ id: ProjectId.make(id),
77
+ title: "Selected checkout",
78
+ workspaceRoot: "/selected/repo",
79
+ faviconPath: "selected.svg",
80
+ projectIcon: null,
81
+ });
82
+ const group = projectGroup([local, selected]);
83
+ const members = group.memberProjects.filter(
84
+ (member) => member.environmentId === selected.environmentId && member.id === selected.id,
85
+ );
86
+ const scoped = scopeProjectSettingsGroup(group, members);
87
+
88
+ expect(scoped).toMatchObject(selected);
89
+ expect(scoped.memberProjects).toBe(members);
90
+ expect(scoped.memberProjects).toMatchObject([selected]);
91
+ expect(group).toMatchObject(local);
92
+ });
93
+});
94
+
95
describe("project removal confirmation", () => {
96
const local = {
97
id: ProjectId.make("shared-id"),
apps/web/src/components/settings/ProjectSettingsPanel.logic.ts
+15
@@ -1,5 +1,9 @@
1
import type { ProjectIconOverride } from "@t3tools/contracts";
2
3
+import type {
4
+ SidebarProjectGroupMember,
5
+ SidebarProjectSnapshot,
6
+} from "../../sidebarProjectGrouping";
7
import type { Project } from "../../types";
8
9
export const SCRATCH_PROJECT_TITLE = "No project";
@@ -9,6 +13,17 @@ const SCRATCH_PROJECT_ICON = {
13
color: "gray",
14
} as const satisfies ProjectIconOverride;
15
16
+export function scopeProjectSettingsGroup(
17
+ group: SidebarProjectSnapshot,
18
+ members: readonly SidebarProjectGroupMember[],
19
+): SidebarProjectSnapshot {
20
+ const representative =
21
+ members.find(
22
+ (member) => member.environmentId === group.environmentId && member.id === group.id,
23
+ ) ?? members[0]!;
24
+ return { ...group, ...representative, memberProjects: members };
25
+}
26
+
27
export function projectGroupTitleNeedsUpdate(
28
memberTitles: ReadonlyArray<string>,
29
nextTitle: string,
apps/web/src/components/settings/ProjectSettingsPanel.tsx
+11
-15
@@ -55,6 +55,7 @@ import {
55
hasDefaultProjectIcon,
56
projectGroupTitleNeedsUpdate,
57
SCRATCH_PROJECT_TITLE,
58
+ scopeProjectSettingsGroup,
59
} from "./ProjectSettingsPanel.logic";
60
import { useSettingsProjectGroups } from "./useSettingsProjectGroups";
61
import { readUnloadedThreadCount } from "../../state/olderSettledShelf";
@@ -235,12 +236,7 @@ export function ProjectSettingsPanel({
236
This checkout is no longer available in the selected project and environment.
237
</p>
238
);
238
- const scopedGroup = {
239
- ...selected,
240
- memberProjects: members,
241
- environmentId: members[0]!.environmentId,
242
- id: members[0]!.id,
243
- };
239
+ const scopedGroup = scopeProjectSettingsGroup(selected, members);
240
return (
241
<ProjectDetail
242
key={`${selected.projectKey}:${environmentId ?? "all"}:${checkoutKey ?? "all"}`}
@@ -271,7 +267,7 @@ function ProjectDetail({
267
const canEditGroup = group.memberProjects.every((member) =>
268
editableIds.has(member.environmentId),
269
);
274
- const representative =
270
+ const filePickerProject =
271
group.memberProjects.find(
272
(member) => environmentById.get(member.environmentId)?.serverConfig != null,
273
) ?? group.memberProjects[0]!;
@@ -281,8 +277,8 @@ function ProjectDetail({
277
});
278
const projectNameEditedRef = useRef(false);
279
284
- const faviconPath = representative.faviconPath ?? null;
285
- const projectIcon = representative.projectIcon ?? null;
280
+ const faviconPath = group.faviconPath ?? null;
281
+ const projectIcon = group.projectIcon ?? null;
282
const pickProjectFavicon =
283
typeof window !== "undefined" &&
284
group.memberProjects.every(
@@ -582,7 +578,7 @@ function ProjectDetail({
578
}
579
control={
580
<div className="flex items-center gap-2">
585
- <ProjectFavicon project={representative} className="size-6" />
581
+ <ProjectFavicon project={group} className="size-6" />
582
<Button
583
size="sm"
584
variant="outline"
@@ -692,12 +688,12 @@ function ProjectDetail({
688
</SettingsPageContainer>
689
690
<ProjectFaviconPickerDialog
695
- key={`${representative.environmentId}:${representative.workspaceRoot}:${faviconPickerOpen}`}
696
- cwd={representative.workspaceRoot}
697
- environmentId={representative.environmentId}
691
+ key={`${filePickerProject.environmentId}:${filePickerProject.workspaceRoot}:${faviconPickerOpen}`}
692
+ cwd={filePickerProject.workspaceRoot}
693
+ environmentId={filePickerProject.environmentId}
694
onOpenChange={setFaviconPickerOpen}
695
{...(pickProjectFavicon
700
- ? { onPickExternal: () => pickProjectFavicon(representative.workspaceRoot) }
696
+ ? { onPickExternal: () => pickProjectFavicon(filePickerProject.workspaceRoot) }
697
: {})}
698
onSelect={(path) => void setProjectIcon({ faviconPath: path, projectIcon: null })}
699
open={faviconPickerOpen && canEditGroup}
@@ -707,7 +703,7 @@ function ProjectDetail({
703
<Suspense fallback={null}>
704
<ProjectIconPickerDialog
705
current={projectIcon}
710
- projectName={representative.title}
706
+ projectName={group.title}
707
open
708
onOpenChange={setIconPickerOpen}
709
onSelect={(icon) => void setProjectIcon({ faviconPath: null, projectIcon: icon })}