Added functionality to fetch files in action buttons in embedded screens to add to the JsonMap

Author: adedamola-sode

src/techui_builder/builder.py

@@ -256,6 +256,29 @@ def _get_macros(element: ObjectifiedElement):
                     }
             return {}
 
+        def _extract_action_button_file_from_embedded(
+            file_elem: ObjectifiedElement,
+        ) -> ObjectifiedElement:
+            file_path = Path(file_elem.text.strip() if file_elem.text else "")
+            file_path = dest_path.joinpath(file_path)
+            tree = objectify.parse(file_path.absolute())
+            root: ObjectifiedElement = tree.getroot()
+
+            # Find all <widget> elements
+            widgets = [
+                w
+                for w in root.findall(".//widget")
+                if w.get("type", default=None) == "action_button"
+            ]
+
+            for widget_elem in widgets:
+                open_display = _get_action_group(widget_elem)
+                if open_display is None:
+                    continue
+                file_elem = open_display.file
+                return file_elem
+            return file_elem
+
         if visited is None:
             visited = set()
 
@@ -279,7 +302,7 @@ def _get_macros(element: ObjectifiedElement):
                 for w in root.findall(".//widget")
                 if w.get("type", default=None)
                 # in ["symbol", "embedded", "action_button"]
-                in ["symbol", "action_button"]
+                in ["symbol", "action_button", "embedded"]
             ]
 
             for widget_elem in widgets:
@@ -295,9 +318,12 @@ def _get_macros(element: ObjectifiedElement):
                         file_elem = open_display.file
 
                         macro_dict = _get_macros(open_display)
-                    # case "embedded":
-                    #     file_elem = widget_elem.file
-                    #     macro_dict = _get_macros(widget_elem)
+                    case "embedded":
+                        file_elem = _extract_action_button_file_from_embedded(
+                            widget_elem.file
+                        )
+                        macro_dict = _get_macros(widget_elem)
+
                     case _:
                         continue
 

tests/test_builder.py

@@ -300,16 +300,14 @@ def test_generate_json_map(builder_with_test_files, example_json_map, test_files
 
 
 # TODO: write this test
-# def test_generate_json_map_embedded_screen(builder, example_json_map):
-#     screen_path = Path("tests/test_files/test_bob.bob")
-#     dest_path = Path("tests/test_files/")
+def test_generate_json_map_embedded_screen(builder_with_test_files, example_json_map):
+    screen_path = Path("tests/test_files/test_bob_embedded.bob").absolute()
+    dest_path = Path("tests/test_files/")
 
-#     # Set widget type to embedded
-#     ...
-
-#     test_json_map = builder._generate_json_map(screen_path, dest_path)
-
-#     assert test_json_map == example_json_map
+    test_json_map = builder_with_test_files._generate_json_map(screen_path, dest_path)
+    example_json_map.file = "test_bob_embedded.bob"
+    example_json_map.children.append(JsonMap("$(IOC)/pmacAxis.pvi.bob", exists=False))
+    assert test_json_map == example_json_map
 
 
 def test_generate_json_map_get_macros(

tests/test_files/test_bob_embedded.bob

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Saved on 2026-01-12 10:15:49 by uns32131-->
+<display version="2.0.0">
+  <name>Display</name>
+  <widget type="symbol" version="2.0.0">
+    <name>Detector</name>
+    <pv_name>test_device</pv_name>
+    <x>60</x>
+    <y>150</y>
+    <width>50</width>
+    <height>50</height>
+    <actions>
+      <action type="open_display">
+        <description>Open Display</description>
+        <file>test_child_bob.bob</file>
+        <target>replace</target>
+      </action>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)
+$(actions)</tooltip>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display</name>
+    <file>motor_embed.bob</file>
+    <x>150</x>
+    <y>120</y>
+    <width>160</width>
+    <height>80</height>
+  </widget>
+</display>