Skip to content

ROX-29513: Replace CSV report preview with Non-optional columns #15467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrottimark merged 1 commit into from
May 28, 2025
Merged

ROX-29513: Replace CSV report preview with Non-optional columns #15467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions ...c/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
63 changes: 0 additions & 63 deletions ...ps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...tform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
101 changes: 1 addition & 100 deletions .../platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportReviewForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -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>
</>
);
Expand Down
Loading