Reflect advisory filter and column in CVE report

RedHatInsights · Jul 31, 2023 · 3c76329 · 3c76329
1 parent 1d8a227
commit 3c76329
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 1 deletion.
diff --git a/locales/en.json b/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "CVEsReport.filters.advisoryAvailable": "{prefix} advisory <b>{values}</b>",
   "CVEsReport.filters.businessRisk": "{prefix} business risk of <b>{values}</b>",
   "CVEsReport.filters.osVersion": "{prefix} which apply to <b>{values}</b>",
   "CVEsReport.filters.securityRule": "{prefix} <b>{values}</b>",

diff --git a/src/Components/SmartComponents/Reports/Common/firstPagePDF.js b/src/Components/SmartComponents/Reports/Common/firstPagePDF.js
@@ -37,6 +37,7 @@ const firstPagePDF = ({ data, meta, filters, intl, isReportDynamic, reportData,
         { name: 'status_id', msg: messages.CVEsPDFreportFiltersStatus, lowercase: true },
         { name: 'rule_presence', msg: messages.CVEsPDFreportFiltersDefinedValue, lowercase: true },
         { name: 'known_exploit', msg: messages.CVEsPDFreportFiltersDefinedValue, lowercase: true },
+        { name: 'advisory_available', msg: messages.CVEsPDFreportFiltersAdvisoryAvailable, lowercase: true },
         { name: 'rhel_version', msg: messages.CVEsPDFreportFiltersOsVersion }
     ];
 

diff --git a/src/Components/SmartComponents/Reports/Common/tablePage.js b/src/Components/SmartComponents/Reports/Common/tablePage.js
@@ -39,6 +39,11 @@ const tablePage = ({ data, page, intl, header, type, isReportDynamic = false })
             name: 'status_id',
             header: { value: intl.formatMessage(messages.status) },
             hit: 'status'
+        },
+        {
+            name: 'advisory_available',
+            header: { value: intl.formatMessage(messages.advisory) },
+            hit: 'advisory_available'
         }
     ];
     // eslint-disable-next-line react/prop-types

diff --git a/src/Components/SmartComponents/Reports/DownloadCVEsReport.js b/src/Components/SmartComponents/Reports/DownloadCVEsReport.js
@@ -101,7 +101,10 @@ const DownloadCVEsReport = ({
                         business_risk: BUSINESS_RISK_OPTIONS.find(item =>
                             item.value === cve.attributes.business_risk_id.toString()).label,
                         impact: impactList[cve.attributes.impact]?.title || intl.formatMessage(messages.impactListUnknown),
-                        cvss_score: parseFloat(cve.attributes.cvss3_score || cve.attributes.cvss2_score).toFixed(1)
+                        cvss_score: parseFloat(cve.attributes.cvss3_score || cve.attributes.cvss2_score).toFixed(1),
+                        advisory_available: cve.attributes.advisory_available
+                            ? intl.formatMessage(messages.available)
+                            : intl.formatMessage(messages.notAvailable)
                     }
                 };
             });

diff --git a/src/Helpers/ReportsHelper.js b/src/Helpers/ReportsHelper.js
@@ -111,6 +111,7 @@ export function constructFilterParameters(filterParams) {
         rule_presence: filterParams.rule_presence.toString(),
         known_exploit: filterParams.known_exploit.toString(),
         rhel_version: filterParams.rhel_version.toString(),
+        advisory_available: filterParams.advisory_available.toString(),
         tags: filterParams.tags?.map(tag => tag.string).join(',')
     };
 

diff --git a/src/Messages.js b/src/Messages.js
@@ -491,6 +491,11 @@ export default defineMessages({
         description: 'CVEs PDF report filters security',
         defaultMessage: '{prefix} <b>{values}</b>'
     },
+    CVEsPDFreportFiltersAdvisoryAvailable: {
+        id: 'CVEsReport.filters.advisoryAvailable',
+        description: 'CVEs PDF report filters advisory available',
+        defaultMessage: '{prefix} advisory <b>{values}</b>'
+    },
     CVEsPDFreportFiltersOsVersion: {
         id: 'CVEsReport.filters.osVersion',
         description: 'CVEs PDF report filters security',