fix(sidebar): pin vgroup rows before flat rows on sort

This commit is contained in:
zipg authored and GitHub committed 2026-09-20 12:52:50 +08:00
1 parent 33afb0b432
commit 758d21167a
4 files changed
+115 -8

No files matched your search

@@ -17,7 +17,38 @@ function sortRecursive(node: TreeNode, databaseType?: DatabaseType): TreeNode {
};
}
/**
* Virtual table groups are a display-level projection (see
* `applyTableVGroupsToChildren`) whose order comes from the stored layout, not
* from the alphabet. Every ordering pass therefore has to leave them ahead of
* the flat rows: a name-sorted metadata merge would otherwise drop a group back
* to its alphabetical slot, and the row would visibly jump from the top of the
* list to the bottom until the next projection ran (issues #9644 / #9653).
*/
function hoistTableVGroupChildren(nodes: TreeNode[]): TreeNode[] {
if (!nodes.some((node) => node.type === "table-vgroup")) return nodes;
return [...nodes.filter((node) => node.type === "table-vgroup"), ...nodes.filter((node) => node.type !== "table-vgroup")];
}
export function sortSidebarTreeChildrenForParent(parent: Pick<TreeNode, "type">, children: readonly TreeNode[], databaseType?: DatabaseType): TreeNode[] {
return hoistTableVGroupChildren(orderSidebarTreeChildrenForParent(parent, children, databaseType));
}
/**
* Orders a container whose rows are merged from paged metadata: only the flat
* rows are sorted by label, while projected virtual table groups keep the
* position (and relative order) the layout projection gave them. Sorting the
* groups by name would move them out of the top slot they were projected into
* (issues #9644 / #9653).
*/
export function sortSidebarTreeChildrenByNameKeepingTableVGroups(parent: Pick<TreeNode, "type">, children: readonly TreeNode[], databaseType?: DatabaseType): TreeNode[] {
const groups = children.filter((node) => node.type === "table-vgroup");
const flat = children.filter((node) => node.type !== "table-vgroup");
const orderedFlat = [...flat].sort((left, right) => sidebarTreeCollator.compare(left.label, right.label));
return sortSidebarTreeChildrenForParent(parent, [...groups, ...orderedFlat], databaseType);
}
function orderSidebarTreeChildrenForParent(parent: Pick<TreeNode, "type">, children: readonly TreeNode[], databaseType?: DatabaseType): TreeNode[] {
const normalized = children.map((child) => sortRecursive(child, databaseType));
if (parent.type === "mongo-db") {