Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Host Details Page: Correct software vulnerabilities count (#6729)

Browse source
This commit is contained in:
RachelElysia 2022-07-19 11:43:04 -04:00 committed by GitHub
parent 82d395e239
commit da1868d6ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/bug-6708-soft-vuln-count Normal file
View file

@ -0,0 +1 @@
* Render correct software vulnerabilities count on host details page

35
frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx
View file

@ -5,7 +5,6 @@ import ReactTooltip from "react-tooltip";
import { formatDistanceToNow } from "date-fns";
import { ISoftware } from "interfaces/software";
import { IVulnerability } from "interfaces/vulnerability";
import PATHS from "router/paths";
import HeaderCell from "components/TableContainer/DataTable/HeaderCell/HeaderCell";
@ -90,15 +89,12 @@ const formatSoftwareType = (source: string) => {
return DICT[source] || "Unknown";
};
const condenseVulnerabilities = (vulns: IVulnerability[]): string[] => {
const condenseVulnerabilities = (vulns: string[]): string[] => {
const condensed =
(vulns?.length &&
vulns
.slice(-3)
.map((v) => v.cve)
.reverse()) ||
[];
return vulns?.length > 3
(vulns?.length && vulns.length === 4
? vulns.slice(-4).reverse()
: vulns.slice(-3).reverse()) || [];
return vulns?.length > 4
? condensed.concat(`+${vulns?.length - 3} more`)
: condensed;
};
@ -113,7 +109,7 @@ export const generateSoftwareTableData = (
return software.map((s) => {
return {
...s,
vulnerabilities: condenseVulnerabilities(s.vulnerabilities || []),
vulnerabilities: s.vulnerabilities?.map((v) => v.cve) || [],
};
});
};
@ -193,14 +189,17 @@ export const generateSoftwareTableHeaders = (
filter: "hasLength", // filters out rows where vulnerabilities has no length if filter value is `true`
Cell: (cellProps: IVulnCellProps): JSX.Element => {
const vulnerabilities = cellProps.cell.value || [];
const tooltipText = vulnerabilities?.map((value) => {
return (
<span key={`vuln_${value}`}>
{value}
<br />
</span>
);
});
const tooltipText = condenseVulnerabilities(vulnerabilities).map(
(value) => {
return (
<span key={`vuln_${value}`}>
{value}
<br />
</span>
);
}
);
if (!vulnerabilities?.length) {
return <span className="vulnerabilities text-muted">---</span>;