widgetastic.patternfly5 25.2.10.0__py3-none-any.whl → 25.2.17.1__py3-none-any.whl

{widgetastic.patternfly5-25.2.10.0.dist-info → widgetastic.patternfly5-25.2.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: widgetastic.patternfly5
-Version: 25.2.10.0
+Version: 25.2.17.1
 Summary: Patternfly5 widget library for Widgetastic.
 Project-URL: repository, https://github.com/RedHatQE/widgetastic.patternfly5
 Maintainer-email: Nikhil Dhandre <ndhandre@redhat.com>, Egor Shamardin <eshamard@redhat.com>, Mike Shriver <mshriver@redhat.com>
@@ -21,13 +21,13 @@ License-File: LICENSE
 Keywords: patternfly,patternfly5,widgetastic
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Requires-Dist: widgetastic-core>=1.0.6
 Provides-Extra: dev
 Requires-Dist: codecov; extra == 'dev'
@@ -55,15 +55,12 @@ Description-Content-Type: text/markdown
     <a href="https://github.com/RedHatQE/widgetastic.patternfly5/actions/workflows/tests.yaml">
     <img alt="github actions" src="https://github.com/RedHatQE/widgetastic.patternfly5/actions/workflows/tests.yaml/badge.svg">
     </a>
-    <a href="https://pypi.org/project/black">
-    <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
-    </a>
     <a href="https://results.pre-commit.ci/latest/github/RedHatQE/widgetastic.patternfly5/main">
     <img alt="pre: black" src="https://results.pre-commit.ci/badge/github/RedHatQE/widgetastic.patternfly5/main.svg">
     </a>
 </p>
 
-This library offers Widgetastic Widgets for [PatternFly v5](https://www.patternfly.org/), serving as an extended
+This library offers Widgetastic Widgets for [PatternFly v5/v6](https://www.patternfly.org/), serving as an extended
 itteration of [widgetastic.patternfly4](https://github.com/RedHatQE/widgetastic.patternfly4).
 
 
@@ -111,7 +108,7 @@ itteration of [widgetastic.patternfly4](https://github.com/RedHatQE/widgetastic.
 - [pie-chart](https://www.patternfly.org/charts/pie-chart)
 
 ### Patterns:
-- [card-view](https://patternfly-react-main.surge.sh/patterns/card-view)
+- [card-view](https://www.patternfly.org/patterns/card-view)
 
 
 ### Contribution guide
@@ -135,7 +132,7 @@ pre-commit install
 
 ### Testing
 
-The library has selenium tests that are performed against [Patternfly React docs](https://patternfly-react-main.surge.sh).
+The library has selenium tests that are performed against [Patternfly v6 docs](https://www.patternfly.org) and [Patternfly v5 docs](https://v5-archive.patternfly.org).
 It's also configured to run the tests every time when a new version of that page is released.
 
 Tests spawn a container from official selenium image - [selenium/standalone-{chrome/firefox}](https://hub.docker.com/u/selenium).
@@ -149,5 +146,5 @@ Use `-n` key to specify a number
 of workers:
 
 ```bash
-BROWSER=firefox pytest -v testing -n 4
+pytest --browser-name firefox --pf-version v5 -n 2 -vv
 ```

widgetastic.patternfly5-25.2.17.1.dist-info/RECORD

@@ -0,0 +1,46 @@
+widgetastic_patternfly5/__init__.py,sha256=Yv3sZRQsi__Wjp5K5odVRZFr6-UQsPLL6lk6g6GWZIg,3822
+widgetastic_patternfly5/ouia.py,sha256=ZAUgIka9odt4yCKQxD2R0fZ30hZKPtOAL-Fjw2xIGS0,4046
+widgetastic_patternfly5/charts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/charts/alerts_timeline_chart.py,sha256=U7hJvxAG1Wgj9WFt5QxAmLh9cJm2qzs2YHs2wfEW0Pk,2377
+widgetastic_patternfly5/charts/boxplot_chart.py,sha256=6Ek6gwbmwNeazy-5o2fVfvkjpd6bhbTyitiPomvLBts,405
+widgetastic_patternfly5/charts/bullet_chart.py,sha256=zfAdvxzPFqeGFzDoqJIUxwkERUlHfPohHOjzPJEjVdw,3680
+widgetastic_patternfly5/charts/donut_chart.py,sha256=RmDKyWjhKnGWQwZ1twPN837LYuvlF1inQlYhIgJgFxU,2570
+widgetastic_patternfly5/charts/legend.py,sha256=fhAg-FhsWpvi91BZ29EztKO3QfANRW-hnfzIkq45q3Y,2983
+widgetastic_patternfly5/charts/line_chart.py,sha256=9gjoUqWopSYTng0iRpvppm-CL-QA8H_HpTvFddg0sB4,3995
+widgetastic_patternfly5/charts/pie_chart.py,sha256=rIxMv6vPERj9FnTp8daejL7MxUTKFCTj9057C1KuuKw,218
+widgetastic_patternfly5/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/components/alert.py,sha256=8wF4348n7Yp6BnOlbDNGw4_fFKyyjzgpQDOe9a96EsI,2579
+widgetastic_patternfly5/components/breadcrumb.py,sha256=_lQ7pqmh2P9FSwMae_quUTteHsfXFlQvYaXE4Z1gK1g,2035
+widgetastic_patternfly5/components/button.py,sha256=dduqxjnTHsHLkPO9TjbWO4HUfpiObMM4yuq3_q8XlA0,3539
+widgetastic_patternfly5/components/card.py,sha256=YScmzLsxO72ITZFz9u3vyxpD2r0QAzP4yaBmJD9FcZE,2677
+widgetastic_patternfly5/components/chip.py,sha256=t5_9oTJ__9ccwrCMzVYllDFY7oyJcMwwWKbr3jiIK0w,11218
+widgetastic_patternfly5/components/clipboard_copy.py,sha256=r9RESokgZ7s5C2_ByOGLqfIjUx15-ZzFi5usSTdb-ac,1292
+widgetastic_patternfly5/components/description_list.py,sha256=sVhKwKnvJguZh9FqyPC1NU2UA_w7uA3ugkY5eoVRlPk,989
+widgetastic_patternfly5/components/drawer.py,sha256=kr2q042x4ghxu6T_C13mlRZZ-gZavGsVvM9a1GVYZZA,1084
+widgetastic_patternfly5/components/dual_list_selector.py,sha256=jL1SOfnR5z_rWniN-KU9a26n-0HxBcL2pJbBcOFT2b8,4839
+widgetastic_patternfly5/components/expandable_section.py,sha256=QCqonn1kiYfL-mGcjwrG6x4TiJBr9RKXZvyDerVTUmQ,1876
+widgetastic_patternfly5/components/modal.py,sha256=uaOsMxWvgCKrF61YX5Dh9z4YCtB0uheQdQTF6cMswxY,2000
+widgetastic_patternfly5/components/navigation.py,sha256=uaAc-FoOdYt0xiH_oPK564KjztQLEusk3LhhHSX4PQ4,5333
+widgetastic_patternfly5/components/pagination.py,sha256=rumYxlMJcO7F0uQtIU24oANwi6JHHzDkD-YMo-eyltA,8707
+widgetastic_patternfly5/components/popover.py,sha256=_XZlM4v8gsmen73DoSpylMXAMeEkdkjRsuBIIKHHhtE,2242
+widgetastic_patternfly5/components/progress.py,sha256=UXNjRgy7aW0YerRWR6cwMF-9AjitI6LO8qlOdz0dYW8,1391
+widgetastic_patternfly5/components/slider.py,sha256=B9gr8mnndLWivSlS9lIRd3SW6W5Iev9ESnQE9b0A55Y,3128
+widgetastic_patternfly5/components/switch.py,sha256=7-ezYAQ3T_cz70GBIW78vTlVaDmRGRhNgi1hWg14Ig8,2226
+widgetastic_patternfly5/components/table.py,sha256=fA5LM7buASXOH3z32t1D5ZkFXyMa3ZZmzFJ6kjF73ZQ,17183
+widgetastic_patternfly5/components/tabs.py,sha256=tSuS6x3_rnc5z8yUW_75ZtkdFOzzWPMmMa48VEEZWQk,2260
+widgetastic_patternfly5/components/title.py,sha256=bIUzFaptG2i84CF4-AMfjbmdVeKYR32wkOBH9P6V3XQ,920
+widgetastic_patternfly5/components/date_and_time/calendar_month.py,sha256=zGIgIsYEWH3VPVNBVIPVaKlnRY61648tM8rGtohmy7s,3307
+widgetastic_patternfly5/components/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/components/forms/form_select.py,sha256=ht_go5lOXhMzq_FyLxS1ny9jaiBkRI6K_5vMv1DASaw,3531
+widgetastic_patternfly5/components/forms/radio.py,sha256=d1fpzoicgSDgoV8K9bHlXFvHEjH3zw59t_WbxTGZyQ8,2009
+widgetastic_patternfly5/components/menus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/components/menus/context_selector.py,sha256=Bqj8MrxJypLfjcqrrKQj9jfFWHeSWbHIVcH2aA6sRQ8,1156
+widgetastic_patternfly5/components/menus/dropdown.py,sha256=NUPpKIV-mBzmFVRPjWu0FiCWc9DjcRErK_FOxfag8y0,10471
+widgetastic_patternfly5/components/menus/menu.py,sha256=sRkb46XWMNGueDCkOjs4vyb9Ehjiru71DY3MD2qsorM,8138
+widgetastic_patternfly5/components/menus/menu_toggle.py,sha256=PBwNvg6E2RPdCG6ALBUqyTZxCwThJgk5S-9ghTiZ9hM,1029
+widgetastic_patternfly5/components/menus/options_menu.py,sha256=-7pRukhgxln0rMV77VhNyQ-njLPAE6Wnp2vNAoJUXZk,1474
+widgetastic_patternfly5/components/menus/select.py,sha256=X8DApXg_7tLIOulpmEP-f09bDShYL8jcEb1tYvNHwrE,6482
+widgetastic.patternfly5-25.2.17.1.dist-info/METADATA,sha256=u3xxVUmW53slGMz9XD6BL7XP-TIGG1sH5Khopll1Vw8,6826
+widgetastic.patternfly5-25.2.17.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+widgetastic.patternfly5-25.2.17.1.dist-info/licenses/LICENSE,sha256=nDhhj8jp0XsTdmvWpTWFpOKVn0LPXPb6ecA9zFF3Exk,576
+widgetastic.patternfly5-25.2.17.1.dist-info/RECORD,,

widgetastic_patternfly5/__init__.py

@@ -1,75 +1,64 @@
 from .charts.boxplot_chart import BoxPlotChart
 from .charts.bullet_chart import BulletChart
 from .charts.donut_chart import DonutChart
-from .charts.legend import DataPoint
-from .charts.legend import Legend
+from .charts.legend import DataPoint, Legend
 from .charts.line_chart import LineChart
 from .charts.pie_chart import PieChart
 from .components.alert import Alert
 from .components.breadcrumb import BreadCrumb
 from .components.button import Button
-from .components.card import Card
-from .components.card import CardCheckBox
-from .components.card import CardForCardGroup
-from .components.card import CardGroup
-from .components.card import CardWithActions
-from .components.chip import CategoryChipGroup
-from .components.chip import Chip
-from .components.chip import ChipGroup
-from .components.chip import ChipGroupToolbar
-from .components.chip import ChipGroupToolbarCategory
-from .components.chip import ChipReadOnlyError
-from .components.chip import StandAloneChipGroup
+from .components.card import Card, CardCheckBox, CardForCardGroup, CardGroup, CardWithActions
+from .components.chip import (
+    CategoryChipGroup,
+    Chip,
+    ChipGroup,
+    ChipGroupToolbar,
+    ChipGroupToolbarCategory,
+    ChipReadOnlyError,
+    StandAloneChipGroup,
+)
 from .components.clipboard_copy import ClipboardCopy
 from .components.date_and_time.calendar_month import CalendarMonth
 from .components.description_list import DescriptionList
 from .components.drawer import Drawer
-from .components.dual_list_selector import DualListSelector
-from .components.dual_list_selector import SearchDualListSelector
+from .components.dual_list_selector import DualListSelector, SearchDualListSelector
 from .components.expandable_section import ExpandableSection
-from .components.forms.form_select import FormSelect
-from .components.forms.form_select import FormSelectDisabled
-from .components.forms.form_select import FormSelectOptionDisabled
-from .components.forms.form_select import FormSelectOptionNotFound
+from .components.forms.form_select import (
+    FormSelect,
+    FormSelectDisabled,
+    FormSelectOptionDisabled,
+    FormSelectOptionNotFound,
+)
 from .components.forms.radio import Radio
 from .components.menus.context_selector import ContextSelector
-from .components.menus.dropdown import Dropdown
-from .components.menus.dropdown import DropdownDisabled
-from .components.menus.dropdown import DropdownItemDisabled
-from .components.menus.dropdown import DropdownItemNotFound
-from .components.menus.dropdown import GroupDropdown
-from .components.menus.menu import CheckboxMenu
-from .components.menus.menu import Menu
-from .components.menus.menu import MenuItemDisabled
-from .components.menus.menu import MenuItemNotFound
+from .components.menus.dropdown import (
+    Dropdown,
+    DropdownDisabled,
+    DropdownItemDisabled,
+    DropdownItemNotFound,
+    GroupDropdown,
+)
+from .components.menus.menu import CheckboxMenu, Menu, MenuItemDisabled, MenuItemNotFound
 from .components.menus.menu_toggle import SplitButtonDropdown
 from .components.menus.options_menu import OptionsMenu
-from .components.menus.select import CheckboxSelect
-from .components.menus.select import Select
-from .components.menus.select import SelectItemDisabled
-from .components.menus.select import SelectItemNotFound
-from .components.modal import Modal
-from .components.modal import ModalItemNotFound
-from .components.navigation import Navigation
-from .components.navigation import NavSelectionNotFound
-from .components.pagination import CompactPagination
-from .components.pagination import Pagination
-from .components.pagination import PaginationNavDisabled
+from .components.menus.select import CheckboxSelect, Select, SelectItemDisabled, SelectItemNotFound
+from .components.modal import Modal, ModalItemNotFound
+from .components.navigation import Navigation, NavSelectionNotFound
+from .components.pagination import CompactPagination, Pagination, PaginationNavDisabled
 from .components.popover import Popover
 from .components.progress import Progress
-from .components.slider import InputSlider
-from .components.slider import Slider
-from .components.switch import Switch
-from .components.switch import SwitchDisabled
-from .components.table import ColumnNotExpandable
-from .components.table import CompoundExpandableTable
-from .components.table import ExpandableTable
-from .components.table import PatternflyTable
-from .components.table import RowNotExpandable
+from .components.slider import InputSlider, Slider
+from .components.switch import Switch, SwitchDisabled
+from .components.table import (
+    ColumnNotExpandable,
+    CompoundExpandableTable,
+    ExpandableTable,
+    PatternflyTable,
+    RowNotExpandable,
+)
 from .components.tabs import Tab
 from .components.title import Title
 
-
 __all__ = [
     "Alert",
     "BreadCrumb",

widgetastic_patternfly5/charts/alerts_timeline_chart.py

@@ -0,0 +1,65 @@
+from widgetastic_patternfly5.charts.line_chart import LineChart
+
+
+class AlertsTimelineChart(LineChart):
+    """Represents the Patternfly Alerts Timeline.
+
+    https://v5-archive.patternfly.org/charts/bar-chart/#alerts-timeline
+
+    Args:
+        id: If you want to look the input up by id, use this parameter, pass the id.
+        locator: If you have specific locator else it will take pf-chart.
+    """
+
+    Y_AXIS_ROW = "./*[name()='svg']/*[name()='g'][3]/*[name()='g']"
+    Y_AXIS_ROW_LINE = "./*[name()='path']"
+
+    TOOLTIP = "./*[name()='svg']/*[name()='g'][5]"
+    TOOLTIP_X_AXIS_LABLE = None
+    TOOLTIP_LABLES = None
+    TOOLTIP_VALUES = ".//*[name()='text']/*[name()='tspan']"
+
+    @property
+    def _y_axis_labels_map(self):
+        """Labels and its webelements in the Y axis
+        NOTE: Y labels might not match the number of rows in Y axes.
+        """
+        return {self.browser.text(el): el for el in self.browser.elements(self.Y_AXIS_LABELS)}
+
+    @property
+    def labels_y_axis(self):
+        """Return Y-Axis labels."""
+        return list(self._y_axis_labels_map.keys())
+
+    @property
+    def _y_axis_map(self):
+        """Dict with Y axis row number as key and the contained lines in each row as values."""
+        y_axis_rows_els = self.browser.elements(self.Y_AXIS_ROW)
+        y_axis_map = {}
+        for row_n, row_el in enumerate(y_axis_rows_els):
+            y_axis_map[row_n] = self.browser.elements(self.Y_AXIS_ROW_LINE, parent=row_el)
+        return y_axis_map
+
+    def read(self):
+        """Read chart data."""
+        _data = []
+
+        for lines_el in self._y_axis_map.values():
+            _row_data = []
+            for line_el in lines_el:
+                self.browser.move_to_element(line_el)
+                self.browser.click(line_el)
+                tooltip_el = self.browser.wait_for_element(self.TOOLTIP)
+
+                label_data = {}
+                value_els = self.browser.elements(self.TOOLTIP_VALUES, parent=tooltip_el)
+                for value_el in value_els:
+                    key, value = self.browser.text(value_el).lower().split(": ")
+                    label_data[key] = value
+
+                _row_data.append(label_data)
+            _data.append(_row_data)
+
+        # Just move cursor to avoid mismatch of legend and tooltip text.
+        self.root_browser.move_to_element(".//body")
+        return _data

widgetastic_patternfly5/charts/bullet_chart.py

@@ -1,12 +1,10 @@
 import re
 
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import Text
-from widgetastic.widget import View
+from widgetastic.widget import Text, View
 from widgetastic.xpath import quote
 
-from .legend import DataPoint
-from .legend import Legend
+from .legend import DataPoint, Legend
 
 
 class BulletChart(View):
@@ -36,7 +34,7 @@ class BulletChart(View):
     def __init__(self, parent=None, id=None, locator=None, logger=None, *args, **kwargs):
         View.__init__(self, parent=parent, logger=logger)
         if id:
-            self.locator = ".//div[@id={}]".format(quote(id))
+            self.locator = f".//div[@id={quote(id)}]"
         elif locator:
             self.locator = locator
         else:

widgetastic_patternfly5/charts/donut_chart.py

@@ -1,17 +1,13 @@
 import re
 
-from widgetastic.widget import ClickableMixin
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import ParametrizedView
-from widgetastic.widget import View
-from widgetastic.widget import Widget
+from widgetastic.widget import ClickableMixin, ParametrizedLocator, ParametrizedView, View, Widget
 from widgetastic.xpath import quote
 
 
 class DonutLegendItem(ParametrizedView, ClickableMixin):
     PARAMETERS = ("label_text",)
     ROOT = ParametrizedLocator(
-        ".//*[name()='text']" "/*[name()='tspan' and contains(., '{label_text}')]"
+        ".//*[name()='text']/*[name()='tspan' and contains(., '{label_text}')]"
     )
     ALL_ITEMS = ".//*[name()='text']/*[name()='tspan']"
     LEGEND_ITEM_REGEX = re.compile(r"(.*?): ([\d]+)")

widgetastic_patternfly5/charts/line_chart.py

@@ -1,5 +1,4 @@
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import View
+from widgetastic.widget import ParametrizedLocator, View
 from widgetastic.xpath import quote
 
 from .legend import Legend
@@ -37,7 +36,7 @@ class LineChart(View):
         assert id or locator, "Provide id or locator."
 
         if id:
-            self.locator = ".//div[@id={}]".format(quote(id))
+            self.locator = f".//div[@id={quote(id)}]"
         else:
             self.locator = locator
 
@@ -96,7 +95,17 @@ class LineChart(View):
                 self.browser.elements(self.TOOLTIP_LABLES, parent=tooltip_el),
                 self.browser.elements(self.TOOLTIP_VALUES, parent=tooltip_el),
             ):
-                label_data[self.browser.text(label_el)] = self.browser.text(value_el)
+                # Get the label text and handle empty labels
+                label_txt = self.browser.text(label_el)
+                if label_txt == "":
+                    label_txt = "Unknown"
+
+                # Update label_data with the value
+                value_txt = self.browser.text(value_el)
+                if label_txt in label_data:
+                    label_data[label_txt] = f"{label_data[label_txt]}, {value_txt}"
+                else:
+                    label_data[label_txt] = value_txt
 
             _data[x_axis_label] = label_data
 

widgetastic_patternfly5/components/alert.py

@@ -57,12 +57,11 @@ class BaseAlert:
         for class_ in self.browser.classes(self):
             if class_ in self.TYPE_MAPPING:
                 return self.TYPE_MAPPING[class_]
-        else:
-            raise ValueError(
-                "Could not find a proper alert type."
-                f"\nAvailable classes: {self.TYPE_MAPPING!r} "
-                f"\nAlert has: {self.browser.classes(self)!r}"
-            )
+        raise ValueError(
+            "Could not find a proper alert type."
+            f"\nAvailable classes: {self.TYPE_MAPPING!r} "
+            f"\nAlert has: {self.browser.classes(self)!r}"
+        )
 
     def assert_no_error(self):
         """Asserts that the warning is not of the error type."""

widgetastic_patternfly5/components/button.py

@@ -1,6 +1,5 @@
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import ClickableMixin
-from widgetastic.widget import Widget
+from widgetastic.widget import ClickableMixin, Widget
 from widgetastic.xpath import quote
 
 
@@ -36,7 +35,7 @@ class BaseButton:
         return check1 or check2 or self.browser.get_attribute("disabled", self) is not None
 
     def __repr__(self):
-        return "{}{}".format(type(self).__name__, self.locator)
+        return f"{type(self).__name__}{self.locator}"
 
     @property
     def title(self):
@@ -69,25 +68,25 @@ class Button(BaseButton, Widget, ClickableMixin):
             if kwargs:  # classes should have been the only kwarg combined with text args
                 raise TypeError("If you pass button text then only pass classes in addition")
             if len(text) == 1:
-                locator_conditions = "normalize-space(.)={}".format(quote(text[0]))
+                locator_conditions = f"normalize-space(.)={quote(text[0])}"
             elif len(text) == 2 and text[0].lower() == "contains":
-                locator_conditions = "contains(normalize-space(.), {})".format(quote(text[1]))
+                locator_conditions = f"contains(normalize-space(.), {quote(text[1])})"
             else:
                 raise TypeError("An illegal combination of args/kwargs")
         else:
             # Join the kwargs, if any
             locator_conditions = " and ".join(
-                "@{}={}".format(attr, quote(value)) for attr, value in kwargs.items()
+                f"@{attr}={quote(value)}" for attr, value in kwargs.items()
             )
 
         if classes:
             if locator_conditions:
                 locator_conditions += " and "
             locator_conditions += " and ".join(
-                "contains(@class, {})".format(quote(klass)) for klass in classes
+                f"contains(@class, {quote(klass)})" for klass in classes
             )
         if locator_conditions:
-            locator_conditions = "and ({})".format(locator_conditions)
+            locator_conditions = f"and ({locator_conditions})"
 
         return (
             ".//*[(self::a or self::button or (self::input and "

widgetastic_patternfly5/components/card.py

@@ -1,8 +1,5 @@
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import Checkbox
-from widgetastic.widget import GenericLocatorWidget
-from widgetastic.widget import ParametrizedView
-from widgetastic.widget import View
+from widgetastic.widget import Checkbox, GenericLocatorWidget, ParametrizedView, View
 
 from widgetastic_patternfly5.components.menus.dropdown import Dropdown
 
@@ -34,9 +31,7 @@ class BaseCard:
 
 
 class Card(BaseCard, GenericLocatorWidget):
-    DEFAULT_LOCATOR = (
-        ".//div[@data-ouia-component-type='PF5/Card'] | .//article[contains(@class, '-c-card')]"
-    )
+    DEFAULT_LOCATOR = ".//div[contains(@data-ouia-component-type, '/Card')] | .//article[contains(@class, '-c-card')]"
 
     def __init__(self, parent, locator=None, logger=None):
         locator = locator or self.DEFAULT_LOCATOR
@@ -46,9 +41,7 @@ class Card(BaseCard, GenericLocatorWidget):
 
 
 class CardForCardGroup(BaseCard, ParametrizedView):
-    DEFAULT_LOCATOR = (
-        "(.//div[@data-ouia-component-type='PF5/Card'] | .//article[contains(@class, '-c-card')])"
-    )
+    DEFAULT_LOCATOR = "(.//div[contains(@data-ouia-component-type, '/Card')] | .//article[contains(@class, '-c-card')])"
 
     def __init__(self, parent, locator=None, logger=None, **kwargs):
         View.__init__(self, parent, logger=logger, **kwargs)

widgetastic_patternfly5/components/chip.py

@@ -1,9 +1,6 @@
 # TODO: This imported directly form wt.pfy4. I thnk we need to restructure it.
 from wait_for import wait_for
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import ParametrizedView
-from widgetastic.widget import Text
-from widgetastic.widget import View
+from widgetastic.widget import ParametrizedLocator, ParametrizedView, Text, View
 
 from .button import Button
 
@@ -15,18 +12,18 @@ class ChipReadOnlyError(Exception):
 
 
 CHIP_ROOT = (
-    ".//div[contains(@class, '-c-chip') and not(contains(@class, '-m-overflow')) "
-    "and not(contains(@class, '-c-chip-group'))]"
+    ".//*[contains(@data-ouia-component-type, '/Chip') and not(contains(@class, '-m-overflow')) "
+    "and not(contains(@class, '-c-chip-group') or contains(@class, '-c-label-group'))]"
 )
-CHIP_TEXT = ".//span[contains(@class, '-c-chip__text')]"
+CHIP_TEXT = ".//span[contains(@class, '-c-chip__text') or contains(@class, '-c-label__text')]"
 CHIP_BADGE = ".//span[contains(@class, '-c-badge')]"
-GROUP_ROOT = ".//div[contains(@class, '-c-chip-group') and @role='group']"
+GROUP_ROOT = ".//div[(contains(@class, '-c-chip-group') and @role='group') or contains(@class,  '-c-label-group')]"
 CATEGORY_GROUP_ROOT = (
-    ".//div[contains(@class, '-c-chip-group') and @role='group' "
+    ".//div[((contains(@class, '-c-chip-group') and @role='group') or contains(@class, '-c-label-group')) "
     "and contains(@class, 'pf-m-category')]"
 )
-CATEGORY_LABEL = ".//span[contains(@class, '-c-chip-group__label')]"
-CATEGORY_CLOSE = ".//div[contains(@class, '-c-chip-group__close')]/button"
+CATEGORY_LABEL = ".//span[contains(@class, '-group__label')]"
+CATEGORY_CLOSE = ".//div[contains(@class, '-group__close')]/button"
 # For backwards compatibility
 OLD_GROUP_ROOT = ".//ul[contains(@class, '-c-chip-group')]"
 TOOLBAR_GROUP_LABEL = "./li/*[contains(@class, '-c-chip-group__label')]"
@@ -44,7 +41,7 @@ class _BaseChip(View):
 
     _text = Text(CHIP_TEXT)
     _badge = Text(f"{CHIP_TEXT}/{CHIP_BADGE}")
-    button = Button(**{"aria-label": "close"})
+    button = Button()
 
     @property
     def badge(self):
@@ -122,7 +119,7 @@ class OverflowChip(_BaseChip):
     The 'Show More'/'Show Less' button is essentially a special kind of chip
     """
 
-    ROOT = ".//button[contains(@class, '-c-chip') and contains(@class, 'pf-m-overflow')]"
+    ROOT = ".//button[(contains(@class, '-c-chip') or contains(@class, '-c-label')) and contains(@class, 'pf-m-overflow')]"
 
     def _show_less_shown(self):
         return self.text.replace(" ", "").lower() == "showless"
@@ -327,7 +324,7 @@ class ChipGroupToolbar(View):
     # The parent of the chip group toolbar can be any element type
     # The locator should be the parent node which holds all the pf-c-chip-group elements
     TOOLBAR_LOCATOR = (
-        ".//ul[contains(@class, '-c-chip-group') and " "contains(@class, 'pf-m-toolbar')]/parent::*"
+        ".//ul[contains(@class, '-c-chip-group') and contains(@class, 'pf-m-toolbar')]/parent::*"
     )
 
     overflow = OldOverflowChip(

widgetastic_patternfly5/components/clipboard_copy.py

@@ -1,7 +1,5 @@
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import GenericLocatorWidget
-from widgetastic.widget import Text
-from widgetastic.widget import TextInput
+from widgetastic.widget import GenericLocatorWidget, Text, TextInput
 
 from widgetastic_patternfly5 import Button
 

widgetastic_patternfly5/components/drawer.py

@@ -1,14 +1,17 @@
+from wait_for import wait_for
 from widgetastic.utils import ParametrizedLocator
 from widgetastic.widget import View
 
+from widgetastic_patternfly5 import Button
+
 
 class BaseDrawer:
-    """Represents drawer component for pf5
+    """Represents drawer component for pf5/pf6
 
     https://www.patternfly.org/components/drawer
     """
 
-    CLOSE = ".//button[@aria-label='Close drawer panel']"
+    close_btn = Button(locator=".//div[contains(@class, '-c-drawer__close')]/button")
 
     @property
     def is_open(self):
@@ -18,7 +21,8 @@ class BaseDrawer:
     def close(self):
         """Close drawer."""
         if self.is_open:
-            self.browser.click(self.browser.element(self.CLOSE))
+            self.close_btn.click()
+            wait_for(lambda: not self.is_open, num_sec=10)
 
 
 class Drawer(BaseDrawer, View):

widgetastic_patternfly5/components/dual_list_selector.py

@@ -1,5 +1,4 @@
-from widgetastic.widget import GenericLocatorWidget
-from widgetastic.widget import TextInput
+from widgetastic.widget import GenericLocatorWidget, TextInput
 
 from .button import Button
 

widgetastic_patternfly5/components/forms/form_select.py

@@ -81,18 +81,14 @@ class BaseFormSelect:
             FormSelectOptionNotFound: if option not found
         """
         if not self.is_enabled:
-            raise FormSelectDisabled("{} is not enabled".format(repr(self)))
+            raise FormSelectDisabled(f"{repr(self)} is not enabled")
         if value not in self.all_options:
             raise FormSelectOptionNotFound(
-                'Option "{}" not found in {}. Available options: {}'.format(
-                    value, repr(self), self.all_options
-                )
+                f'Option "{value}" not found in {repr(self)}. Available options: {self.all_options}'
             )
         elif value not in self.all_enabled_options:
             raise FormSelectOptionDisabled(
-                'Option "{}" is disabled in {}. Enabled options are: {}'.format(
-                    value, repr(self), self.all_enabled_options
-                )
+                f'Option "{value}" is disabled in {repr(self)}. Enabled options are: {self.all_enabled_options}'
             )
         self._select_element.select_by_visible_text(value)
 
@@ -101,7 +97,7 @@ class BaseFormSelect:
         return self.browser.text(self._select_element.first_selected_option)
 
     def __repr__(self):
-        return "{}({!r})".format(type(self).__name__, self.locator)
+        return f"{type(self).__name__}({self.locator!r})"
 
 
 class FormSelect(BaseFormSelect, GenericLocatorWidget):

widgetastic_patternfly5/components/forms/radio.py

@@ -1,7 +1,4 @@
-from widgetastic.widget import Checkbox
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import Text
-from widgetastic.widget import View
+from widgetastic.widget import Checkbox, ParametrizedLocator, Text, View
 
 
 class BaseRadio:

widgetastic_patternfly5/components/menus/context_selector.py

@@ -3,10 +3,10 @@ from .select import Select
 
 class BaseContextSelector:
     ITEMS_LOCATOR = (
-        ".//ul[@class='pf-v5-c-menu__list' or @class='pf-c-context-selector__menu-list']/li"
+        ".//ul[contains(@class, '-c-menu__list') or @class='pf-c-context-selector__menu-list']/li"
     )
     ITEM_LOCATOR = (
-        ".//*[(contains(@class, 'pf-v5-c-menu__item') or contains(@class, "
+        ".//*[(contains(@class, '-c-menu__list-item') or contains(@class, "
         "'pf-c-context-selector__menu-list-item'))"
         " and normalize-space(.)={}]"
     )