feat: add fallback in execution details api

Author: arunjaindev

src/Shared/Components/ImageCardAccordion/ImageCardAccordion.tsx

@@ -48,7 +48,6 @@ const ImageCardAccordion = ({
     changesCard,
     isScanned,
     isScanEnabled,
-    isScanV2Enabled,
     SecurityModalSidebar,
     getSecurityScan,
 }: ImageCardAccordionProps) => {
@@ -77,7 +76,6 @@ const ImageCardAccordion = ({
                 applicationId={applicationId}
                 environmentId={environmentId}
                 setVulnerabilityCount={setVulnerabilityCount}
-                isScanV2Enabled={isScanV2Enabled}
                 SecurityModalSidebar={SecurityModalSidebar}
                 getSecurityScan={getSecurityScan}
             />

src/Shared/Components/ImageCardAccordion/types.ts

@@ -27,9 +27,12 @@ export interface ImageCardAccordionProps extends MaterialSecurityInfoType {
     changesCard: ReactNode
     isScanned: boolean
     isScanEnabled: boolean
-    isScanV2Enabled: boolean
     SecurityModalSidebar: React.FC<SidebarPropsType>
-    getSecurityScan: ({ appId, envId, artifactId }: AppDetailsPayload) => Promise<ResponseType<ApiResponseResultType>>
+    getSecurityScan: ({
+        appId,
+        envId,
+        artifactId,
+    }: Pick<AppDetailsPayload, 'appId' | 'envId' | 'artifactId'>) => Promise<ResponseType<ApiResponseResultType>>
 }
 
 export interface SecurityDetailsType {

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

@@ -19,14 +19,15 @@ export const getExecutionDetails = async (
         scanExecutionId: response.result.ScanExecutionId,
         lastExecution: response.result.executionTime,
         objectType: response.result.objectType,
-        vulnerabilities: response.result.vulnerabilities?.map((cve) => ({
-            name: cve.cveName,
-            severity: cve.severity,
-            package: cve.package,
-            version: cve.currentVersion,
-            fixedVersion: cve.fixedVersion,
-            policy: cve.permission,
-        })),
+        vulnerabilities:
+            response.result?.vulnerabilities?.map((cve) => ({
+                name: cve.cveName,
+                severity: cve.severity,
+                package: cve.package,
+                version: cve.currentVersion,
+                fixedVersion: cve.fixedVersion,
+                policy: cve.permission,
+            })) || [],
     }
     return { ...response, result: parseExecutionDetailResponse(parsedResult) }
 }

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

@@ -6,6 +6,7 @@ import React from 'react'
 import { GenericEmptyStateType } from '@Common/Types'
 import { LastExecutionResultType, NodeType, Nodes } from '@Shared/types'
 import { SegmentedBarChartProps } from '@Common/SegmentedBarChart'
+import { ServerErrors } from '@Common/ServerError'
 
 export interface GetResourceScanDetailsPayloadType {
     name: string
@@ -248,7 +249,7 @@ export type ApiResponseResultType = {
 
 interface SecurityModalBaseProps extends Partial<Pick<SidebarPropsType, 'isExternalCI'>> {
     isLoading: boolean
-    error: any
+    error: ServerErrors
     responseData: ApiResponseResultType
     handleModalClose: (event?: React.MouseEvent<HTMLElement>) => void
     Sidebar: React.FC<SidebarPropsType>

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

@@ -32,10 +32,10 @@ const Vulnerabilities = ({
     applicationId,
     environmentId,
     setVulnerabilityCount,
-    isScanV2Enabled,
     SecurityModalSidebar,
     getSecurityScan,
 }: VulnerabilitiesProps) => {
+    const isScanV2Enabled = window._env_.ENABLE_RESOURCE_SCAN_V2
     const { scanDetailsLoading, scanResultResponse, executionDetailsResponse, scanDetailsError, reloadScanDetails } =
         useGetSecurityVulnerabilities({
             appId: String(applicationId),

src/Shared/Components/Security/Vulnerabilities/types.ts

@@ -27,7 +27,6 @@ export interface VulnerabilitiesProps
     applicationId: number
     environmentId: number
     setVulnerabilityCount: React.Dispatch<React.SetStateAction<number>>
-    isScanV2Enabled: boolean
 }
 
 export interface UseGetSecurityVulnerabilitiesProps extends Pick<ImageCardAccordionProps, 'getSecurityScan'> {

src/Shared/Components/Security/Vulnerabilities/utils.ts

@@ -85,7 +85,7 @@ export const useGetSecurityVulnerabilities = ({
     const [scanResultLoading, scanResultResponse, scanResultError, reloadScanResult] = useAsync(
         () => getSecurityScan({ artifactId, appId, envId }),
         [],
-        isScanned && isScanEnabled && isScanV2Enabled,
+        isScanned && isScanEnabled && isScanV2Enabled && !!getSecurityScan,
         {
             resetOnChange: false,
         },