Merge pull request #1897 from totvs/release/v2.6.0rc20

Release/v2.6.0rc20

Author: 98llm

scripts/install_package.cmd

@@ -13,5 +13,5 @@ taskkill /f /im chromedriver.exe
 echo -------------------------
 echo Installing project...
 echo -------------------------
-pip install -U dist/tir_framework-2.6.0rc19.tar.gz
+pip install -U dist/tir_framework-2.6.0rc20.tar.gz
 pause >nul | set/p = Press any key to exit ...

tir/main.py

@@ -34,7 +34,7 @@ def __getattribute__(self, name):
         attr = object.__getattribute__(self, name)
 
         if callable(attr) and not name.startswith('_'):
-            preserve_methods = {'SearchBrowse', 'SetButton'}
+            preserve_methods = {'SearchBrowse', 'FilterBrowse', 'SetButton'}
             if name not in preserve_methods:
                 try:
                     object.__getattribute__(self, 'config')._flag_is_new_browse = None
@@ -1720,7 +1720,7 @@ def __getattribute__(self, name):
         attr = object.__getattribute__(self, name)
 
         if callable(attr) and not name.startswith('_'):
-            preserve_methods = {'SearchBrowse', 'SetButton'}
+            preserve_methods = {'SearchBrowse', 'FilterBrowse', 'SetButton'}
             if name not in preserve_methods:
                 try:
                     object.__getattribute__(self, 'config')._flag_is_new_browse = None
@@ -2320,4 +2320,5 @@ def FilterBrowse(self, filters: List[Dict[str, Any]]):
         ... ]
         >>> oHelper.FilterBrowse(filters)
         """
+        self.config._flag_is_new_browse = True
         self.__poui._set_browse_filters(filters)

tir/technologies/core/language.py

@@ -93,6 +93,7 @@ def __init__(self, language="pt-BR"):
 
         self.filters = languagepack["Filters"]
         self.apply_filters = languagepack["Apply Filters"]
+        self.remove_filters = languagepack["Remove Filters"]
         self.old_browse_edit = languagepack["Old Browse Edit"]
         self.old_browse_delete = languagepack["Old Browse Delete"]
         self.old_browse_insert = languagepack["Old Browse Insert"]
@@ -204,6 +205,7 @@ def get_language_pack(self, language):
             "New Home Menu About": "About",
             "Filters": "Filters",
             "Apply Filters": "Apply filters",
+            "Remove Filters": "Remove filters",
 
             "Old Browse Edit":"Edit",
             "Old Browse Delete":"Delete",
@@ -311,7 +313,8 @@ def get_language_pack(self, language):
             "Input Set Program": "Pesquisar e executar",
             "New Home Menu About": "Sobre",
             "Filters": "Filtros",
-            "Apply Filters": "Aplicar Filtros",            
+            "Apply Filters": "Aplicar Filtros",
+            "Remove Filters": "Remover filtros",
 
             "Old Browse Edit":"Alterar",
             "Old Browse Delete":"Excluir",
@@ -418,7 +421,8 @@ def get_language_pack(self, language):
             "Input Set Program": "Buscar y ejecutar",
             "New Home Menu About": "Sobre",
             "Filters": "Filtros",
-            "Apply Filters": "Aplicar Filtros",            
+            "Apply Filters": "Aplicar Filtros",
+            "Remove Filters": "Eliminar filtros",
             "Old Browse Edit":"Modificar",
             "Old Browse Delete":"Borrar",
             "Old Browse Insert":"Incluir",
@@ -525,6 +529,9 @@ def get_language_pack(self, language):
             "Schedule Menu": "Settings > Schedule > Schedule",
             "Input Set Program": "Ищи и беги",
             "New Home Menu About": "О программе…",
+            "Filters": "Фильтры",
+            "Apply Filters": "Применить фильтры",
+            "Remove Filters": "Удалить фильтры",
 
             "Old Browse Edit":"Редактировать",
             "Old Browse Delete":"Удалить",

tir/technologies/poui_internal.py

@@ -5637,8 +5637,8 @@ def _set_browse_filters(self, filters):
         [Internal]
         Open and apply filters to each field in a THF Browse component.
 
-        :param filters: Dictionary or list of filters to apply, where keys are field names and values are filter values.
-        :type filters: dict or list
+        :param filters: List of dictionaries representing filters to apply, where each dictionary's keys are field names and values are filter values.
+        :type filters: list
         :param browse_div: BeautifulSoup object representing the browse container element.
         :type browse_div: bs4.element.Tag
         :return: None
@@ -5647,9 +5647,11 @@ def _set_browse_filters(self, filters):
         Usage:
 
         >>> # Calling the method:
-        >>> self._filter_thf_browse(filters={'name': 'John'}, browse_div=browse_element)
+        >>> self._filter_thf_browse(filters=[{'name': 'John'}], browse_div=browse_element)
         """
 
