fix(web): keep grouped project renames (#7831)

Mohtasham Murshid committed 2 months agov0.0.34-nightly.20260825.1185

Commit e67074f1 parent 5d766533 files · +49 −5Browse files

Unified · Split

3 files

apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts +23 −0
apps/web/src/components/settings/ProjectSettingsPanel.logic.ts +7 −0
apps/web/src/components/settings/ProjectSettingsPanel.tsx +19 −5

apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts+23−0

@@ -0,0 +1,23 @@
	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(
	8	projectGroupTitleNeedsUpdate(["local-title", "remote-title"], "Repository name", true),
	9	).toBe(true);
	10	});
	11
	12	it("skips an untouched blur when the derived label differs from member titles", () => {
	13	expect(projectGroupTitleNeedsUpdate(["repo-slug", "repo-slug"], "Repository Name", false)).toBe(
	14	false,
	15	);
	16	});
	17
	18	it("skips an update when every member already has the next title", () => {
	19	expect(projectGroupTitleNeedsUpdate(["Shared name", "Shared name"], "Shared name", true)).toBe(
	20	false,
	21	);
	22	});
	23	});

apps/web/src/components/settings/ProjectSettingsPanel.logic.ts+7−0

@@ -0,0 +1,7 @@
	1	export function projectGroupTitleNeedsUpdate(
	2	memberTitles: ReadonlyArray<string>,
	3	nextTitle: string,
	4	wasEdited: boolean,
	5	): boolean {
	6	return wasEdited && memberTitles.some((title) => title !== nextTitle);
	7	}

apps/web/src/components/settings/ProjectSettingsPanel.tsx+19−5

   canPickExternalProjectFavicon,
   ProjectFaviconPickerDialog,
 } from "./ProjectFaviconPickerDialog";
+import { projectGroupTitleNeedsUpdate } from "./ProjectSettingsPanel.logic";
 export const PROJECT_GROUPING_MODE_LABELS: Record<SidebarProjectGroupingMode, string> = {
   repository: "Group by repository",
   const removeKeybinding = useAtomCommand(serverEnvironment.removeKeybinding, {
     reportFailure: false,
   });
+  const projectNameEditedRef = useRef(false);
   const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
     onCopy: ({ path }) => {
       toastManager.add({ type: "success", title: "Path copied", description: path });
   );
   const renameGroup = useCallback(
-    async (nextTitle: string) => {
+    async (nextTitle: string, wasEdited: boolean) => {
       const title = nextTitle.trim();
       if (!title) {
         toastManager.add({ type: "warning", title: "Project title cannot be empty" });
         return;
       }
-      if (title === group.displayName) return;
+      if (
-      if (group.memberProjects.every((member) => member.title === title)) return;
+        !projectGroupTitleNeedsUpdate(
+          group.memberProjects.map((member) => member.title),
+          title,
+          wasEdited,
+        )
+      ) {
+        return;
+      }
       await updateAllMembers({ title }, "Failed to rename project");
     },
-    [group.displayName, group.memberProjects, updateAllMembers],
+    [group.memberProjects, updateAllMembers],
   );
   // ----- default model -----
                 className="w-full sm:w-64"
                 aria-label="Project name"
                 defaultValue={group.displayName}
+                onChange={() => {
+                  projectNameEditedRef.current = true;
+                }}
                 onBlur={(event) => {
-                  void renameGroup(event.currentTarget.value);
+                  const wasEdited = projectNameEditedRef.current;
+                  projectNameEditedRef.current = false;
+                  void renameGroup(event.currentTarget.value, wasEdited);
                 }}
                 onKeyDown={(event) => {
                   if (event.key === "Enter") event.currentTarget.blur();