Update views and entities for new inventory ui (#2258)

Author: ColeHiggins2

airgun/entities/cloud_inventory.py

@@ -56,6 +56,12 @@ def get_displayed_buttons(self):
             ),
             'sync_status': view.sync_status.is_displayed,
             'sync_status_text': view.sync_status.read() if view.sync_status.is_displayed else None,
+            'generate_and_upload': view.inventory_list.generate_and_upload.is_displayed,
+            'generate_and_upload_enabled': (
+                view.inventory_list.generate_and_upload.disabled is False
+            ),
+            'generate_report': view.inventory_list.generate_report.is_displayed,
+            'generate_report_enabled': view.inventory_list.generate_report.disabled is False,
         }
         return result
 
@@ -70,17 +76,6 @@ def get_displayed_descriptions(self):
         }
         return result
 
-    def get_displayed_inventory_tabs(self):
-        """Get displayed inventory tabs on Red Hat Inventory page"""
-        view = self.navigate_to(self, 'All')
-        self.browser.plugin.ensure_page_safe(timeout='5s')
-        view.wait_displayed()
-        result = {
-            'generating': view.inventory_list.generating.is_displayed,
-            'uploading': view.inventory_list.uploading.is_displayed,
-        }
-        return result
-
     def configure_cloud_connector(self):
         """Configure Cloud Connector"""
         view = self.navigate_to(self, 'All')
@@ -97,15 +92,31 @@ def sync_inventory_status(self):
         view = self.navigate_to(self, 'All')
         view.sync_status.click()
 
-    def generate_report(self, entity_name):
+    def generate_and_upload_report(self, entity_name):
+        """
+        Generate and upload inventory report for a specific organization.
+        """
         view = self.navigate_to(self, 'All')
         view.inventory_list.toggle(entity_name)
-        view.browser.click(view.inventory_list.generating.generate, ignore_ajax=True)
+        view.inventory_list.generate_and_upload.click()
+        # self.browser.plugin.ensure_page_safe(timeout='10s')
 
-    def download_report(self, entity_name):
+    def generate_report_only(self, entity_name):
+        """
+        Generate inventory report (without upload) for a specific organization.
+        """
         view = self.navigate_to(self, 'All')
         view.inventory_list.toggle(entity_name)
-        view.browser.click(view.inventory_list.generating.download_report, ignore_ajax=True)
+        view.inventory_list.generate_report.click()
+        # self.browser.plugin.ensure_page_safe(timeout='10s')
+
+    def download_report_only(self, org_name):
+        """
+        Download inventory report for a specific organization.
+        """
+        view = self.navigate_to(self, 'All')
+        view.inventory_list.toggle(org_name)
+        view.inventory_list.download_report.click()
         time.sleep(3)
         return self.browser.save_downloaded_file()
 

airgun/views/cloud_inventory.py

@@ -1,8 +1,7 @@
-from selenium.common.exceptions import NoSuchElementException
 from wait_for import wait_for
 from widgetastic.utils import ParametrizedLocator
 from widgetastic.widget import Text, View
-from widgetastic_patternfly import Button, Tab
+from widgetastic_patternfly import Tab
 from widgetastic_patternfly4.switch import Switch
 from widgetastic_patternfly5 import Button as PF5Button, Menu
 from widgetastic_patternfly5.ouia import Text as PF5OUIAText
@@ -44,73 +43,54 @@ class InventoryItemsView(Accordion):
     DESCRIPTION_LOCATOR = (
         './/span[contains(@class, "pf-v5-c-label pf-m-blue pf-m-outline account-icon")]'
     )
-    STATUS_ELEMENTS = './/div[contains(@class, "status")]/div[contains(@class, "item")]'
-
-    @View.nested
-    class generating(InventoryTab):
-        process = Text('.//div[contains(@class, "tab-header")]/div[1]')
-        generate = Button('contains', 'Generate')
-        download_report = Button('Download Report')
-        terminal = Text(
-            './/div[contains(@class, "report-generate")]//div[contains(@class, "terminal")]'
-        )
-        scheduled_run = Text('.//div[contains(@class, "scheduled_run")]')
-
-    @View.nested
-    class uploading(InventoryTab):
-        process = Text('.//div[contains(@class, "tab-header")]/div[1]')
-        terminal = Text(
-            './/div[contains(@class, "report-upload")]//div[contains(@class, "terminal")]'
-        )
 
-    @property
-    def is_generating(self):
-        try:
-            self.parent_browser.element(f'{self.STATUS_ELEMENTS}[1]')
-            return True
-        except NoSuchElementException:
-            return False
+    # Task action buttons
+    generate_and_upload = PF5Button('Generate and upload report')
+    generate_report = PF5Button('Generate report')
+    download_report = PF5Button('Download report')
 
-    @property
-    def is_uploading(self):
-        try:
-            self.parent_browser.element(f'{self.STATUS_ELEMENTS}[2]')
-            return True
-        except NoSuchElementException:
-            return False
-
-    @property
-    def status(self):
-        if self.is_generating:
-            return 'generating'
-        if self.is_uploading:
-            return 'uploading'
-        return 'idle'
+    task_status = Text(locator='.//div[contains(@class, "pf-v5-c-progress__description")]')
+    report_saved_to = Text(
+        locator=(
+            './/dt[.//span[contains(text(), "Report saved to")]]/following-sibling::dd[1]'
+            '//div[contains(@class, "pf-v5-c-description-list__text")]'
+        )
+    )
 
     @property
     def is_active(self):
+        """Check if this accordion item is expanded."""
         classes = self.browser.classes(self)
         return any('expand-active' in class_ for class_ in classes)
 
     def child_widget_accessed(self, widget):
+        """Automatically expand the accordion when accessing child widgets."""
         if not self.is_active:
             self.click()
 
     def read(self, widget_names=None):
-        final_dict = {
-            'generating': self.generating.read(),
-            'status': self.status,
+        """Read the current state of the view including all settings."""
+        result = {
+            'generate_and_upload_displayed': self.generate_and_upload.is_displayed,
+            'generate_report_displayed': self.generate_report.is_displayed,
+            'download_report_displayed': self.download_report.is_displayed,
             'obfuscate_hostnames': self.parent.obfuscate_hostnames.read(),
             'obfuscate_ips': self.parent.obfuscate_ips.read(),
             'exclude_packages': self.parent.exclude_packages.read(),
         }
-        if self.uploading.is_displayed:
-            final_dict['uploading'] = self.uploading.read()
+
+        # Include auto_update if it's displayed
         if self.parent.auto_update.is_displayed:
-            final_dict['auto_update'] = self.parent.auto_update.read()
-        return final_dict
+            result['auto_update'] = self.parent.auto_update.read()
+
+        if self.report_saved_to.is_displayed:
+            result['report_saved_to'] = self.report_saved_to.read()
+            result['task_status'] = self.task_status.read()
+
+        return result
 
     def fill(self, values):
+        """This view is read-only."""
         raise ReadOnlyWidgetError('View is read only, fill is prohibited')