Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 11 additions & 6 deletions client/src/app/components/SeverityShieldAndText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@ import type { ExtendedSeverity } from "@app/api/models";

interface SeverityShieldAndTextProps {
value: ExtendedSeverity;
hideLabel?: boolean;
score: number | null;
showScore?: boolean;
showLabel?: boolean;
}

export const SeverityShieldAndText: React.FC<SeverityShieldAndTextProps> = ({
value,
hideLabel,
score,
showScore,
showLabel,
}) => {
const severityProps = severityList[value];
const label = severityProps.name;
Expand All @@ -26,15 +30,16 @@ export const SeverityShieldAndText: React.FC<SeverityShieldAndTextProps> = ({
style={{ whiteSpace: "nowrap" }}
>
<FlexItem>
{hideLabel ? (
{showLabel ? (
<ShieldIcon color={severityProps.color.value} />
) : (
<Tooltip content={label}>
<ShieldIcon color={severityProps.color.value} />
</Tooltip>
) : (
<ShieldIcon color={severityProps.color.value} />
)}
</FlexItem>
{!hideLabel && <FlexItem>{label}</FlexItem>}
{showLabel && <FlexItem>{label}</FlexItem>}
{showScore && score !== null && <FlexItem>({score})</FlexItem>}
</Flex>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,19 @@ const areVulnerabilityOfPackageEqual = (
};

interface FlatVulnerabilityOfPackage {
vulnerability: VulnerabilityHead & { average_severity: ExtendedSeverity };
vulnerability: VulnerabilityHead & {
average_severity: ExtendedSeverity;
average_score: number;
};
vulnerabilityStatus: VulnerabilityStatus;
advisory: PurlAdvisory;
}

interface VulnerabilityOfPackage {
vulnerability: VulnerabilityHead & { average_severity: ExtendedSeverity };
vulnerability: VulnerabilityHead & {
average_severity: ExtendedSeverity;
average_score: number;
};
vulnerabilityStatus: VulnerabilityStatus;
relatedSboms: {
advisory: PurlAdvisory;
Expand Down Expand Up @@ -70,6 +76,7 @@ const advisoryToModels = (advisories: PurlAdvisory[]) => {
vulnerability: {
...pkgStatus.vulnerability,
average_severity: extendedSeverity,
average_score: pkgStatus.average_score,
},
vulnerabilityStatus: pkgStatus.status as VulnerabilityStatus,
advisory: advisory,
Expand Down
3 changes: 3 additions & 0 deletions client/src/app/pages/advisory-details/overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export const Overview: React.FC<InfoProps> = ({ advisory }) => {
value={extendedSeverityFromSeverity(
advisory.average_severity as Severity,
)}
score={advisory.average_score}
showLabel
showScore
/>
</DescriptionListDescription>
</DescriptionListGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,12 @@ export const VulnerabilitiesByAdvisory: React.FC<
{...getTdProps({ columnKey: "score" })}
>
{item.severity && (
<SeverityShieldAndText value={item.severity} />
<SeverityShieldAndText
value={item.severity}
score={item.score}
showLabel
showScore
/>
)}
</Td>
<Td
Expand Down
3 changes: 3 additions & 0 deletions client/src/app/pages/advisory-list/advisory-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ export const AdvisoryTable: React.FC = () => {
{item.average_severity && (
<SeverityShieldAndText
value={item.average_severity as Severity}
score={item.average_score}
showLabel
showScore
/>
)}
</Td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ export const VulnerabilitiesByPackage: React.FC<
{item.vulnerability?.average_severity && (
<SeverityShieldAndText
value={item.vulnerability.average_severity}
score={item.vulnerability.average_score}
showLabel
showScore
/>
)}
</Td>
Expand Down
3 changes: 3 additions & 0 deletions client/src/app/pages/sbom-details/vulnerabilities-by-sbom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ export const VulnerabilitiesBySbom: React.FC<VulnerabilitiesBySbomProps> = ({
value={extendedSeverityFromSeverity(
item.vulnerability.average_severity,
)}
score={item.vulnerability.average_score}
showLabel
showScore
/>
</Td>
<Td
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ export const AdvisoriesByVulnerability: React.FC<
<Td width={10} {...getTdProps({ columnKey: "severity" })}>
<SeverityShieldAndText
value={extendedSeverityFromSeverity(item.severity)}
score={item.score}
showLabel
showScore
/>
</Td>
<Td
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ export const VulnerabilityDetails: React.FC = () => {
value={extendedSeverityFromSeverity(
vulnerability.average_severity,
)}
score={vulnerability.average_score}
showLabel
showScore
/>
)}
</FlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ export const VulnerabilityTable: React.FC = () => {
value={extendedSeverityFromSeverity(
item.average_severity,
)}
score={item.average_score}
showLabel
showScore
/>
</Td>
<Td width={10} {...getTdProps({ columnKey: "published" })}>
Expand Down
Loading