Skip to content

Commit 8e55295

Browse files
Arun JainArun Jain
authored andcommitted
chore: update loading
1 parent 1349f9b commit 8e55295

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

src/Shared/Components/Security/SecurityModal/service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { getTotalVulnerabilityCount, parseExecutionDetailResponse, parseGetResou
1818
export const getExecutionDetails = async (
1919
executionDetailPayload: SecurityModalPropsType['executionDetailsPayload'],
2020
): Promise<ResponseType<ApiResponseResultType>> => {
21-
// To replace url with constants in common
2221
const url = getUrlWithSearchParams(ROUTES.SECURITY_SCAN_EXECUTION_DETAILS, executionDetailPayload)
2322
const response = await get(url)
2423
return { ...response, result: parseExecutionDetailResponse(response.result) }

src/Shared/Components/Security/Vulnerabilities/Vulnerabilities.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,38 +53,38 @@ const Vulnerabilities = ({
5353

5454
useEffect(() => {
5555
if (scanResultResponse && isScanV2Enabled) {
56-
setVulnerabilityCount(scanResultResponse?.result?.imageScan?.vulnerability?.list?.length)
56+
setVulnerabilityCount(scanResultResponse.result.imageScan.vulnerability?.list?.length)
5757
return
5858
}
5959
if (vulnerabilitiesResponse && !isScanV2Enabled) {
6060
setVulnerabilityCount(vulnerabilitiesResponse.result.vulnerabilities?.length)
6161
}
6262
}, [vulnerabilitiesResponse, scanResultResponse])
6363

64-
if (
65-
!isScanned ||
66-
(vulnerabilitiesResponse && !vulnerabilitiesResponse.result.scanned) ||
67-
(scanResultResponse && !scanResultResponse?.result.scanned)
68-
) {
64+
if (!isScanEnabled) {
6965
return (
7066
<div className="security-tab-empty">
71-
<p className="security-tab-empty__title">Image was not scanned</p>
67+
<p className="security-tab-empty__title">Scan is Disabled</p>
7268
</div>
7369
)
7470
}
7571

76-
if (!isScanEnabled) {
72+
if (areVulnerabilitiesLoading || scanResultLoading) {
7773
return (
7874
<div className="security-tab-empty">
79-
<p className="security-tab-empty__title">Scan is Disabled</p>
75+
<Progressing />
8076
</div>
8177
)
8278
}
8379

84-
if (areVulnerabilitiesLoading || scanResultLoading) {
80+
if (
81+
!isScanned ||
82+
(vulnerabilitiesResponse && !vulnerabilitiesResponse.result.scanned) ||
83+
(scanResultResponse && !scanResultResponse?.result.scanned)
84+
) {
8585
return (
8686
<div className="security-tab-empty">
87-
<Progressing />
87+
<p className="security-tab-empty__title">Image was not scanned</p>
8888
</div>
8989
)
9090
}
@@ -113,7 +113,7 @@ const Vulnerabilities = ({
113113
low: imageScanSeverities?.LOW || 0,
114114
unknown: imageScanSeverities?.UNKNOWN || 0,
115115
}
116-
: vulnerabilitiesResponse?.result.severityCount
116+
: vulnerabilitiesResponse.result.severityCount
117117

118118
const totalCount =
119119
severityCount.critical + severityCount.high + severityCount.low + severityCount.medium + severityCount.unknown
@@ -129,9 +129,9 @@ const Vulnerabilities = ({
129129
{vulnerabilitiesResponse?.result.lastExecution ??
130130
scanResultResponse?.result.imageScan.vulnerability.list[0].StartedOn}
131131
</p>
132-
<p className="pt-8 pb-8 pl-16 pr-16 flexbox dc__align-items-center">
132+
<div className="pt-8 pb-8 pl-16 pr-16 flexbox dc__align-items-center">
133133
<ScannedByToolModal scanToolId={vulnerabilitiesResponse?.result.scanToolId ?? SCAN_TOOL_ID_TRIVY} />
134-
</p>
134+
</div>
135135
</div>
136136
)
137137
}

0 commit comments

Comments
 (0)