address comments & fix stuck modal

SatelliteQE · Sep 21, 2023 · c538891 · c538891
1 parent fe560a9
commit c538891
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/airgun/entities/host_new.py b/airgun/entities/host_new.py
@@ -56,7 +56,9 @@ def get_host_statuses(self, entity_name):
         self.browser.plugin.ensure_page_safe()
         view.overview.host_status.manage_all_statuses.click()
         view = ManageHostStatusesView(self.browser)
-        return view.read()
+        values = view.read()
+        view.close_modal.click()
+        return values
 
     def edit_system_purpose(
         self, entity_name, role=None, sla=None, usage=None, release_ver=None, add_ons=None

diff --git a/airgun/views/host_new.py b/airgun/views/host_new.py
@@ -799,14 +799,14 @@ class ManageHostStatusesView(View):
     """Manage host statuses modal"""
 
     ROOT = './/div[@data-ouia-component-id="statuses-modal"]'
-
+    close_modal = Button(locator='.//button[@aria-label="Close"]')
     host_statuses_table = PatternflyTable(
         component_id='statuses-table',
         column_widgets={
-            'Name': Text('.//td[1]'),
-            'Status': Text('.//td[2]'),
-            'Reported at': Text('.//td[3]'),
-            3: Button(locator='.//td[4]'),
+            'Name': Text('.//td[contains(@data-label, "Name")]'),
+            'Status': Text('.//td[contains(@data-label, "Status")]'),
+            'Reported at': Text('.//td[contains(@data-label, "Reported at")]'),
+            3: Button(locator='.//td[contains(@class, "action")]'),
         },
     )