diff --git a/frontend/pages/SoftwarePage/SoftwareVulnerabilities/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx b/frontend/pages/SoftwarePage/SoftwareVulnerabilities/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx index 2db7a244f7..e2c3391c6e 100644 --- a/frontend/pages/SoftwarePage/SoftwareVulnerabilities/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx +++ b/frontend/pages/SoftwarePage/SoftwareVulnerabilities/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx @@ -172,7 +172,7 @@ const SoftwareVulnerabilitiesTable = ({ const handleRowSelect = (row: IRowProps) => { const hostsByVulnerabilityParams = { - cve: row.original.cve, + vulnerability: row.original.cve, team_id: teamId, }; diff --git a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx index 6aed06e47d..ad5210da02 100644 --- a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx +++ b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx @@ -29,7 +29,7 @@ import DetailsNoHosts from "../components/DetailsNoHosts"; const baseClass = "software-vulnerability-details-page"; interface ISoftwareVulnerabilityDetailsRouteParams { - cve: string; + vulnerability: string; team_id?: string; } @@ -71,7 +71,7 @@ const SoftwareVulnerabilityDetailsPage = ({ [ { scope: "softwareVulnByCVE", - cve: routeParams.cve, + vulnerability: routeParams.vulnerability, teamId: teamIdForApi, }, ], diff --git a/frontend/pages/SoftwarePage/components/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx b/frontend/pages/SoftwarePage/components/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx index bf7ac3e620..fa476791e8 100644 --- a/frontend/pages/SoftwarePage/components/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx +++ b/frontend/pages/SoftwarePage/components/SoftwareVulnerabilitiesTable/SoftwareVulnerabilitiesTable.tsx @@ -74,7 +74,7 @@ const SoftwareVulnerabilitiesTable = ({ const handleRowSelect = (row: IRowProps) => { const hostsBySoftwareParams = { - cve: row.original.cve, + vulnerability: row.original.cve, team_id: teamIdForApi, }; diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx index 3191028036..a2941c56e1 100644 --- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx +++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx @@ -876,6 +876,7 @@ const ManageHostsPage = ({ osSettingsStatus, diskEncryptionStatus, bootstrapPackageStatus, + vulnerability, ] ); @@ -1664,6 +1665,7 @@ const ManageHostsPage = ({ osSettingsStatus, diskEncryptionStatus, bootstrapPackageStatus, + vulnerability, }} selectedLabel={selectedLabel} isOnlyObserver={isOnlyObserver} diff --git a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx index 5ce10e0125..eb6be49e42 100644 --- a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx +++ b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx @@ -208,16 +208,10 @@ const HostsFilterBlock = ({ const renderVulnerabilityFilterBlock = () => { if (!vulnerability) return null; - // TODO: Move formatOperatingSystemDisplayName into utils file - const label = formatOperatingSystemDisplayName(vulnerability); - const TooltipDescription = ( - Hosts affected by the specified CVE. - ); - return ( Hosts affected by the specified CVE.} onClear={() => handleClearFilter(["vulnerability"])} /> ); @@ -479,7 +473,8 @@ const HostsFilterBlock = ({ munkiIssueId || osSettingsStatus || diskEncryptionStatus || - bootstrapPackageStatus + bootstrapPackageStatus || + vulnerability ) { const renderFilterPill = () => { switch (true) { diff --git a/frontend/services/entities/vulnerabilities.ts b/frontend/services/entities/vulnerabilities.ts index b8cf358666..c3900e9bb3 100644 --- a/frontend/services/entities/vulnerabilities.ts +++ b/frontend/services/entities/vulnerabilities.ts @@ -20,7 +20,7 @@ export interface IGetVulnerabilitiesQueryKey } interface IGetVulnerabilityOptions { - cve: string; + vulnerability: string; teamId?: number; } @@ -70,10 +70,10 @@ export const getVulnerabilities = ({ }; const getVulnerability = ({ - cve, + vulnerability, teamId, }: IGetVulnerabilityOptions): Promise => { - const endpoint = endpoints.VULNERABILITY(cve); + const endpoint = endpoints.VULNERABILITY(vulnerability); const path = teamId ? `${endpoint}?team_id=${teamId}` : endpoint; return sendRequest("GET", path);