feat: remove env id prop from image accordion

Author: arunjaindev

src/Shared/Components/ImageCardAccordion/ImageCardAccordion.tsx

@@ -44,7 +44,6 @@ const ImageCardAccordion = ({
     isSecurityModuleInstalled,
     artifactId,
     applicationId,
-    environmentId,
     changesCard,
     isScanned,
     isScanEnabled,
@@ -74,7 +73,6 @@ const ImageCardAccordion = ({
                 isScanEnabled={isScanEnabled}
                 artifactId={artifactId}
                 applicationId={applicationId}
-                environmentId={environmentId}
                 setVulnerabilityCount={setVulnerabilityCount}
                 SecurityModalSidebar={SecurityModalSidebar}
                 getSecurityScan={getSecurityScan}

src/Shared/Components/ImageCardAccordion/types.ts

@@ -23,7 +23,6 @@ export interface ImageCardAccordionProps extends MaterialSecurityInfoType {
     isSecurityModuleInstalled: boolean
     artifactId: number
     applicationId: number
-    environmentId: number
     changesCard: ReactNode
     isScanned: boolean
     isScanEnabled: boolean

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

@@ -30,7 +30,6 @@ const Vulnerabilities = ({
     isScanEnabled,
     artifactId,
     applicationId,
-    environmentId,
     setVulnerabilityCount,
     SecurityModalSidebar,
     getSecurityScan,
@@ -39,7 +38,6 @@ const Vulnerabilities = ({
     const { scanDetailsLoading, scanResultResponse, executionDetailsResponse, scanDetailsError, reloadScanDetails } =
         useGetSecurityVulnerabilities({
             appId: String(applicationId),
-            envId: String(environmentId),
             artifactId: String(artifactId),
             isScanEnabled,
             isScanned,

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

@@ -18,16 +18,14 @@ import { ROUTES, get, getUrlWithSearchParams } from '../../../../Common'
 import { LastExecutionResponseType } from '../../../types'
 import { parseLastExecutionResponse } from './utils'
 
-export function getLastExecutionByArtifactAppEnv(
+export function getLastExecutionByArtifactApp(
     artifactId: string | number,
     appId: number | string,
-    envId: number | string,
 ): Promise<LastExecutionResponseType> {
     return get(
         getUrlWithSearchParams(ROUTES.SECURITY_SCAN_EXECUTION_DETAILS, {
             artifactId,
             appId,
-            envId,
         }),
     ).then((response) => parseLastExecutionResponse(response))
 }

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

@@ -18,21 +18,19 @@ import { ResponseType } from '@Common/Types'
 import { ImageCardAccordionProps } from '@Shared/Components/ImageCardAccordion/types'
 import { MaterialSecurityInfoType } from '../../../types'
 import { ApiResponseResultType } from '../SecurityModal'
-import { getLastExecutionByArtifactAppEnv } from './service'
+import { getLastExecutionByArtifactApp } from './service'
 
 export interface VulnerabilitiesProps
     extends MaterialSecurityInfoType,
         Pick<ImageCardAccordionProps, 'SecurityModalSidebar' | 'getSecurityScan'> {
     artifactId: number
     applicationId: number
-    environmentId: number
     setVulnerabilityCount: React.Dispatch<React.SetStateAction<number>>
 }
 
 export interface UseGetSecurityVulnerabilitiesProps extends Pick<ImageCardAccordionProps, 'getSecurityScan'> {
     artifactId: string
     appId: string
-    envId: string
     isScanned: boolean
     isScanEnabled: boolean
     isScanV2Enabled: boolean
@@ -41,7 +39,7 @@ export interface UseGetSecurityVulnerabilitiesProps extends Pick<ImageCardAccord
 export interface UseGetSecurityVulnerabilitiesReturnType {
     scanDetailsLoading: boolean
     scanResultResponse: ResponseType<ApiResponseResultType>
-    executionDetailsResponse: Awaited<ReturnType<typeof getLastExecutionByArtifactAppEnv>>
+    executionDetailsResponse: Awaited<ReturnType<typeof getLastExecutionByArtifactApp>>
     scanDetailsError: any
     reloadScanDetails: () => void
 }

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

@@ -19,7 +19,7 @@ import { numberComparatorBySortOrder } from '@Shared/Helpers'
 import { DATE_TIME_FORMAT_STRING } from '../../../constants'
 import { SortingOrder, useAsync, VULNERABILITIES_SORT_PRIORITY, ZERO_TIME_STRING } from '../../../../Common'
 import { LastExecutionResponseType, LastExecutionResultType } from '../../../types'
-import { getLastExecutionByArtifactAppEnv } from './service'
+import { getLastExecutionByArtifactApp } from './service'
 import { UseGetSecurityVulnerabilitiesProps, UseGetSecurityVulnerabilitiesReturnType } from './types'
 
 export const getSortedVulnerabilities = (vulnerabilities) =>
@@ -67,14 +67,13 @@ export const parseLastExecutionResponse = (response): LastExecutionResponseType
 export const useGetSecurityVulnerabilities = ({
     artifactId,
     appId,
-    envId,
     isScanned,
     isScanEnabled,
     isScanV2Enabled,
     getSecurityScan,
 }: UseGetSecurityVulnerabilitiesProps): UseGetSecurityVulnerabilitiesReturnType => {
     const [executionDetailsLoading, executionDetailsResponse, executionDetailsError, reloadExecutionDetails] = useAsync(
-        () => getLastExecutionByArtifactAppEnv(artifactId, appId, envId),
+        () => getLastExecutionByArtifactApp(artifactId, appId),
         [],
         isScanned && isScanEnabled && !isScanV2Enabled,
         {
@@ -83,7 +82,7 @@ export const useGetSecurityVulnerabilities = ({
     )
 
     const [scanResultLoading, scanResultResponse, scanResultError, reloadScanResult] = useAsync(
-        () => getSecurityScan({ artifactId, appId, envId }),
+        () => getSecurityScan({ artifactId, appId }),
         [],
         isScanned && isScanEnabled && isScanV2Enabled && !!getSecurityScan,
         {