refactor: updated graphic and removed report selection in the GUI

Removed GUI report selection due to pyside6 bug in QComboBox.setCurrentIndex() pending workaround

Signed-off-by: Timothy MacDonald <[email protected]>

Author: Timothy MacDonald

Example-Report.pdf

@@ -45,13 +45,20 @@
        <layout class="QHBoxLayout" name="horizontalLayout_6">
         <item>
          <widget class="QLabel" name="labelSelectReport">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
           <property name="text">
            <string>Select Report:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="comboBoxReportSelector"/>
+         <widget class="QComboBox" name="comboBoxReportSelector">
+          <property name="editable">
+           <bool>false</bool>
+          </property>
+         </widget>
         </item>
         <item>
          <spacer name="horizontalSpacer_4">

assets/FortiCNAPP-Unified-Approach.png

@@ -82,11 +82,20 @@ def __init__(self, args, pre_processed_args, available_reports, basedir):
 
         self.populate_fields_from_args()
         self.connect_ui_elements()
+
+
+        # Hide report selector widget for now due to bug in setting combobox index, set report based on command line argument instead
+        selected_report_name = [report['report_name'] for report in self.available_reports if report['report_short_name'] == self.args.report][0]
+        self.report_changed(selected_report_name)
+        self.window.labelSelectReport.hide()
+        self.window.comboBoxReportSelector.hide()
+
         self.window.show()
 
 
     def connect_ui_elements(self):
-        self.window.comboBoxReportSelector.currentTextChanged.connect(self.report_changed)
+        # Combobox disabled due to bug in setting current index
+        # self.window.comboBoxReportSelector.currentTextChanged.connect(self.report_changed)
         self.window.pushButtonRunReport.clicked.connect(self.run_report)
         self.window.pushButtonTogglePreview.clicked.connect( self.toggle_preview)
         self.window.plainTextEditRecommendations.textChanged.connect(self.lineedits_changed)
@@ -159,17 +168,13 @@ def toggle_preview(self):
             self.report_preview.show()
 
     def populate_fields_from_args(self):
-        for available_report in self.available_reports:
-            self.window.comboBoxReportSelector.addItem(available_report['report_name'])
-        #print(str(self.args.report))
-        selected_report_name = [report['report_name'] for report in self.available_reports if report['report_short_name'] == self.args.report][0]
-        #print(selected_report_name)
-        # Could not get comboBoxReportSelector.setCurrentIndex to work. Switching to setCurrentText
-        report_index = self.window.comboBoxReportSelector.findText(str(selected_report_name))
-        # print(report_index)
-        # print(type(self.window.comboBoxReportSelector))
-        self.window.comboBoxReportSelector.setCurrentIndex(report_index)
-        #self.window.comboBoxReportSelector.setCurrentText(selected_report_name)
+        # Combobox disabled due to bug in setting current index
+        # for available_report in self.available_reports:
+        #    self.window.comboBoxReportSelector.addItem(available_report['report_name'])
+        # selected_report_name = [report['report_name'] for report in self.available_reports if report['report_short_name'] == self.args.report][0]
+        # report_index = self.window.comboBoxReportSelector.findText(str(selected_report_name))
+        # self.window.comboBoxReportSelector.setCurrentIndex(report_index)
+
 
         if self.args.cache_data:
             self.window.checkBoxUseCache.setCheckState(Qt.Checked)

assets/mainwindow.ui

@@ -21,7 +21,7 @@ def __init__(self, basedir, use_cache=False, api_key_file=None, graph_scale=1):
         self.recommendations = self.default_recommendations
         self.template = self.get_jinja2_template('csa_detailed_report.jinja2')
         self.company_logo_html = self.file_to_image_tag('assets/Fortinet_logo.png', 'png')
-        self.polygraph_graphic_html = self.file_to_image_tag('assets/FortiCNAPP-info.png', 'png')
+        self.polygraph_graphic_html = self.file_to_image_tag('assets/FortiCNAPP-Unified-Approach.png', 'png')
 
     def gather_data(self,
                     vulns_start_time: LaceworkTime,

modules/gui_main.py

@@ -19,7 +19,7 @@ logzero = "^1.7.0"
 pytest = "^7.2.1"
 python-dotenv = "^0.21.1"
 laceworksdk = "^4.1.0"
-pyside6 = "^6.4.3"
+pyside6 = "^6.9.0"
 weasyprint = "^62.1"