Home-Assistant/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-12-20 02:38:53 +00:00
Code Activity

Invert floor sort order to match physical layout (#27580)

Browse Source
This commit is contained in:
Tobias Bieniek
2025-10-23 14:39:58 +01:00
committed by GitHub
parent 52f37f41f0
commit e48918442c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/floor_registry.ts
View File

@@ -76,7 +76,7 @@ export const floorCompare =
const floorA = entries?.[a]; const floorA = entries?.[a];
const floorB = entries?.[b]; const floorB = entries?.[b];
if (floorA && floorB && floorA.level !== floorB.level) { if (floorA && floorB && floorA.level !== floorB.level) {
return (floorA.level ?? 9999) - (floorB.level ?? 9999); return (floorB.level ?? -9999) - (floorA.level ?? -9999);
} }
const nameA = floorA?.name ?? a; const nameA = floorA?.name ?? a;
const nameB = floorB?.name ?? b; const nameB = floorB?.name ?? b;

10
test/data/floor_registry.test.ts
View File

@@ -26,7 +26,7 @@ describe("floorCompare", () => {
}); });
describe("floorCompare(entries)", () => { describe("floorCompare(entries)", () => {
it("sorts by level, then by name", () => { it("sorts by level descending (highest to lowest), then by name", () => {
const entries = { const entries = {
floor1: { name: "Ground Floor", level: 0 } as FloorRegistryEntry, floor1: { name: "Ground Floor", level: 0 } as FloorRegistryEntry,
floor2: { name: "First Floor", level: 1 } as FloorRegistryEntry, floor2: { name: "First Floor", level: 1 } as FloorRegistryEntry,
@@ -35,13 +35,13 @@ describe("floorCompare", () => {
const floors = ["floor1", "floor2", "floor3"]; const floors = ["floor1", "floor2", "floor3"];
expect(floors.sort(floorCompare(entries))).toEqual([ expect(floors.sort(floorCompare(entries))).toEqual([
"floor3",
"floor1",
"floor2", "floor2",
"floor1",
"floor3",
]); ]);
}); });
it("treats null level as 9999, placing it at the end", () => { it("treats null level as -9999, placing it at the end", () => {
const entries = { const entries = {
floor1: { name: "Ground Floor", level: 0 } as FloorRegistryEntry, floor1: { name: "Ground Floor", level: 0 } as FloorRegistryEntry,
floor2: { name: "First Floor", level: 1 } as FloorRegistryEntry, floor2: { name: "First Floor", level: 1 } as FloorRegistryEntry,
@@ -50,8 +50,8 @@ describe("floorCompare", () => {
const floors = ["floor2", "floor3", "floor1"]; const floors = ["floor2", "floor3", "floor1"];
expect(floors.sort(floorCompare(entries))).toEqual([ expect(floors.sort(floorCompare(entries))).toEqual([
"floor1",
"floor2", "floor2",
"floor1",
"floor3", "floor3",
]); ]);
}); });