diff --git a/frontend/interfaces/errors.ts b/frontend/interfaces/errors.ts index e24585b2d5..dae6fc4f07 100644 --- a/frontend/interfaces/errors.ts +++ b/frontend/interfaces/errors.ts @@ -204,9 +204,11 @@ export const getErrorReason = ( return ""; }; -export const ignoreAxiosError = (err: Error, ignoreStatuses: number[]) => { - if (!isAxiosError(err)) { - return false; - } - return !!err.response && ignoreStatuses.includes(err.response.status); +export const ignoreAxiosError = (err: AxiosError, ignoreStatuses: number[]) => { + // TODO - isAxiosError currently not recognizing axios error, fix + // if (!isAxiosError(err)) { + // return false; + // } + // return !!err.response && ignoreStatuses.includes(err.response.status); + return !!err.status && ignoreStatuses.includes(err.status); }; diff --git a/frontend/pages/SoftwarePage/SoftwareOSDetailsPage/SoftwareOSDetailsPage.tsx b/frontend/pages/SoftwarePage/SoftwareOSDetailsPage/SoftwareOSDetailsPage.tsx index ce6739cc0b..37a299bf0b 100644 --- a/frontend/pages/SoftwarePage/SoftwareOSDetailsPage/SoftwareOSDetailsPage.tsx +++ b/frontend/pages/SoftwarePage/SoftwareOSDetailsPage/SoftwareOSDetailsPage.tsx @@ -17,7 +17,7 @@ import osVersionsAPI, { IGetOsVersionQueryKey, } from "services/entities/operating_systems"; import { IOperatingSystemVersion } from "interfaces/operating_system"; -import { SUPPORT_LINK } from "utilities/constants"; +import { DEFAULT_USE_QUERY_OPTIONS, SUPPORT_LINK } from "utilities/constants"; import Spinner from "components/Spinner"; import MainContent from "components/MainContent"; @@ -102,6 +102,8 @@ const SoftwareOSDetailsPage = ({ ], ({ queryKey }) => osVersionsAPI.getOSVersion(queryKey[0]), { + ...DEFAULT_USE_QUERY_OPTIONS, + retry: false, enabled: !!osVersionIdFromURL, select: (data) => data.os_version, onError: (error) => { diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx index 8efee4faa3..007352f382 100644 --- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx +++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx @@ -17,6 +17,8 @@ import softwareAPI, { IGetSoftwareTitleQueryKey, } from "services/entities/software"; +import { DEFAULT_USE_QUERY_OPTIONS } from "utilities/constants"; + import Spinner from "components/Spinner"; import MainContent from "components/MainContent"; import TeamsHeader from "components/TeamsHeader"; @@ -74,7 +76,8 @@ const SoftwareTitleDetailsPage = ({ [{ scope: "softwareById", softwareId, teamId: teamIdForApi }], ({ queryKey }) => softwareAPI.getSoftwareTitle(queryKey[0]), { - refetchOnWindowFocus: false, + ...DEFAULT_USE_QUERY_OPTIONS, + retry: false, select: (data) => data.software_title, onError: (error) => { if (!ignoreAxiosError(error, [403, 404])) { diff --git a/frontend/pages/SoftwarePage/SoftwareVersionDetailsPage/SoftwareVersionDetailsPage.tsx b/frontend/pages/SoftwarePage/SoftwareVersionDetailsPage/SoftwareVersionDetailsPage.tsx index 678c3bfa70..861a13ea95 100644 --- a/frontend/pages/SoftwarePage/SoftwareVersionDetailsPage/SoftwareVersionDetailsPage.tsx +++ b/frontend/pages/SoftwarePage/SoftwareVersionDetailsPage/SoftwareVersionDetailsPage.tsx @@ -21,6 +21,8 @@ import hostsCountAPI, { import { ISoftwareVersion, formatSoftwareType } from "interfaces/software"; import { ignoreAxiosError } from "interfaces/errors"; +import { DEFAULT_USE_QUERY_OPTIONS } from "utilities/constants"; + import Spinner from "components/Spinner"; import MainContent from "components/MainContent"; import TeamsHeader from "components/TeamsHeader"; @@ -77,7 +79,8 @@ const SoftwareVersionDetailsPage = ({ [{ scope: "softwareVersion", versionId, teamId: teamIdForApi }], ({ queryKey }) => softwareAPI.getSoftwareVersion(queryKey[0]), { - refetchOnWindowFocus: false, + ...DEFAULT_USE_QUERY_OPTIONS, + retry: false, select: (data) => data.software, onError: (error) => { if (!ignoreAxiosError(error, [403, 404])) { diff --git a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/SoftwareVulnSummary.tsx b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/SoftwareVulnSummary.tsx index 916690f7d7..5a3c58b6fb 100644 --- a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/SoftwareVulnSummary.tsx +++ b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/SoftwareVulnSummary.tsx @@ -58,7 +58,11 @@ const SoftwareVulnSummary = ({ {cvss_score && ( + Severity } @@ -70,6 +74,7 @@ const SoftwareVulnSummary = ({ title={ Probability of exploit @@ -79,6 +84,7 @@ const SoftwareVulnSummary = ({ } diff --git a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/_styles.scss b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/_styles.scss index 0475f8b22c..7710542666 100644 --- a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/_styles.scss +++ b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnSummary/_styles.scss @@ -25,6 +25,7 @@ &__description { font-size: $x-small; + line-height: 21px; } &__description-list { @@ -42,5 +43,9 @@ top: 0; } } + + .tooltip__tooltip-text { + white-space: pre-wrap; + } } } diff --git a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx index 4b1da187d0..4a243b46be 100644 --- a/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx +++ b/frontend/pages/SoftwarePage/SoftwareVulnerabilityDetailsPage/SoftwareVulnerabilityDetailsPage.tsx @@ -16,6 +16,8 @@ import softwareVulnAPI, { } from "services/entities/vulnerabilities"; import { ignoreAxiosError } from "interfaces/errors"; +import { DEFAULT_USE_QUERY_OPTIONS } from "utilities/constants"; + import Spinner from "components/Spinner"; import MainContent from "components/MainContent"; import TeamsHeader from "components/TeamsHeader"; @@ -78,6 +80,8 @@ const SoftwareVulnerabilityDetailsPage = ({ return softwareVulnAPI.getVulnerability(queryKey[0]); }, { + ...DEFAULT_USE_QUERY_OPTIONS, + retry: false, onError: (error) => { if (!ignoreAxiosError(error, [403, 404])) { handlePageError(error); @@ -121,7 +125,7 @@ const SoftwareVulnerabilityDetailsPage = ({ ); const renderContent = () => { - if (isVulnLoading || !vuln) { + if (isVulnLoading) { return ; } return ( @@ -134,7 +138,7 @@ const SoftwareVulnerabilityDetailsPage = ({ onTeamChange={onTeamChange} /> )} - {isVulnError ? ( + {isVulnError || !vuln ? (