Merge branch 'main' into feature/BCSS-20615-new-regression-tests-subject-episodes-diagnosis-date

Author: vidhya-chandra1

pages/base_page.py

@@ -250,16 +250,23 @@ def safe_accept_dialog(self, locator: Locator) -> None:
         except Exception as e:
             logging.error(f"Click failed: {e}")
 
-    def assert_dialog_text(self, expected_text: str) -> None:
+    def assert_dialog_text(self, expected_text: str, accept: bool = False) -> None:
         """
         Asserts that a dialog appears and contains the expected text.
         If no dialog appears, logs an error.
         Args:
             expected_text (str): The text that should be present in the dialog.
+            accept (bool): Set to True if you want to accept the dialog, by deafult is is set to False.
         """
         self._dialog_assertion_error = None
 
-        def handle_dialog(dialog: Dialog):
+        def handle_dialog(dialog: Dialog, accept: bool = False):
+            """
+            Handles the dialog and asserts that the dialog contains the expected text.
+            Args:
+                dialog (Dialog): the playwright dialog object
+                accept (bool): Set to True if you want to accept the dialog, by deafult is is set to False.
+            """
             logging.info(f"Dialog appeared with message: {dialog.message}")
             actual_text = dialog.message
             try:
@@ -268,9 +275,12 @@ def handle_dialog(dialog: Dialog):
                 ), f"Expected '{expected_text}', but got '{actual_text}'"
             except AssertionError as e:
                 self._dialog_assertion_error = e
-            dialog.dismiss()  # Dismiss dialog
+            if accept:
+                dialog.accept()
+            else:
+                dialog.dismiss()  # Dismiss dialog
 
-        self.page.once("dialog", handle_dialog)
+        self.page.once("dialog", lambda dialog: handle_dialog(dialog, accept))
 
     def go_to_log_in_page(self) -> None:
         """Click on the Log in button to navigate to the login page."""

pages/datasets/investigation_dataset_page.py

@@ -483,6 +483,29 @@ def click_polyp_add_intervention_button(self, polyp_number: int) -> None:
             )
         )
 
+    def populate_select_by_id(
+        self, field_base: str, polyp_number: int, option: str
+    ) -> None:
+        """
+        Populates a <select> element using a predictable ID pattern based on field name and polyp number.
+
+        This method is useful when label-based selectors (e.g., using `right-of(:text(...))`) are unreliable
+        due to ambiguous or repeated text labels on the page.
+
+        Args:
+            field_base (str): The base name of the field (e.g., "POLYP_PATHOLOGY_LOST").
+            polyp_number (int): The polyp index (e.g., 1 for the first polyp).
+            option (str): The value to be selected from the dropdown.
+
+        Example:
+            populate_select_by_id("POLYP_PATHOLOGY_LOST", 1, YesNoOptions.YES)
+            # Selects 'Yes' in <select id="UI_POLYP_PATHOLOGY_LOST1_1">
+        """
+        field_id = f"UI_{field_base.upper()}{polyp_number}_1"
+        locator = self.page.locator(f"select#{field_id}")
+        locator.wait_for(state="visible")
+        locator.select_option(option)
+
 
 class SiteLookupOptions(StrEnum):
     """Enum for site lookup options"""
@@ -685,6 +708,12 @@ class PolypInterventionModalityOptions(StrEnum):
     POLYPECTOMY = "17189~Resection"
     EMR = "17193~Resection"
     ESD = "17520~Resection"
+    BIOPSY = "17190~Suspicion of cancer"
+    CHROMOSCOPY = "17198"
+    HAEMOSTATIC_TECHNIQUE = "17194"
+    SUBMUCOSAL_LIFT = "203005"
+    TATTOOING = "17192"
+    TISSUE_DESTRUCTION = "17191"
 
 
 class PolypInterventionDeviceOptions(StrEnum):
@@ -695,6 +724,9 @@ class PolypInterventionDeviceOptions(StrEnum):
     COLD_SNARE = "17072"
     COLD_BIOPSY = "17073~En-bloc"
     ENDOSCOPIC_KNIFE = "17531"
+    HOT_BIOPSY_FORCEPS = "17071~En-bloc"
+    ARGON_BEAM = "17077"
+    LASER = "17078"
 
 
 class PolypInterventionExcisionTechniqueOptions(StrEnum):
@@ -768,3 +800,27 @@ class YesNoUncertainOptions(StrEnum):
     YES = "17058"
     NO = "17059"
     UNCERTAIN = "17105"
+
+
+class ReasonPathologyLostOptions(StrEnum):
+    """Enum for reason pathology lost options"""
+
+    LOST_IN_TRANSIT = "200561~~204337"
+    DESTROYED_DURING_PROCESSING = "200562~~204337"
+
+
+class PolypInterventionSuccessOptions(StrEnum):
+    """Enum for polyp intervention success options"""
+
+    SUCCESSFUL = "17200"
+    UNSUCCESSFUL = "17201"
+
+
+class PolypReasonLeftInSituOptions(StrEnum):
+    """Enum for reasons a polyp was left in situ"""
+
+    POLYP_TYPE = "200556"
+    REQUIRES_ANOTHER_PROCEDURE = "200557"
+    REQUIRES_SURGICAL_RESECTION = "200558"
+    CANNOT_FIND_POLYP_ON_WITHDRAWAL = "200559"
+    CLINICAL_DECISION_NOT_TO_EXCISE = "203082"