>>> [!note] Migrated issue <!-- Drupal.org comment --> <!-- Migrated from issue #3625023. --> Reported by: [heddn](https://www.drupal.org/user/1463982) Related to !171 >>> <h3 id="summary-problem-motivation">Problem/Motivation</h3> <p>The workspace switcher dropdown (<code>WseWorkspaceSwitcherForm</code>) and the workspace collection page (<code>WseWorkspaceListBuilder</code>) have two related bugs:</p> <ul> <li>If the active workspace doesn't happen to fall within the "recent workspaces" list or the capped "open workspaces" query result (e.g. <code>switcher_max_options</code> is set and the active workspace wasn't recently used), it silently disappears from the switcher dropdown entirely &mdash; the form's <code>#default_value</code> then points at an option that doesn't exist.</li> <li>The "recent workspaces" list stored in tempstore is a plain <code>[workspace_id =&gt; timestamp]</code> map. <code>getRecentWorkspaces()</code> iterates it in insertion order (order of first activation), not by timestamp, so the entries kept after applying <code>switcher_max_options</code> (via <code>array_slice</code>) aren't reliably the <em>most recently</em> used ones. The workspace collection page (<code>WseWorkspaceListBuilder</code>) is ordered by workspace ID (the default entity list sort), not by how recently a workspace was changed.</li> </ul> <p>LLM in use.</p> <h4 id="summary-steps-reproduce">Steps to reproduce</h4> <ol> <li>Set <code>wse.settings:switcher_max_options</code> to a small number (e.g. 2).</li> <li>Create and activate 3+ workspaces, in an order such that the currently active one is not among the most recent entries once the cap is applied.</li> <li>Open the workspace switcher dropdown.</li> </ol> <p>Expected: the active workspace is always present in the dropdown, and the "Recent workspaces" group reflects actual access recency.</p> <p>Actual: the active workspace can be missing from the dropdown, and the recent-workspaces ordering doesn't reliably match last-accessed order.</p> <h3 id="summary-proposed-resolution">Proposed resolution</h3> <ul> <li><code>WorkspaceSwitchSubscriber::onWorkspaceSwitch()</code>: unset the workspace's key before re-adding it, so the recent-workspaces map's insertion order reflects access recency.</li> <li><code>WseWorkspaceSwitcherForm::getRecentWorkspaces()</code>: sort the recent-workspaces map by timestamp (<code>arsort()</code>) before slicing to <code>switcher_max_options</code>, instead of relying on storage order.</li> <li><code>WseWorkspaceSwitcherForm::getWorkspaceOptions()</code>: add an <code>ensureActiveWorkspaceOption()</code> step that appends the active workspace to the appropriate group if it isn't already listed (and it's still open), called both on the early-return path and the normal path.</li> <li><code>WseWorkspaceListBuilder</code>: sort by <code>changed</code> DESC at the query level (<code>getEntityListQuery()</code>) so the pager selects the right page of results, and re-sort after <code>load()</code> since <code>loadMultiple()</code> doesn't guarantee the query's order survives.</li> </ul> <h3 id="summary-remaining-tasks">Remaining tasks</h3> <ul> <li>Write the patch/MR.</li> <li>Add test coverage for: active workspace appearing in the dropdown despite the options cap; recent-workspaces ordering reflecting actual access time; workspace collection page ordering by most recently changed.</li> <li>Review.</li> </ul> <h3 id="summary-ui-changes">User interface changes</h3> <p>The workspace switcher dropdown will always include the active workspace. The "Recent workspaces" group and the workspace collection page will order by most-recently-updated instead of by first-activation and workspace ID, respectively.</p> <h3 id="summary-api-changes">API changes</h3> <p>None. All changes are internal to <code>WorkspaceSwitchSubscriber</code>, <code>WseWorkspaceSwitcherForm</code>, and <code>WseWorkspaceListBuilder</code>.</p> <h3 id="summary-data-model-changes">Data model changes</h3> <p>None.</p>