Add match_case parameter to ClickCombo and related methods for case-sensitive selection

Author: vinioliveira-totvs

tir/main.py

@@ -1777,22 +1777,26 @@ def InputValue(self, field='', value='', position=1):
         """
         self.__poui.InputValue(field, value, position)
 
-    def ClickCombo(self, field='', value='', position=1, second_value=''):
+    def ClickCombo(self, field='', value='', position=1, second_value='', match_case=True):
         """
         Clicks on the Combo of POUI component.
         https://po-ui.io/documentation/po-combo
 
         :param field: Combo text title that you want to click.
         :param value: Value that you want to select in Combo.
         :param position: Position which element is located. - **Default:** 1
+        :param second_value: Secondary value displayed below the main value. - **Default:** "" (empty string)
+        :type second_value: str
+        :param match_case: If True, requires exact normalized match; if False, allows partial normalized match. - **Default:** True
+        :type match_case: bool
 
         Usage:
 
         >>> # Call the method:
         >>> oHelper.ClickCombo('Visão', 'Compras')
         :return:
         """
-        self.__poui.click_combo(field, value, position, second_value)
+        self.__poui.click_combo(field, value, position, second_value, match_case)
 
     def ClickSelect(self, field='', value='', position=1):
         """

tir/technologies/poui_internal.py

@@ -4736,7 +4736,7 @@ def click_checkbox(self, label):
             self.log_error(f"CheckBox '{label}' doesn't found!")
 
 
-    def click_combo(self, field, value='', position=1, second_value=''):
+    def click_combo(self, field, value='', position=1, second_value='', match_case=True):
         '''Select a value for list combo inputs.
 
         :param field: label of field
@@ -4747,6 +4747,8 @@ def click_combo(self, field, value='', position=1, second_value=''):
         :type : int
         :param second_value: value below the principal value (after the ":")
         :type : str
+        :param match_case: If True, requires exact normalized match; if False, allows partial normalized match.
+        :type : bool
         :return:
         '''
 
@@ -4773,27 +4775,29 @@ def click_combo(self, field, value='', position=1, second_value=''):
                     main_value = self.get_web_value(self.soup_to_selenium(po_input, twebview=True))
                     self.open_input_combo(po_combo_filtred)
                     self.send_keys(po_input_sel, value if value else second_value)
-                    self.click_po_list_box(value, second_value)
+                    self.click_po_list_box(value, second_value, match_case=match_case)
                     current_value = self.get_web_value(self.soup_to_selenium(po_input, twebview=True))
                     success = current_value.strip().lower() == main_value.strip().lower() if value else True
 
         if not success:
             self.log_error(f'Click on {value} of {field} Fail. Please Check')
 
-    def click_po_list_box(self, value="", second_value="", program_call=False) -> None:
+    def click_po_list_box(self, value="", second_value="", program_call=False, match_case=True) -> None:
         '''
         :param value: Value to select on po-list-box
         :type str
         :param second_value: value below the principal value (after the ":")
         :type : str
+        :param match_case: If True, requires exact normalized match; if False, allows partial normalized match.
+        :type : bool
         :return:
         '''
         orig_value = value
         orig_second_value = second_value
         value = value.strip().lower()
         second_value = second_value.strip().lower()
 
-        po_item_list = self._get_po_item_list(value, second_value)
+        po_item_list = self._get_po_item_list(value, second_value, match_case=match_case)
 
         if not po_item_list:
             message = f"Item list '{orig_value or orig_second_value}' not found"
@@ -4807,7 +4811,7 @@ def click_po_list_box(self, value="", second_value="", program_call=False) -> No
         self.click(self.soup_to_selenium(po_item_list_div, twebview=True))
 
 
-    def _get_po_item_list(self, value="", second_value="") -> Tag:
+    def _get_po_item_list(self, value="", second_value="", match_case=True) -> Tag:
         """
         [Internal]
         
@@ -4817,18 +4821,20 @@ def _get_po_item_list(self, value="", second_value="") -> Tag:
         :type value: str
         :param second_value: Secondary value to search for (value field). - **Default:** ""
         :type second_value: str
+        :param match_case: If True, requires exact normalized match; if False, allows partial normalized match. - **Default:** True
+        :type match_case: bool
         :return: The BeautifulSoup Tag object of the matching list item, or None if not found
         :rtype: Tag or None
         """
         try:
             self.wait_element(term='po-listbox')
             po_items_list = self.web_scrap(term='po-item-list', scrap_type=enum.ScrapType.CSS_SELECTOR, main_container='body')
-            return next(iter(list(filter(lambda x: self.find_po_item_list(x, value, second_value), po_items_list))), None)
+            return next(iter(list(filter(lambda x: self.find_po_item_list(x, value, second_value, match_case=match_case), po_items_list))), None)
 
         except Exception as e:
             return None
 
-    def find_po_item_list(self, po_item_list, param_label, param_value):
+    def find_po_item_list(self, po_item_list, param_label, param_value, match_case=True):
         '''This method is used to filter the po-item-list elements based on the label and value match.
 
 
@@ -4845,14 +4851,16 @@ def find_po_item_list(self, po_item_list, param_label, param_value):
         elem_label = item_list_data.get('label')
         elem_value = item_list_data.get('value')
 
+        compare = lambda expected, current: expected == current if match_case else expected in current
+
         if param_label and param_value:
-            return param_label == elem_label and param_value == elem_value
+            return compare(param_label, elem_label) and compare(param_value, elem_value)
 
         elif param_label and not param_value:
-            return param_label == elem_label
+            return compare(param_label, elem_label)
 
         elif not param_label and param_value:
-            return param_value == elem_value
+            return compare(param_value, elem_value)
 
     def _get_item_list_data(self, po_item_list) -> dict:
         """
@@ -5343,6 +5351,7 @@ def set_program(self, program_name: str = "", program_desc: str = ""):
 
         success = False
         search_term = "[class*='card-wrapper']"
+        confirm_term = f"wa-button[caption='{self.language.confirm}']"
         attempts = 1
 
         self.escape_to_main_menu()
@@ -5370,11 +5379,11 @@ def set_program(self, program_name: str = "", program_desc: str = ""):
             self._po_loading()
             if not program_name and program_desc:
                 self.config.routine = self._get_program_by_desc(program_desc)
-            self.click_po_list_box(value=program_desc, second_value=program_name, program_call=True)
+            self.click_po_list_box(value=program_desc, second_value=program_name, program_call=True, match_case=False)
 
             # -- Trecho de código temporário --
-            time.sleep(1)
-            btn_confirmar = lambda: self.get_current_DOM().select("wa-button[caption='Confirmar']")
+            self.wait_element_timeout(term=confirm_term, scrap_type=enum.ScrapType.CSS_SELECTOR, main_container='body')
+            btn_confirmar = lambda: self.get_current_DOM().select(confirm_term)
             if btn_confirmar():
                 btn_confirmar_sel = lambda: self.soup_to_selenium(next(iter(btn_confirmar())))
                 self.click(btn_confirmar_sel())