From 9db31d28ca8159e8b9eedb1fadcc7168759ac370 Mon Sep 17 00:00:00 2001 From: leSamo Date: Fri, 30 Jun 2023 18:04:42 +0200 Subject: [PATCH] Progress --- package-lock.json | 14 +++++++------- package.json | 2 +- .../SmartComponents/Modals/ReportConfigModal.js | 3 ++- .../SystemsExposedTable/SystemsExposedTable.js | 1 + src/Helpers/ReportsHelper.js | 9 ++++++++- src/Helpers/constants.js | 6 ++++++ 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00be0e2ce..62e5ce12c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@redhat-cloud-services/frontend-components-translations": "^3.2.4", "@redhat-cloud-services/frontend-components-utilities": "^3.7.0", "@redhat-cloud-services/host-inventory-client": "^1.0.116", - "@redhat-cloud-services/vulnerabilities-client": "^1.2.4", + "@redhat-cloud-services/vulnerabilities-client": "^1.2.5", "@scalprum/react-core": "^0.1.9", "axios": "^1.4.0", "dot": "^1.1.3", @@ -5074,9 +5074,9 @@ "integrity": "sha512-1aqJcgQZq4uih+LxRpVJQblt2x4o/hlrqSZMYFhWyTLgnVNhJ8Y7B5pwoVjpA5PCE1fBNahrydVwugEKMsDDtg==" }, "node_modules/@redhat-cloud-services/vulnerabilities-client": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/vulnerabilities-client/-/vulnerabilities-client-1.2.4.tgz", - "integrity": "sha512-mjsMjHgXeiyw7GEnWl98TV0oqvSDzpmDERCvHDoPwbpqLOw9YRS4YTALfWivlBY/JT9HCG7o9kqdHB+nR/rOPw==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/vulnerabilities-client/-/vulnerabilities-client-1.2.5.tgz", + "integrity": "sha512-A/dgGs8vnP+KGCwUv8Go/euqyNZqF7AWmL2S8tMumrrSQQqa1gNADb/wHN/9RWPUzLg9MFOcd2NHcVNs8vgdeA==", "dependencies": { "axios": "^0.27.2" } @@ -30541,9 +30541,9 @@ "integrity": "sha512-1aqJcgQZq4uih+LxRpVJQblt2x4o/hlrqSZMYFhWyTLgnVNhJ8Y7B5pwoVjpA5PCE1fBNahrydVwugEKMsDDtg==" }, "@redhat-cloud-services/vulnerabilities-client": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/vulnerabilities-client/-/vulnerabilities-client-1.2.4.tgz", - "integrity": "sha512-mjsMjHgXeiyw7GEnWl98TV0oqvSDzpmDERCvHDoPwbpqLOw9YRS4YTALfWivlBY/JT9HCG7o9kqdHB+nR/rOPw==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/vulnerabilities-client/-/vulnerabilities-client-1.2.5.tgz", + "integrity": "sha512-A/dgGs8vnP+KGCwUv8Go/euqyNZqF7AWmL2S8tMumrrSQQqa1gNADb/wHN/9RWPUzLg9MFOcd2NHcVNs8vgdeA==", "requires": { "axios": "^0.27.2" }, diff --git a/package.json b/package.json index 7bb202687..50b60526c 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@redhat-cloud-services/frontend-components-translations": "^3.2.4", "@redhat-cloud-services/frontend-components-utilities": "^3.7.0", "@redhat-cloud-services/host-inventory-client": "^1.0.116", - "@redhat-cloud-services/vulnerabilities-client": "^1.2.4", + "@redhat-cloud-services/vulnerabilities-client": "^1.2.5", "@scalprum/react-core": "^0.1.9", "axios": "^1.4.0", "dot": "^1.1.3", diff --git a/src/Components/SmartComponents/Modals/ReportConfigModal.js b/src/Components/SmartComponents/Modals/ReportConfigModal.js index ca8e9e989..6d9bc9ea9 100644 --- a/src/Components/SmartComponents/Modals/ReportConfigModal.js +++ b/src/Components/SmartComponents/Modals/ReportConfigModal.js @@ -57,7 +57,8 @@ const ReportConfigModal = ({ 'business_risk_id', 'status_id', 'publish_date', - 'rhel_version' + 'rhel_version', + 'advisory_available' ]; const handleCheckboxChange = (parameter, value) => { diff --git a/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js b/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js index 02a28a175..9437e641d 100644 --- a/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js +++ b/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js @@ -213,6 +213,7 @@ const SystemsExposedTable = ({ }} canEditPairStatus={canEditPairStatus} canExport={canExport} + showingCvesWithoutErrata={meta?.cves_without_errata} > {StatusModal && } diff --git a/src/Helpers/ReportsHelper.js b/src/Helpers/ReportsHelper.js index 234bed835..6275b5ff1 100644 --- a/src/Helpers/ReportsHelper.js +++ b/src/Helpers/ReportsHelper.js @@ -5,7 +5,8 @@ import { RULE_PRESENCE_OPTIONS, DEFAULT_FILTER_DATA, PDF_REPORT_PER_PAGE, - KNOWN_EXPLOIT_FILTER_OPTIONS + KNOWN_EXPLOIT_FILTER_OPTIONS, + ADVISORY_AVAILABILITY_FILTER_OPTIONS } from './constants'; import { formatDate } from './MiscHelper'; import { intl } from '../Utilities/IntlProvider'; @@ -61,6 +62,12 @@ export const buildFilters = filterData => { newValues[key].values = value.map(version => `RHEL ${version}`).join(', '); break; + case 'advisory_available': + newValues[key].values = value.map( + checkedValue => ADVISORY_AVAILABILITY_FILTER_OPTIONS.find(({ value }) => value === checkedValue).label + ).join(', '); + break; + case 'tags': newValues[key].values = value; break; diff --git a/src/Helpers/constants.js b/src/Helpers/constants.js index 7a09c0483..f5460c7f4 100644 --- a/src/Helpers/constants.js +++ b/src/Helpers/constants.js @@ -426,6 +426,11 @@ export const CVE_REPORT_FILTERS = { selectProps: { style: { maxHeight: '250px', overflow: 'auto' } }, allSelectedText: intl.formatMessage(messages.optionsAny) }, + advisory_available: { + title: intl.formatMessage(messages.advisory), + items: ADVISORY_AVAILABILITY_FILTER_OPTIONS, + component: CheckboxCustomFilter + }, tags: { title: 'Tags', component: TagFilter, @@ -876,6 +881,7 @@ export const DEFAULT_FILTER_DATA = { }, known_exploit: [], rhel_version: [], + advisory_available: [], tags: [] };