pf4 bookmarks dropdown

SatelliteQE · Mar 1, 2024 · 5d39597 · 5d39597
1 parent bf6c9be
commit 5d39597
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 15 deletions.
diff --git a/airgun/views/computeresource.py b/airgun/views/computeresource.py
@@ -11,7 +11,12 @@
 )
 from widgetastic_patternfly import BreadCrumb
 
-from airgun.views.common import BaseLoggedInView, SatTab, SearchableViewMixin
+from airgun.views.common import (
+    BaseLoggedInView,
+    SatTab,
+    SearchableViewMixin,
+    SearchableViewMixinPF4,
+)
 from airgun.views.host import HostCreateView
 from airgun.widgets import (
     ActionsDropdown,
@@ -24,7 +29,7 @@
 )
 
 
-class ComputeResourcesView(BaseLoggedInView, SearchableViewMixin):
+class ComputeResourcesView(BaseLoggedInView, SearchableViewMixinPF4):
     title = Text('//*[(self::h1 or self::h5) and normalize-space(.)="Compute Resources"]')
     new = Text('//a[normalize-space(.)="Create Compute Resource"]')
     table = SatTable(

diff --git a/airgun/views/dashboard.py b/airgun/views/dashboard.py
@@ -1,7 +1,7 @@
 from widgetastic.widget import Table, Text, View, Widget
 
-from airgun.views.common import BaseLoggedInView, SatTable
-from airgun.widgets import ActionsDropdown, PieChart, Search
+from airgun.views.common import BaseLoggedInView, SatTable, SearchableViewMixinPF4
+from airgun.widgets import ActionsDropdown, PieChart
 
 
 class ItemValueList(Widget):
@@ -71,11 +71,10 @@ def fill(self, value):
             self.browser.element(self.AUTO_REFRESH).click()
 
 
-class DashboardView(BaseLoggedInView):
+class DashboardView(BaseLoggedInView, SearchableViewMixinPF4):
     title = Text("//h1[normalize-space(.)='Overview']")
     manage = ActionsDropdown("//div[@class='btn-group']")
     refresh = AutoRefresh()
-    searchbox = Search()
 
     @property
     def is_displayed(self):

diff --git a/airgun/views/discoveryrule.py b/airgun/views/discoveryrule.py
@@ -2,7 +2,7 @@
 from widgetastic_patternfly import BreadCrumb
 from widgetastic_patternfly4 import Button as PF4Button
 
-from airgun.views.common import BaseLoggedInView, SatTab
+from airgun.views.common import BaseLoggedInView, SatTab, SearchableViewMixinPF4
 from airgun.widgets import (
     ActionsDropdown,
     AutoCompleteTextInput,
@@ -12,7 +12,7 @@
 )
 
 
-class DiscoveryRulesView(BaseLoggedInView):
+class DiscoveryRulesView(BaseLoggedInView, SearchableViewMixinPF4):
     title = Text("//h1[normalize-space(.)='Discovery Rules']")
     new = Text("//a[contains(@href, '/discovery_rules/new')]")
     new_on_blank_page = PF4Button('Create Rule')

diff --git a/airgun/views/package.py b/airgun/views/package.py
@@ -1,7 +1,12 @@
 from widgetastic.widget import Checkbox, Select, Text, View
 from widgetastic_patternfly import BreadCrumb
 
-from airgun.views.common import BaseLoggedInView, ReadOnlyEntry, SatTab, SatTable
+from airgun.views.common import (
+    BaseLoggedInView,
+    ReadOnlyEntry,
+    SatTab,
+    SatTable,
+)
 from airgun.widgets import ItemsListReadOnly, Search
 
 

diff --git a/airgun/views/repository.py b/airgun/views/repository.py
@@ -9,7 +9,11 @@
 )
 from widgetastic_patternfly import BreadCrumb
 
-from airgun.views.common import BaseLoggedInView, SearchableViewMixin
+from airgun.views.common import (
+    BaseLoggedInView,
+    SearchableViewMixin,
+    SearchableViewMixinPF4,
+)
 from airgun.widgets import (
     ActionsDropdown,
     ConfirmationDialog,
@@ -22,7 +26,7 @@
 )
 
 
-class RepositoriesView(BaseLoggedInView, SearchableViewMixin):
+class RepositoriesView(BaseLoggedInView, SearchableViewMixinPF4):
     breadcrumb = BreadCrumb()
     new = Text("//button[contains(@href, '/repositories/new')]")
     sync = Text("//button[contains(@ng-click, 'syncSelectedRepositories')]")

diff --git a/airgun/views/subnet.py b/airgun/views/subnet.py
@@ -1,11 +1,16 @@
 from widgetastic.widget import Table, Text, TextInput, View
 from widgetastic_patternfly import BreadCrumb
 
-from airgun.views.common import BaseLoggedInView, SatTab, SearchableViewMixin
-from airgun.widgets import CustomParameter, FilteredDropdown, MultiSelect, RadioGroup
+from airgun.views.common import BaseLoggedInView, SatTab, SearchableViewMixinPF4
+from airgun.widgets import (
+    CustomParameter,
+    FilteredDropdown,
+    MultiSelect,
+    RadioGroup,
+)
 
 
-class SubnetsView(BaseLoggedInView, SearchableViewMixin):
+class SubnetsView(BaseLoggedInView, SearchableViewMixinPF4):
     title = Text('//*[(self::h1 or self::h5) and normalize-space(.)="Subnets"]')
     new = Text('//a[normalize-space(.)="Create Subnet"]')
     table = Table(

diff --git a/airgun/widgets.py b/airgun/widgets.py
@@ -567,7 +567,7 @@ class ActionsDropdown(GenericLocatorWidget):
         "contains(@ng-click, 'toggleDropdown')][contains(@class, 'btn')]"
         "[*[self::span or self::i][contains(@class, 'caret')]]"
     )
-    pf4_drop_down = Dropdown('OUIA-Generated-Dropdown-2')
+    pf4_drop_down = Text("//div[contains(@data-ouia-component-id, 'bookmarks-dropdown')]")
     button = Text(
         ".//*[self::button or self::span][contains(@class, 'btn') or "
         "contains(@aria-label, 'search button')]"
@@ -757,6 +757,8 @@ class PF4Search(Search):
     search_button = Text(locator=(".//button[contains(@id, 'btn-search')]"))
     clear_button = Text(locator=(".//button[contains(@class,'autocomplete-clear-button')]"))
 
+    actions = ActionsDropdown("//div[contains(@data-ouia-component-id, 'bookmarks-dropdown')]")
+
     def clear(self):
         """Clears search field value and re-trigger search to remove all
         filters.