From f7e954eeec4120b8a0df2997fce8156863dbd1af Mon Sep 17 00:00:00 2001 From: "Sode, Adedamola (DLSLtd,RAL,LSCI)" Date: Tue, 30 Jun 2026 09:00:14 +0000 Subject: [PATCH 1/2] changed from suffix to name in _update_macros --- src/techui_builder/generate.py | 5 +++-- tests/test_generate.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/techui_builder/generate.py b/src/techui_builder/generate.py index c51246d3..786cbdb7 100644 --- a/src/techui_builder/generate.py +++ b/src/techui_builder/generate.py @@ -162,11 +162,12 @@ def _update_macros(self, component: Entity) -> tuple[str, dict[str, str]]: component_name = component.type suffix_key = suffix = "" + name = suffix.removeprefix(":").removesuffix(":") # Try to get name from child labels if they exist, # if not, just use the name as it is. if component.child_labels is not None: - if suffix in component.child_labels.keys(): - component_name = component.child_labels[suffix] + if name in component.child_labels.keys(): + component_name = component.child_labels[name] self.label_flag = True prefix_key = next(k for k, v in component.macros.items() if v == prefix) diff --git a/tests/test_generate.py b/tests/test_generate.py index ddd3309c..af4197f2 100644 --- a/tests/test_generate.py +++ b/tests/test_generate.py @@ -198,7 +198,7 @@ def test_generator_update_macros_suffix_with_child_labels(generator): desc=None, service_name="bl01t-mo-test-01", macros={"P": "TEST", suffix_key: suffix}, - child_labels={suffix: child_label}, + child_labels={"T1": child_label}, ) component_name, updated_macros = generator._update_macros(component) From 802c1e590a38c7b56c28c45d4693f25512fa2527 Mon Sep 17 00:00:00 2001 From: "Sode, Adedamola (DLSLtd,RAL,LSCI)" Date: Wed, 1 Jul 2026 08:30:36 +0000 Subject: [PATCH 2/2] used component_name instead of duplicating code --- src/techui_builder/generate.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/techui_builder/generate.py b/src/techui_builder/generate.py index 786cbdb7..ab916257 100644 --- a/src/techui_builder/generate.py +++ b/src/techui_builder/generate.py @@ -162,12 +162,11 @@ def _update_macros(self, component: Entity) -> tuple[str, dict[str, str]]: component_name = component.type suffix_key = suffix = "" - name = suffix.removeprefix(":").removesuffix(":") # Try to get name from child labels if they exist, # if not, just use the name as it is. if component.child_labels is not None: - if name in component.child_labels.keys(): - component_name = component.child_labels[name] + if component_name in component.child_labels.keys(): + component_name = component.child_labels[component_name] self.label_flag = True prefix_key = next(k for k, v in component.macros.items() if v == prefix)