Merge pull request #4413 from opsmill/dga-20240921-fix-4382

Fix rendering of display label for attribute with enum

Author: dgarros

backend/infrahub/core/node/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from enum import Enum
 from typing import TYPE_CHECKING, Any, Optional, Union
 
 from infrahub_sdk import UUIDT
@@ -590,7 +591,11 @@ async def render_display_label(self, db: Optional[InfrahubDatabase] = None) -> s
                 raise ValidationError("Only Attribute can be used in Display Label")
 
             attr = getattr(self, item_elements[0])
-            display_elements.append(getattr(attr, item_elements[1]))
+            attr_value = getattr(attr, item_elements[1])
+            if isinstance(attr_value, Enum):
+                display_elements.append(attr_value.value)
+            else:
+                display_elements.append(attr_value)
 
         if not display_elements or all(de is None for de in display_elements):
             return ""

backend/tests/unit/core/test_node.py

@@ -196,6 +196,8 @@ async def test_render_display_label(db: InfrahubDatabase, default_branch: Branch
             {"name": "firstname", "kind": "Text"},
             {"name": "lastname", "kind": "Text"},
             {"name": "age", "kind": "Number"},
+            {"name": "color", "kind": "Text", "enum": ["blue", "red"], "default_value": "red"},
+            {"name": "height", "kind": "Number", "enum": [170, 180], "default_value": 170},
         ],
     }
 
@@ -224,6 +226,24 @@ async def test_render_display_label(db: InfrahubDatabase, default_branch: Branch
     await obj.new(db=db, firstname="John", lastname="Doe", age=99)
     assert await obj.render_display_label(db=db) == f"TestDisplay(ID: {obj.id})[NEW]"
 
+    # Display Labels with an ENUM String
+    schema_01["display_labels"] = ["firstname__value", "color__value"]
+    node_schema = NodeSchema(**schema_01)
+    registry.schema.set(name=node_schema.kind, schema=node_schema)
+
+    obj = await Node.init(db=db, schema=node_schema)
+    await obj.new(db=db, firstname="John", lastname="Doe", age=99, color="red")
+    assert await obj.render_display_label(db=db) == "John red"
+
+    # Display Labels with an ENUM Number
+    schema_01["display_labels"] = ["firstname__value", "height__value"]
+    node_schema = NodeSchema(**schema_01)
+    registry.schema.set(name=node_schema.kind, schema=node_schema)
+
+    obj = await Node.init(db=db, schema=node_schema)
+    await obj.new(db=db, firstname="John", lastname="Doe", age=99, height=180)
+    assert await obj.render_display_label(db=db) == "John 180"
+
 
 async def test_get_hfid(db: InfrahubDatabase, default_branch, animal_person_schema):
     person_schema = animal_person_schema.get(name="TestPerson")

changelog/4382.fixed.md

@@ -0,0 +1 @@
+Display label composed of an attribute of type Enum will now render correctly