Repository navigation
fix(ui): reflect status organization in the Folder order controls (OH-46) - #24
Merged
Merged
Conversation
…-46) Group by Agent or Ticket Status always projects folders ahead of loose rows, yet Mixed stayed enabled and checked there. Status sorting turns dragging off, yet Mixed still told users to drag. Decide this once in resolveSessionListFolderSortControl, which feeds the sidebar menu and Session Settings. Status grouping locks both choices to effective folders first and the saved choice returns afterwards. Status sorting keeps the choice but points to Custom order. The flat view and the Settings subtitle now describe where Mixed applies.
Status grouping now places a folder's subfolders ahead of its own sessions, so the locked Folders first state holds at every depth. Status sorting reorders sessions only within one folder's members or one run of loose sessions, so a loose session never lands under a folder header. When status grouping and date sorting are both on, the lock names both steps. In Group by machine with status sorting, Mixed names both the layout and the Sort menu step. The status sorting copy now points at the sidebar Sort menu, which is what turns status sorting off, so Session Settings no longer suggests a choice that is already selected there. The sidebar menu and Session Settings share one lock subtitle helper.
andorcassian
marked this pull request as ready for review
November 4, 2026 18:56
Resolve projectSessionListStatusView against OH-71. Flat status sorting takes the OH-71 scope rule: each folder's members and the loose rows sort across their own slots, so saved blocks stay in place. Status grouping keeps folders first at every depth. The fallback for rows of an unheaded folder is gone, because OH-71 only keys members by headed folders.
andorcassian
deleted the
feature/OH-46-folder-order-status-organization
branch
November 4, 2026 20:09
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes
Folder order now reflects status organization, which the earlier OH-46 work did not consider.
resolveSessionListFolderSortControlinsessionListOrderingRules.tsreturns the effective mode, any lock, and whether status sorting blocks dragging. The sidebar menu and Session Settings both use it, and they share one lock subtitle helper, so they cannot diverge.SessionListStatusModeandnormalizeSessionListStatusModelive in the rules file. Session Settings and the list view state share that parsing.docs/fork-development.mdis updated.Decisions made without a product review:
resolveEffectiveSessionListFolderSortModestill orders the source, and the status layer is applied on top of it.Validation
Round 1 RED, before implementation: 10 of 77 tests failed on the original gap or the missing rule API.
Review round RED: new tests failed for the intended reason before the fix: nested subfolder order under status grouping, status sorting across a folder boundary, the combined lock in the rule and in Session Settings. The machine view plus status sorting test was proven by temporarily restoring the old subtitle order (it failed, then passed again once restored).
GREEN: 102 of 102 tests passed across 8 files (rule, status projection, session folders shell, Session Settings, status menu, repository ordering, web virtualization,
i18n.integrity.test.ts), plus 10 of 10 in the status organization settings and organization cache tests.yarn --cwd apps/ui typecheckpassed.Merged
origin/devto resolve a conflict with OH-71 inprojectSessionListStatusView.ts. Flat status sorting takes OH-71's slot-scoped rule. My earlier test that kept the loose runs on either side of a folder separate now expects OH-71's order, and it still asserts that the folder's member stays under its header. Status grouping keeps folders first at every depth. After the merge: 178 of 178 tests passed across 6 files (projection, rules, session folders shell, Session Settings, web virtualization,i18n.integrity.test.ts), andyarn --cwd apps/ui typecheckpassed.Before the merge, hosted
CI — Testspassed at 8d7b990 after one rerun of failed jobs. The first attempt failed in two places unrelated to this diff:newSession.resumeId.browseFill.spec.ts(the /new machine selection never navigated; the same failure at the same line appears on another, unrelated PR) and a 1 secondvi.waitFortimeout insync.sessionOrganizationWarmCache.test.ts(it passed 3 of 3 times locally on this head).After the merge, hosted
CI — Testspassed at 808d17f after one rerun of failed jobs. The first attempt failed only the samesync.sessionOrganizationWarmCache.test.ts1 secondvi.waitFortimeout (1016ms). That test's shard holds none of this PR's test files, and its import path gains only two pure functions and a type.The Copilot review did not arrive for either head after the PR was marked ready.
Not run:
sessionList.statusOrganization.spec.tshas no folders, so it cannot observe the projection change. It was not extended or run here. Hosted CI still owns the existing specs.Scope and deferrals
Adjacent issues found and not fixed:
orderingMode.customis still English in several locales, while the Folder order copy in those locales uses a translated name.Tracks OH-46.