Skip to content

fix(sidebar): hide stack-member services from flat list#48

Merged
erdembas merged 2 commits intoerdembas:mainfrom
bedirhansay:fix/sidebar-hide-stack-members
Apr 25, 2026
Merged

fix(sidebar): hide stack-member services from flat list#48
erdembas merged 2 commits intoerdembas:mainfrom
bedirhansay:fix/sidebar-hide-stack-members

Conversation

@bedirhansay
Copy link
Copy Markdown
Contributor

Summary

Services assigned to a stack were appearing twice in the sidebar —
once inside the stack's detail view and again as standalone entries
under Unassigned / their section. This PR hides stack members from
the flat list so they only surface through the stack row, giving a
clean nested hierarchy.

Changes

  • SidebarRail.tsx: compute a set of service IDs belonging to any
    stack and skip them in filteredServices.
  • Subtract stack members from hiddenCount so the "Showing N · M
    hidden" banner stays filter-only and doesn't misreport nesting as
    hiding.

Verification

  • pnpm typecheck
  • pnpm lint
  • pnpm format:check
  • cargo fmt --check (src-tauri) — untouched by this PR
  • cargo clippy -- -D warnings (src-tauri) — untouched by this
    PR
  • Manually: created a stack with 4 services, verified only the
    stack row shows in the sidebar; expanding stack detail still lists
    all members; removing a service from the stack brings it back to
    the flat list automatically.

Screenshots / demo

Before — stack members duplicated under Unassigned:

After — only non-stack services in the flat list:

Notes for reviewers

One file, ~26 added / 2 removed. Stack detail view,
drag-to-reassign, filter banner, and collapsed sidebar mode are
unchanged. The collapsed (narrow) sidebar icon grid still shows
every service because stacks aren't navigable in that mode —
intentional trade-off.

- Added GitStatusChip component to display the current Git status for each service.
- Implemented IPC methods for Git operations including fetching branches, checking out branches, creating branches, and stashing changes.
- Enhanced the app store to manage Git status snapshots per service.
- Created a new git module in the core crate to handle Git operations using the CLI.
- Updated LogPanel to show Git status and allow branch management directly from the UI.
- Added tests for Git functionalities including status checks, branch creation, and switching.
@bedirhansay bedirhansay requested a review from erdembas as a code owner April 24, 2026 16:39
@bedirhansay bedirhansay changed the title fix(sidebar): hide stack-member services from flat list fix(sidebar): hide stack-member services from flat list Apr 24, 2026
@github-actions github-actions Bot added the rust label Apr 24, 2026
@erdembas erdembas merged commit 35386ac into erdembas:main Apr 25, 2026
11 checks passed
erdembas pushed a commit that referenced this pull request Apr 25, 2026
…0.6.0

Adds two entries from #49 (thanks @bedirhansay) into the unreleased 0.6.0
section:

- Quality of Life: keyboard-driven UI zoom (Cmd/Ctrl + 0 / - / Shift+0),
  layout-aware key bindings, localStorage persistence.
- Bug Fixes: ScanCache TTL is now instance-scoped so the test suite stops
  panicking on fresh Windows CI runners with `Instant::now()` < TTL.

Sidebar dedup attribution stays as-is (already credited via #48).

Made-with: Cursor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants