diff --git a/locales/en.json b/locales/en.json index ea69b3151..68665a129 100644 --- a/locales/en.json +++ b/locales/en.json @@ -146,8 +146,6 @@ "filterByAffectedSystems": "Filter by {count, plural, =-1 {affected systems} one {# system exposed } other {# systems exposed }}", "hasKnownExploit": "Has a known exploit", "high": "High", - "highVisibilityCve.body": "New CVE Alert: {synopsis} ({celebrityName}) does not have an associated errata with it for Red Hat Enterprise Linux as of now. For more details on this CVE, please visit the Red Hat Customer Portal page for this CVE", - "highVisibilityCve.link": "Open Red Hat Customer Portal page for {synopsis}", "impactList.critical": "Critical", "impactList.high": "High", "impactList.important": "Important", diff --git a/src/Components/PresentationalComponents/EmptyStates/EmptyStates.js b/src/Components/PresentationalComponents/EmptyStates/EmptyStates.js index 20e72f09e..d0d816f92 100644 --- a/src/Components/PresentationalComponents/EmptyStates/EmptyStates.js +++ b/src/Components/PresentationalComponents/EmptyStates/EmptyStates.js @@ -10,8 +10,7 @@ import { EmptyStateIcon, Text, TextContent, - Title, - Alert + Title } from '@patternfly/react-core'; import { ExternalLinkAltIcon, SecurityIcon } from '@patternfly/react-icons'; import messages from '../../../Messages'; @@ -20,7 +19,7 @@ import { LockIcon } from '@patternfly/react-icons'; import { intl } from '../../../Utilities/IntlProvider'; import PropTypes from 'prop-types'; -export const EmptyStateNoCVEs = ({ secondParagraph, showHighVisibilityCveAlert }) => ( +export const EmptyStateNoCVEs = ({ secondParagraph }) => ( <FormattedMessage {...messages.emptyStateNoMatchingCves} /> @@ -37,31 +36,13 @@ export const EmptyStateNoCVEs = ({ secondParagraph, showHighVisibilityCveAlert } </a> ) }} /> </Text> - {showHighVisibilityCveAlert && <Alert - className="high-visibility-cve pf-u-mt-lg" - variant="warning" - isInline - title={intl.formatMessage(messages.highVisibilityCveBody, - { synopsis: 'CVE-2021-44228', celebrityName: 'Apache Log4j' }) - } - actionLinks={ - <a - href="https://access.redhat.com/security/cve/CVE-2021-44228" - target="__blank" - rel="noopener noreferrer" - > - {intl.formatMessage(messages.highVisibilityCveLink, { synopsis: 'CVE-2021-44228' })} - <ExternalLinkAltIcon className="pf-u-ml-xs"/> - </a> - }/>} </EmptyStateBody> </TextContent> </EmptyState> ); EmptyStateNoCVEs.propTypes = { - secondParagraph: PropTypes.object, - showHighVisibilityCveAlert: PropTypes.bool + secondParagraph: PropTypes.object }; export const EmptyStateNoSystems = () => ( diff --git a/src/Components/SmartComponents/CVEs/CVEsTable.js b/src/Components/SmartComponents/CVEs/CVEsTable.js index a04d952a8..f7505767e 100644 --- a/src/Components/SmartComponents/CVEs/CVEsTable.js +++ b/src/Components/SmartComponents/CVEs/CVEsTable.js @@ -16,7 +16,7 @@ const CVEsTableWithContext = ({ context, header, canEditStatusOrBusinessRisk }) cells: [ { props: { colSpan: header?.length }, - title: <EmptyStateNoCVEs showHighVisibilityCveAlert secondParagraph={ + title: <EmptyStateNoCVEs secondParagraph={ context.params.affecting === 'true' ? messages.emptyStateYourSystemsShouldHaveCVEs : messages.emptyStateThereShouldBeCVEs diff --git a/src/Messages.js b/src/Messages.js index 6ec056502..790d377b7 100644 --- a/src/Messages.js +++ b/src/Messages.js @@ -1713,16 +1713,6 @@ export default defineMessages({ description: 'Button inside the column management modal, which will reset column selection to default', defaultMessage: 'Reset to default' }, - highVisibilityCveBody: { - id: 'highVisibilityCve.body', - description: 'Alert inside CVE table empty state highlighting info about newest high visibility CVE', - defaultMessage: 'New CVE Alert: {synopsis} ({celebrityName}) does not have an associated errata with it for Red Hat Enterprise Linux as of now. For more details on this CVE, please visit the Red Hat Customer Portal page for this CVE' - }, - highVisibilityCveLink: { - id: 'highVisibilityCve.link', - description: 'Alert inside CVE table empty state highlighting info about newest high visibility CVE', - defaultMessage: 'Open Red Hat Customer Portal page for {synopsis}' - }, noDescription: { id: 'noDescription', description: 'No description description',