Skip to content

fix: project edit dialog does not persist name and icon changes for local projects #33494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Leto117 wants to merge 1 commit into from
Closed

fix: project edit dialog does not persist name and icon changes for local projects #33494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/app/src/context/global.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,18 @@ function createServerCtx(
? sync.data.project.find((x) => x.id === projectID)
: sync.data.project.find((x) => x.worktree === project.worktree)

// Preserve local icon override from per-workspace localStorage cache (childStore.icon).
// Preserve local project overrides from per-workspace localStorage cache (childStore.projectMeta).
// Without this, different subdirectories of the same git repo would share the same
// icon from the database instead of using their individual overrides.
// name and icon from the database instead of using their individual overrides.
const base = { ...metadata, ...project }
if (childStore.projectMeta?.name) {
base.name = childStore.projectMeta.name
}
// Apply icon override from projectMeta (written by projectMeta() for local projects)
if (childStore.projectMeta?.icon?.override) {
return { ...base, icon: { ...base.icon, override: childStore.projectMeta.icon.override } }
}
// Fallback: legacy icon override from projectIcon() (written for server projects)
if (childStore.icon) {
return { ...base, icon: { ...base.icon, override: childStore.icon } }
}
Expand Down
Loading