Skip to content

Commit 2d9c196

Browse files
committed
fix(clients): preserve shared project names matching repository names
1 parent d15210c commit 2d9c196

2 files changed

Lines changed: 29 additions & 8 deletions

File tree

‎packages/client-runtime/src/state/projectGrouping.test.ts‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,41 @@ describe("buildProjectGroups", () => {
147147
);
148148
});
149149

150-
it("keeps the repository label when shared titles match its repository name", () => {
150+
it("keeps the shared title when it matches the repository name across machines", () => {
151151
const projects = [
152152
makeProject("first", "/work/t3code", { title: "t3code" }),
153-
makeProject("second", "/work/t3code-2", { title: "t3code" }),
153+
makeProject("second", "/work/t3code-2", {
154+
title: "t3code",
155+
environmentId: EnvironmentId.make("remote"),
156+
}),
157+
];
158+
159+
expect(buildProjectGroups({ projects, settings: settings("repository") })[0]?.label).toBe(
160+
"t3code",
161+
);
162+
});
163+
164+
it("falls back to the repository label until grouped project titles agree", () => {
165+
const projects = [
166+
makeProject("first", "/work/t3code", { title: "local-checkout" }),
167+
makeProject("second", "/work/t3code-2", {
168+
title: "remote-checkout",
169+
environmentId: EnvironmentId.make("remote"),
170+
}),
154171
];
155172

156173
expect(buildProjectGroups({ projects, settings: settings("repository") })[0]?.label).toBe(
157174
"T3 Code",
158175
);
176+
177+
const renamedProjects = projects.map((project) => ({ ...project, title: "t3code" }));
178+
for (const mode of ["repository", "repository_path"] as const) {
179+
const input = { projects: renamedProjects, settings: settings(mode) };
180+
expect(buildProjectGroups(input)[0]?.label).toBe("t3code");
181+
expect(
182+
buildProjectGroups({ ...input, projects: renamedProjects.toReversed() })[0]?.label,
183+
).toBe("t3code");
184+
}
159185
});
160186

161187
it("keeps physical clones in separate groups when requested", () => {

‎packages/client-runtime/src/state/projectGrouping.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,7 @@ export function deriveProjectGroupLabel(input: {
164164
input.members.map((member) => member.repositoryIdentity?.name),
165165
);
166166
const sharedTitle = sharedTitles[0];
167-
if (
168-
sharedTitles.length === 1 &&
169-
sharedTitle !== undefined &&
170-
!sharedDisplayNames.includes(sharedTitle) &&
171-
!sharedRepositoryNames.includes(sharedTitle)
172-
) {
167+
if (sharedTitles.length === 1 && sharedTitle !== undefined) {
173168
return sharedTitle;
174169
}
175170
if (sharedDisplayNames.length === 1) {

0 commit comments

Comments
 (0)