feat: add support for artifactId in execution details in security summary card

Author: arunjaindev

src/components/app/details/appDetails/AppSecurity.tsx

@@ -25,6 +25,7 @@ export const useGetAppSecurityDetails = ({
     appId,
     envId,
     installedAppId,
+    artifactId,
     imageScanDeployInfoId,
     isSecurityScanV2Enabled,
 }: UseGetAppSecurityDetailsProps): UseGetAppSecurityDetailsReturnType => {
@@ -35,7 +36,7 @@ export const useGetAppSecurityDetails = ({
     )
 
     const [executionDetailsLoading, executionDetailsResponse, executionDetailsError, reloadExecutionDetails] = useAsync(
-        () => getExecutionDetails({ appId, envId, imageScanDeployInfoId }),
+        () => getExecutionDetails({ appId, artifactId, imageScanDeployInfoId }),
         [appId, envId, imageScanDeployInfoId],
         !isSecurityScanV2Enabled && !!appId,
     )

src/components/app/details/appDetails/SecurityVulnerabilityCard.tsx

@@ -38,6 +38,7 @@ export const SecurityVulnerabilityCard = ({
     appId,
     envId,
     installedAppId,
+    artifactId,
     isExternalCI,
 }: SecurityVulnerabilityCardType) => {
     const [showScanDetailsModal, setShowScanDetailsModal] = useState<boolean>(false)
@@ -46,7 +47,7 @@ export const SecurityVulnerabilityCard = ({
     const handleModalClose = () => setShowScanDetailsModal(false)
 
     const { scanDetailsLoading, scanDetailsResponse, scanDetailsError, reloadScanDetails, severityCount } =
-        useGetAppSecurityDetails({ appId: +appId, envId: +envId, installedAppId, isSecurityScanV2Enabled })
+        useGetAppSecurityDetails({ appId: +appId, envId: +envId, installedAppId, artifactId, isSecurityScanV2Enabled })
 
     // Since we get status in v2 Api only
     const imageScanFailed: boolean = isSecurityScanV2Enabled && scanDetailsResponse?.result.codeScan.status === 'Failed'

src/components/app/details/appDetails/SourceInfo.tsx

@@ -68,7 +68,6 @@ export const SourceInfo = ({
     filteredEnvIds,
     deploymentUserActionState,
 }: SourceInfoType) => {
-    const [showVulnerabilitiesCard, setShowVulnerabilitiesCard] = useState<boolean>(false)
     const isdeploymentAppDeleting = appDetails?.deploymentAppDeleteRequest || false
     const isArgoCdApp = appDetails?.deploymentAppType === DeploymentAppTypes.GITOPS
     const status = appDetails?.resourceTree?.status || ''
@@ -92,24 +91,6 @@ export const SourceInfo = ({
         message = Rollout[0].health.message
     }
 
-    const getScannedStatus = async () => {
-        const { appId, ciArtifactId } = appDetails
-        try {
-            const {
-                result: { scanEnabled, scanned },
-            } = await getLastExecutionByAppArtifactId(ciArtifactId, appId)
-            if (scanEnabled && scanned) {
-                // If scanEnabled and scanned is true, then show the vulnerabilities card
-                setShowVulnerabilitiesCard(true)
-            } else {
-                setShowVulnerabilitiesCard(false)
-            }
-        } catch (error) {
-            setShowVulnerabilitiesCard(false)
-            showError(error)
-        }
-    }
-
     useEffect(() => {
         if (appDetails?.ciArtifactId && appDetails?.appId) {
             getScannedStatus()
@@ -328,13 +309,12 @@ export const SourceInfo = ({
                                   filteredEnvIds={filteredEnvIds}
                               />
                           )}
-                          {!appDetails?.deploymentAppDeleteRequest &&
-                              !helmMigratedAppNotTriggered &&
-                              (showVulnerabilitiesCard || window._env_.ENABLE_RESOURCE_SCAN_V2) && (
+                          {!appDetails?.deploymentAppDeleteRequest && !helmMigratedAppNotTriggered && (
                               <SecurityVulnerabilityCard
                                   cardLoading={cardLoading}
                                   appId={params.appId}
                                   envId={params.envId}
+                                  ciArtifactId={ciArtifactId}
                                   isExternalCI={isExternalCI}
                               />
                           )}

src/components/app/details/appDetails/appDetails.type.ts

@@ -234,6 +234,7 @@ export interface SecurityVulnerabilityCardType {
     appId?: string
     envId?: string
     installedAppId?: number
+    artifactId?: number
     isExternalCI?: boolean
 }
 
@@ -268,6 +269,7 @@ export interface UseGetAppSecurityDetailsProps {
     appId: number
     envId: number
     installedAppId?: number
+    artifactId?: number
     imageScanDeployInfoId?: number
     isSecurityScanV2Enabled: boolean
 }