From 295dbadfa51867c3a5ea3d0d433d726a9ebc3691 Mon Sep 17 00:00:00 2001
From: Satellite QE <115476073+Satellite-QE@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:35:55 -0400
Subject: [PATCH] fixed in method for discovery rule and updated it's entities
 (#1480) (#1530)

---
 airgun/entities/discoveryrule.py | 12 ++++++++----
 airgun/views/discoveryrule.py    |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/airgun/entities/discoveryrule.py b/airgun/entities/discoveryrule.py
index afcf95973..3c1f582cf 100644
--- a/airgun/entities/discoveryrule.py
+++ b/airgun/entities/discoveryrule.py
@@ -50,13 +50,17 @@ def read(self, entity_name, widget_names=None):
         return view.read(widget_names=widget_names)
 
     def read_all(self):
-        """Reads the whole discovery rules table.
+        """Reads the entire discovery rules page
 
-        :return: list of table rows, each row is dict,
-            attribute as key with correct value
+        :return:
+            1) list of table rows, each row is dict, attribute as key with correct value
+            2) After deleting the rule, the page context is displayed
         """
         view = self.navigate_to(self, 'All')
-        return view.table.read()
+        if view.table.is_displayed:
+            return view.table.read()
+        elif view.page_info.is_displayed:
+            return view.page_info.read()
 
     def update(self, entity_name, values):
         """Update existing Discovery rule
diff --git a/airgun/views/discoveryrule.py b/airgun/views/discoveryrule.py
index 0e1bab4b1..868d1edfd 100644
--- a/airgun/views/discoveryrule.py
+++ b/airgun/views/discoveryrule.py
@@ -1,4 +1,4 @@
-from widgetastic.widget import Checkbox, Text, TextInput, View
+from widgetastic.widget import Checkbox, Table, Text, TextInput, View
 from widgetastic_patternfly import BreadCrumb
 from widgetastic_patternfly4 import Button as PF4Button
 
@@ -8,18 +8,18 @@
     AutoCompleteTextInput,
     FilteredDropdown,
     MultiSelect,
-    SatTable,
 )
 
 
 class DiscoveryRulesView(BaseLoggedInView, SearchableViewMixinPF4):
     title = Text("//h1[normalize-space(.)='Discovery Rules']")
+    page_info = Text("//foreman-react-component[contains(@name, 'DiscoveryRules')]/div/div")
     new = Text("//a[contains(@href, '/discovery_rules/new')]")
     new_on_blank_page = PF4Button('Create Rule')
-    table = SatTable(
+    table = Table(
         './/table',
         column_widgets={
-            'Name': Text('./a'),
+            'Name': Text('.//a'),
             'Actions': ActionsDropdown("./div[contains(@class, 'btn-group')]"),
         },
     )