Default floor level to None (and allow unsetting it) (#114249)

homeassistant/components/config/floor_registry.py

@@ -43,7 +43,7 @@ def websocket_list_floors(
         vol.Required("name"): str,
         vol.Optional("aliases"): list,
         vol.Optional("icon"): vol.Any(str, None),
-        vol.Optional("level"): int,
+        vol.Optional("level"): vol.Any(int, None),
     }
 )
 @websocket_api.require_admin
@@ -98,7 +98,7 @@ def websocket_delete_floor(
         vol.Required("floor_id"): str,
         vol.Optional("aliases"): list,
         vol.Optional("icon"): vol.Any(str, None),
-        vol.Optional("level"): int,
+        vol.Optional("level"): vol.Any(int, None),
         vol.Optional("name"): str,
     }
 )

homeassistant/helpers/floor_registry.py

@@ -42,7 +42,7 @@ class FloorEntry(NormalizedNameBaseRegistryEntry):
     aliases: set[str]
     floor_id: str
     icon: str | None = None
-    level: int = 0
+    level: int | None = None
 
 
 class FloorRegistry(BaseRegistry):
@@ -99,7 +99,7 @@ class FloorRegistry(BaseRegistry):
         *,
         aliases: set[str] | None = None,
         icon: str | None = None,
-        level: int = 0,
+        level: int | None = None,
     ) -> FloorEntry:
         """Create a new floor."""
         if floor := self.async_get_floor_by_name(name):

tests/components/config/test_floor_registry.py

@@ -44,7 +44,7 @@ async def test_list_floors(
         "icon": None,
         "floor_id": "first_floor",
         "name": "First floor",
-        "level": 0,
+        "level": None,
     }
     assert msg["result"][1] == {
         "aliases": unordered(["top floor", "attic"]),
@@ -72,7 +72,7 @@ async def test_create_floor(
         "icon": None,
         "floor_id": "first_floor",
         "name": "First floor",
-        "level": 0,
+        "level": None,
     }
 
     await client.send_json_auto_id(
@@ -196,7 +196,7 @@ async def test_update_floor(
             "name": "First floor",
             "aliases": [],
             "icon": None,
-            "level": 1,
+            "level": None,
             "type": "config/floor_registry/update",
         }
     )
@@ -209,7 +209,7 @@ async def test_update_floor(
         "icon": None,
         "floor_id": floor.floor_id,
         "name": "First floor",
-        "level": 1,
+        "level": None,
     }
 
 

tests/helpers/test_floor_registry.py

@@ -134,7 +134,7 @@ async def test_update_floor(
     assert floor.name == "First floor"
     assert floor.icon is None
     assert floor.aliases == set()
-    assert floor.level == 0
+    assert floor.level is None
 
     updated_floor = floor_registry.async_update(
         floor.floor_id,