Skip to content

Commit ad191f0

Browse files
fix(web): keep grouped project renames
1 parent be7d35a commit ad191f0

3 files changed

Lines changed: 31 additions & 3 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
3+
import { projectGroupTitleNeedsUpdate } from "./ProjectSettingsPanel.logic";
4+
5+
describe("projectGroupTitleNeedsUpdate", () => {
6+
it("updates divergent member titles even when the next title is the derived group label", () => {
7+
expect(projectGroupTitleNeedsUpdate(["local-title", "remote-title"], "Repository name")).toBe(
8+
true,
9+
);
10+
});
11+
12+
it("skips an update when every member already has the next title", () => {
13+
expect(projectGroupTitleNeedsUpdate(["Shared name", "Shared name"], "Shared name")).toBe(false);
14+
});
15+
});
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export function projectGroupTitleNeedsUpdate(
2+
memberTitles: ReadonlyArray<string>,
3+
nextTitle: string,
4+
): boolean {
5+
return memberTitles.some((title) => title !== nextTitle);
6+
}

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ import {
109109
SettingsSection,
110110
} from "./settingsLayout";
111111
import { ProjectFaviconPickerDialog } from "./ProjectFaviconPickerDialog";
112+
import { projectGroupTitleNeedsUpdate } from "./ProjectSettingsPanel.logic";
112113

113114
export const PROJECT_GROUPING_MODE_LABELS: Record<SidebarProjectGroupingMode, string> = {
114115
repository: "Group by repository",
@@ -384,11 +385,17 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
384385
toastManager.add({ type: "warning", title: "Project title cannot be empty" });
385386
return;
386387
}
387-
if (title === group.displayName) return;
388-
if (group.memberProjects.every((member) => member.title === title)) return;
388+
if (
389+
!projectGroupTitleNeedsUpdate(
390+
group.memberProjects.map((member) => member.title),
391+
title,
392+
)
393+
) {
394+
return;
395+
}
389396
await updateAllMembers({ title }, "Failed to rename project");
390397
},
391-
[group.displayName, group.memberProjects, updateAllMembers],
398+
[group.memberProjects, updateAllMembers],
392399
);
393400

394401
// ----- default model -----

0 commit comments

Comments
 (0)