+        self._remove_filters_from_browse()
+
         self.click_button(self.language.filters)
 
         self.wait_element_timeout('po-page-slide', scrap_type=enum.ScrapType.CSS_SELECTOR, main_container='body',
@@ -5683,6 +5685,67 @@ def _set_browse_filters(self, filters):
         self.click_button(self.language.apply_filters)
 
 
+    def _remove_filters_from_browse(self):
+        """
+        [Internal]
+
+        Clicks the "Remove Filters" button in a THF Browse component to clear all applied filters.
+        Also checks for a po-tag element inside kendo-grid whose span text is
+        "Remover filtros" or "Remove filters", and clicks it when found.
+
+        :return: None
+        :rtype: None
+
+        Usage:
+
+        >>> # Calling the method:
+        >>> self._remove_filters_from_browse()
+        """
+
+        po_tag_filter = self._get_po_tag(text=self.language.remove_filters, container_selector='kendo-grid')
+        if po_tag_filter:
+            logger().debug("Found applied filters, clicking to remove filters.")
+            clickable = po_tag_filter.select_one('.po-tag-wrapper.po-clickable')
+            target = clickable if clickable else po_tag_filter
+            self.poui_click(target)
+            self.po_loading(self.containers_selectors['GetCurrentContainer'])
+        else:
+            logger().debug("No 'Remove Filters' found; skipping filter removal.")
+
+
+    def _get_po_tag(self, text: str, container_selector: str):
+        """
+        [Internal]
+
+        Searches for a po-tag element inside a specified container whose span text matches
+        the given text (case-insensitive).
+
+        :param text: Text to match inside the po-tag span.
+        :type text: str
+        :param container_selector: CSS selector for the container to search within.
+        :type container_selector: str
+        :return: The matching po-tag BeautifulSoup element, or None if not found.
+        :rtype: bs4.element.Tag or None
+        """
+
+        soup = self.get_current_DOM(twebview=True)
+        if container_selector:
+            container = soup.select_one(container_selector)
+        else:
+            container = soup
+
+        if not container:
+            logger().debug(f"No container found in DOM when searching for po-tag filter with selector '{container_selector}'.")
+            return None
+
+        for po_tag in container.select('po-tag'):
+            span = po_tag.select_one('.po-tag-value span')
+            if span and span.text.strip().lower() == text.strip().lower():
+                return po_tag
+
+        return None
+
+
     def _fill_lookup_input(self, input_element, value: str) -> None:
         """
         [Internal]
@@ -5852,6 +5915,10 @@ def SetButton(self, button, sub_item="", position=1, check_error=True):
 
         logger().info("Switching to the POUI button-click method")
 
+        if (button.lower().strip() == "x"):
+            self.set_button_x(position, check_error)
+            return
+
         # Map legacy button names to their POUI equivalents.
         button_dict = {
             self.language.old_browse_edit : self.language.new_browse_edit,
@@ -5907,6 +5974,15 @@ def SetButton(self, button, sub_item="", position=1, check_error=True):
                     if item:
                         self.click_popup(item)
 
+    def set_button_webapp(self, button, sub_item="", position=1, check_error=True):
+        from tir.technologies.core.events import emit
+        emit('webapp.set_button', button=button, sub_item=sub_item, position=position, check_error=check_error)
+
+    def set_button_x(self, position=1, check_error=True):
+
+        self.click_icon(label='', class_name='an an-sign-out', position=1)
+        self.set_button_webapp(button=self.language.yes, position=position,
+                               check_error=check_error)
 
     def SearchBrowse(self, term="", key=None, identifier=None,
                      index=False, column=None, filters=None) -> None: