From c115b3c73340732e9abe9647a7d2b7b24eec67f6 Mon Sep 17 00:00:00 2001
From: Mark Pedrotti <mark@stackrox.com>
Date: Wed, 28 May 2025 11:20:48 -0400
Subject: [PATCH] ROX-29513: Replace CSV report preview with Non-optional
 columns

---
 .../components/ReportParametersDetails.tsx    |  23 +++-
 .../exampleReportsCSVData.ts                  |  63 -----------
 .../forms/ReportParametersForm.tsx            |   2 +-
 .../forms/ReportReviewForm.tsx                | 101 +-----------------
 4 files changed, 20 insertions(+), 169 deletions(-)
 delete mode 100644 ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts

diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx
index d56573ce59ce1..cdcc723bcc76a 100644
--- a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx
+++ b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx
@@ -123,22 +123,35 @@ function ReportParametersDetails({
                             {getCVEsDiscoveredSinceText(formValues.reportParameters)}
                         </DescriptionListDescription>
                     </DescriptionListGroup>
+                    <DescriptionListGroup>
+                        <DescriptionListTerm>Non-optional columns</DescriptionListTerm>
+                        <DescriptionListDescription>Cluster</DescriptionListDescription>
+                        <DescriptionListDescription>Namespace</DescriptionListDescription>
+                        <DescriptionListDescription>Deployment</DescriptionListDescription>
+                        <DescriptionListDescription>Image</DescriptionListDescription>
+                        <DescriptionListDescription>Component</DescriptionListDescription>
+                        <DescriptionListDescription>CVE</DescriptionListDescription>
+                        <DescriptionListDescription>Fixable</DescriptionListDescription>
+                        <DescriptionListDescription>CVE Fixed In</DescriptionListDescription>
+                        <DescriptionListDescription>Severity</DescriptionListDescription>
+                        <DescriptionListDescription>CVSS</DescriptionListDescription>
+                        <DescriptionListDescription>Discovered At</DescriptionListDescription>
+                        <DescriptionListDescription>Reference</DescriptionListDescription>
+                    </DescriptionListGroup>
                     {(hasIncludeNvdCvss || hasIncludeEpssProbability || hasIncludeAdvisory) && (
                         <DescriptionListGroup>
                             <DescriptionListTerm>Optional columns</DescriptionListTerm>
                             {hasIncludeNvdCvss && (
-                                <DescriptionListDescription>
-                                    Include NVD CVSS
-                                </DescriptionListDescription>
+                                <DescriptionListDescription>NVDCVSS</DescriptionListDescription>
                             )}
                             {hasIncludeEpssProbability && (
                                 <DescriptionListDescription>
-                                    Include EPSS probability
+                                    EPSS Probability Percentage
                                 </DescriptionListDescription>
                             )}
                             {hasIncludeAdvisory && (
                                 <DescriptionListDescription>
-                                    Include advisory
+                                    Advisory Name and Advisory Link
                                 </DescriptionListDescription>
                             )}
                         </DescriptionListGroup>
diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts
deleted file mode 100644
index 136530bcac81f..0000000000000
--- a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { VulnerabilitySeverity } from 'types/cve.proto';
-
-export type ExampleReportCSVData = {
-    cluster: string;
-    namespace: string;
-    deployment: string;
-    image: string;
-    component: string;
-    cve: string;
-    fixable: string;
-    componentUpgrade: string;
-    severity: VulnerabilitySeverity;
-    cvss: number;
-    discoveredAt: string;
-    reference: string;
-};
-
-const exampleReportsCSVData: ExampleReportCSVData[] = [
-    {
-        cluster: 'production',
-        namespace: 'openshift-config-operator',
-        deployment: 'openshift-config-operator',
-        image: 'quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93ae9f08c38eb25ccd70aa44c08624199fe3f2d38efcb5d6627e83c8d165088',
-        component: 'bzip2-libs',
-        cve: 'CVE-2019-12900',
-        fixable: 'false',
-        componentUpgrade: '',
-        severity: 'LOW_VULNERABILITY_SEVERITY',
-        cvss: 3.3,
-        discoveredAt: 'January 26, 2022',
-        reference: 'https://access.redhat.com/security/cve/CVE-2019-12900',
-    },
-    {
-        cluster: 'production',
-        namespace: 'openshift-config-operator',
-        deployment: 'openshift-config-operator',
-        image: 'quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93ae9f08c38eb25ccd70aa44c08624199fe3f2d38efcb5d6627e83c8d165088',
-        component: 'cryptsetup-libs',
-        cve: 'CVE-2021-4122',
-        fixable: 'false',
-        componentUpgrade: '',
-        severity: 'MODERATE_VULNERABILITY_SEVERITY',
-        cvss: 5.5,
-        discoveredAt: 'January 26, 2022',
-        reference: 'https://access.redhat.com/security/cve/CVE-2021-4122',
-    },
-    {
-        cluster: 'production',
-        namespace: 'openshift-config-operator',
-        deployment: 'openshift-config-operator',
-        image: 'quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93ae9f08c38eb25ccd70aa44c08624199fe3f2d38efcb5d6627e83c8d165088',
-        component: 'curl',
-        cve: 'RHSA-2021:4511',
-        fixable: 'true',
-        componentUpgrade: '0:7.61.1-22.el8',
-        severity: 'MODERATE_VULNERABILITY_SEVERITY',
-        cvss: 5.8,
-        discoveredAt: 'January 26, 2022',
-        reference: 'https://access.redhat.com/errata/RHSA-2021:4511',
-    },
-];
-
-export default exampleReportsCSVData;
diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx
index 46ad505fab6bc..702d0c7f85f81 100644
--- a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx
+++ b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx
@@ -318,7 +318,7 @@ function ReportParametersForm({ title, formik }: ReportParametersFormParams): Re
                         )}
                         {isIncludeAdvisoryEnabled && (
                             <Checkbox
-                                label="Include advisory"
+                                label="Include advisory name and link"
                                 id="reportParameters.includeAdvisory"
                                 isChecked={formik.values.reportParameters.includeAdvisory}
                                 onChange={onChange}
diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportReviewForm.tsx b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportReviewForm.tsx
index 9a24d4d13e897..dff5237e7bed1 100644
--- a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportReviewForm.tsx
+++ b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportReviewForm.tsx
@@ -1,29 +1,14 @@
 import React, { ReactElement } from 'react';
 
 import { ReportFormValues } from 'Containers/Vulnerabilities/VulnerablityReporting/forms/useReportFormValues';
-import {
-    Card,
-    CardBody,
-    CardTitle,
-    Divider,
-    Flex,
-    FlexItem,
-    PageSection,
-    Text,
-    TextContent,
-    TextVariants,
-    Title,
-} from '@patternfly/react-core';
-import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
+import { Divider, Flex, FlexItem, PageSection, Title } from '@patternfly/react-core';
 
 import { TemplatePreviewArgs } from 'Components/EmailTemplate/EmailTemplateModal';
-import VulnerabilitySeverityIconText from 'Components/PatternFly/IconText/VulnerabilitySeverityIconText';
 import NotifierConfigurationView from 'Components/NotifierConfiguration/NotifierConfigurationView';
 
 import EmailTemplatePreview from '../components/EmailTemplatePreview';
 import ReportParametersDetails from '../components/ReportParametersDetails';
 import ScheduleDetails from '../components/ScheduleDetails';
-import exampleReportsCSVData from '../exampleReportsCSVData';
 import { defaultEmailBody, getDefaultEmailSubject } from './emailTemplateFormUtils';
 
 export type ReportReviewFormParams = {
@@ -74,90 +59,6 @@ function ReportReviewForm({ title, formValues }: ReportReviewFormParams): ReactE
                 />
                 <Divider component="div" className="pf-v5-u-py-md" />
                 <ScheduleDetails formValues={formValues} />
-                <Divider component="div" className="pf-v5-u-py-md" />
-                <Card>
-                    <CardTitle>CVE report format</CardTitle>
-                    <CardBody>
-                        <TextContent>
-                            <Text component={TextVariants.p}>
-                                A sample preview to illustrate the selected parameters in a format
-                                of CSV with nonactual data.
-                            </Text>
-                            <Text component={TextVariants.p} className="pf-v5-u-font-weight-bold">
-                                Sara-reporting.csv
-                            </Text>
-                            <Text component={TextVariants.small}>
-                                The data available in the preview is limited by the access scope of
-                                your role
-                            </Text>
-                        </TextContent>
-                        <div className="overflow-x-auto">
-                            <Table>
-                                <Thead noWrap>
-                                    <Tr>
-                                        <Th>Cluster</Th>
-                                        <Th>Namespace</Th>
-                                        <Th>Deployment</Th>
-                                        <Th>Image</Th>
-                                        <Th>Component</Th>
-                                        <Th>CVE</Th>
-                                        <Th>Fixable</Th>
-                                        <Th>Component Upgrade</Th>
-                                        <Th>Severity</Th>
-                                        <Th>CVSS</Th>
-                                        <Th>Discovered At</Th>
-                                        <Th>Reference</Th>
-                                    </Tr>
-                                </Thead>
-                                <Tbody>
-                                    {exampleReportsCSVData.map(
-                                        ({
-                                            cluster,
-                                            namespace,
-                                            deployment,
-                                            image,
-                                            component,
-                                            cve,
-                                            fixable,
-                                            componentUpgrade,
-                                            severity,
-                                            cvss,
-                                            discoveredAt,
-                                            reference,
-                                        }) => {
-                                            return (
-                                                <Tr
-                                                    key={`${cluster}/${namespace}/${deployment}/${image}/${component}/${cve}`}
-                                                >
-                                                    <Td dataLabel="Cluster">{cluster}</Td>
-                                                    <Td dataLabel="Namespace">{namespace}</Td>
-                                                    <Td dataLabel="Deployment">{deployment}</Td>
-                                                    <Td dataLabel="Image">{image}</Td>
-                                                    <Td dataLabel="Component">{component}</Td>
-                                                    <Td dataLabel="CVE">{cve}</Td>
-                                                    <Td dataLabel="Fixable">{fixable}</Td>
-                                                    <Td dataLabel="Component Upgrade">
-                                                        {componentUpgrade}
-                                                    </Td>
-                                                    <Td dataLabel="Severity">
-                                                        <VulnerabilitySeverityIconText
-                                                            severity={severity}
-                                                        />
-                                                    </Td>
-                                                    <Td dataLabel="CVSS">{cvss}</Td>
-                                                    <Td dataLabel="Discovered At">
-                                                        {discoveredAt}
-                                                    </Td>
-                                                    <Td dataLabel="Reference">{reference}</Td>
-                                                </Tr>
-                                            );
-                                        }
-                                    )}
-                                </Tbody>
-                            </Table>
-                        </div>
-                    </CardBody>
-                </Card>
             </PageSection>
         </>
     );