Restore old behavior when display label only computes null values

Author: gmazoyer

backend/infrahub/core/node/__init__.py

@@ -210,13 +210,15 @@ async def add_human_friendly_id(self, db: InfrahubDatabase) -> None:
         await self._human_friendly_id.compute(db=db, node=self)
 
     async def get_display_label(self, db: InfrahubDatabase) -> str:
-        if not self._display_label and self._schema.display_label:
-            await self.add_display_label(db=db)
-
         if self._display_label and (value := self._display_label.get_value(node=self, at=self._at)):
             return value
 
-        return repr(self)
+        if not self._schema.display_label:
+            return repr(self)
+
+        display_label = DisplayLabel(node_schema=self._schema, template=self._schema.display_label)
+        await display_label.compute(db=db, node=self)
+        return display_label.get_value(node=self, at=self._at) or ""
 
     def has_display_label(self) -> bool:
         return self._display_label is not None

backend/infrahub/core/node/node_property_attribute.py

@@ -150,8 +150,9 @@ async def compute(self, db: InfrahubDatabase, node: Node) -> None:
 
         if not self.is_jinja2_template:
             path_value = await node.get_path_value(db=db, path=self.template)
-            # Use .value for enum to keep compat with old style display label
-            self.set_value(value=str(path_value if not isinstance(path_value, Enum) else path_value.value))
+            if path_value is not None:
+                # Use .value for enum to keep compat with old style display label
+                self.set_value(value=str(path_value if not isinstance(path_value, Enum) else path_value.value))
             return
 
         jinja2_template = InfrahubJinja2Template(template=self.template)