feat: create connstant for security config

arunjaindev · arunjaindev · commit 89c774965ac7 · 2025-01-08T18:09:23.000+05:30
diff --git a/src/Shared/Components/Security/SecurityDetailsCards/SecurityDetailsCards.tsx b/src/Shared/Components/Security/SecurityDetailsCards/SecurityDetailsCards.tsx
@@ -36,7 +36,7 @@ const SecurityDetailsCards = ({ scanResult, Sidebar }: SecurityDetailsCardsProps
         }
     }
 
-    const handleCardClick = (
+    const handleOpenModal = (
         category: SecurityCardProps['category'],
         subCategory: SecurityCardProps['subCategory'],
     ) => {
@@ -48,17 +48,18 @@ const SecurityDetailsCards = ({ scanResult, Sidebar }: SecurityDetailsCardsProps
         })
     }
 
+    const handleCardClick =
+        (category: SecurityCardProps['category'], subCategory: SecurityCardProps['subCategory']) => () =>
+            handleOpenModal(category, subCategory)
+
     const handleModalClose = () => {
         setShowSecurityModal(false)
     }
 
     return (
         <>
             <div className="flexbox-col dc__gap-20">
-                {Object.values(CATEGORIES).map((category: ScanCategories) => {
-                    if (!SECURITY_CONFIG[category]) {
-                        return null
-                    }
+                {Object.keys(SECURITY_CONFIG).map((category: ScanCategories) => {
                     const scanToolId = getScanToolId(category)
                     return (
                         <div className="flexbox-col dc__gap-12" key={category}>
@@ -78,7 +79,7 @@ const SecurityDetailsCards = ({ scanResult, Sidebar }: SecurityDetailsCardsProps
                                             category={category}
                                             subCategory={subCategory}
                                             severityCount={severityCount}
-                                            handleCardClick={() => handleCardClick(category, subCategory)}
+                                            handleCardClick={handleCardClick(category, subCategory)}
                                         />
                                     )
                                 })}
diff --git a/src/Shared/Components/Security/Vulnerabilities/Vulnerabilities.tsx b/src/Shared/Components/Security/Vulnerabilities/Vulnerabilities.tsx
@@ -55,29 +55,29 @@ const Vulnerabilities = ({
         )
     }
 
-    if (!isScanEnabled || !scanResultResponse?.result?.isImageScanEnabled) {
+    if (scanResultError) {
         return (
             <div className="security-tab-empty">
-                <p className="security-tab-empty__title">Scan is Disabled</p>
+                <p className="security-tab-empty__title">Failed to fetch vulnerabilities</p>
+                <button className="cta secondary" type="button" onClick={reloadScanResult}>
+                    Reload
+                </button>
             </div>
         )
     }
 
-    if (!isScanned || (scanResultResponse && !scanResultResponse.result.scanned)) {
+    if (!isScanEnabled || !scanResultResponse.result?.isImageScanEnabled) {
         return (
             <div className="security-tab-empty">
-                <p className="security-tab-empty__title">Image was not scanned</p>
+                <p className="security-tab-empty__title">Scan is Disabled</p>
             </div>
         )
     }
 
-    if (scanResultError) {
+    if (!isScanned || !scanResultResponse.result?.scanned) {
         return (
             <div className="security-tab-empty">
-                <p className="security-tab-empty__title">Failed to fetch vulnerabilities</p>
-                <button className="cta secondary" type="button" onClick={reloadScanResult}>
-                    Reload
-                </button>
+                <p className="security-tab-empty__title">Image was not scanned</p>
             </div>
         )
     }
diff --git a/src/Shared/Components/Security/constants.tsx b/src/Shared/Components/Security/constants.tsx
@@ -0,0 +1,23 @@
+import { CATEGORY_LABELS } from './SecurityModal'
+import { CATEGORIES, SUB_CATEGORIES } from './SecurityModal/types'
+import { SecurityConfigType } from './types'
+
+export const SECURITY_CONFIG: SecurityConfigType = {
+    [CATEGORIES.IMAGE_SCAN]: {
+        label: CATEGORY_LABELS.IMAGE_SCAN,
+        subCategories: [SUB_CATEGORIES.VULNERABILITIES, SUB_CATEGORIES.LICENSE],
+    },
+    [CATEGORIES.CODE_SCAN]: {
+        label: CATEGORY_LABELS.CODE_SCAN,
+        subCategories: [
+            SUB_CATEGORIES.VULNERABILITIES,
+            SUB_CATEGORIES.LICENSE,
+            SUB_CATEGORIES.MISCONFIGURATIONS,
+            SUB_CATEGORIES.EXPOSED_SECRETS,
+        ],
+    },
+    [CATEGORIES.KUBERNETES_MANIFEST]: {
+        label: CATEGORY_LABELS.KUBERNETES_MANIFEST,
+        subCategories: [SUB_CATEGORIES.MISCONFIGURATIONS, SUB_CATEGORIES.EXPOSED_SECRETS],
+    },
+}
diff --git a/src/Shared/Components/Security/types.tsx b/src/Shared/Components/Security/types.tsx
@@ -14,7 +14,7 @@ interface SecurityConfigCategoryType {
     subCategories: ScanSubCategories[]
 }
 
-export interface GetSecurityConfigReturnType {
+export interface SecurityConfigType {
     imageScan?: SecurityConfigCategoryType
     codeScan?: SecurityConfigCategoryType
     kubernetesManifest?: SecurityConfigCategoryType
diff --git a/src/Shared/Components/Security/utils.tsx b/src/Shared/Components/Security/utils.tsx
@@ -1,6 +1,7 @@
-import { CATEGORY_LABELS, ScanResultDTO, SeveritiesDTO } from './SecurityModal'
+import { SECURITY_CONFIG } from './constants'
+import { ScanResultDTO, SeveritiesDTO } from './SecurityModal'
 import { CATEGORIES, SUB_CATEGORIES } from './SecurityModal/types'
-import { CategoriesConfig, GetSecurityConfigReturnType, ScanCategories, ScanSubCategories } from './types'
+import { CategoriesConfig, SecurityConfigType, ScanCategories, ScanSubCategories } from './types'
 
 export const getCVEUrlFromCVEName = (cveName: string): string =>
     `https://cve.mitre.org/cgi-bin/cvename.cgi?name=${cveName}`
@@ -10,48 +11,34 @@ export const getTotalSeverities = (severityCount: Partial<Record<SeveritiesDTO,
         .filter(([key]) => key !== SeveritiesDTO.SUCCESSES)
         .reduce((acc, [, value]) => acc + value, 0)
 
-export const getSecurityConfig = (categoriesConfig: CategoriesConfig): GetSecurityConfigReturnType => {
-    const { imageScan, codeScan, kubernetesManifest } = categoriesConfig
-
-    return {
-        ...(imageScan && {
-            [CATEGORIES.IMAGE_SCAN]: {
-                label: CATEGORY_LABELS.IMAGE_SCAN,
-                subCategories: [SUB_CATEGORIES.VULNERABILITIES, SUB_CATEGORIES.LICENSE],
-            },
-        }),
-        ...(codeScan && {
-            [CATEGORIES.CODE_SCAN]: {
-                label: CATEGORY_LABELS.CODE_SCAN,
-                subCategories: [
-                    SUB_CATEGORIES.VULNERABILITIES,
-                    SUB_CATEGORIES.LICENSE,
-                    SUB_CATEGORIES.MISCONFIGURATIONS,
-                    SUB_CATEGORIES.EXPOSED_SECRETS,
-                ],
-            },
-        }),
-        ...(kubernetesManifest && {
-            [CATEGORIES.KUBERNETES_MANIFEST]: {
-                label: CATEGORY_LABELS.KUBERNETES_MANIFEST,
-                subCategories: [SUB_CATEGORIES.MISCONFIGURATIONS, SUB_CATEGORIES.EXPOSED_SECRETS],
-            },
-        }),
-    }
-}
+export const getSecurityConfig = ({
+    imageScan,
+    codeScan,
+    kubernetesManifest,
+}: CategoriesConfig): SecurityConfigType => ({
+    ...(imageScan && {
+        [CATEGORIES.IMAGE_SCAN]: SECURITY_CONFIG.imageScan,
+    }),
+    ...(codeScan && {
+        [CATEGORIES.CODE_SCAN]: SECURITY_CONFIG.codeScan,
+    }),
+    ...(kubernetesManifest && {
+        [CATEGORIES.KUBERNETES_MANIFEST]: SECURITY_CONFIG.kubernetesManifest,
+    }),
+})
 
 export const getSecurityThreatsArray = (scanResult: ScanResultDTO): Partial<Record<SeveritiesDTO, number>>[] => {
     const { imageScan, codeScan, kubernetesManifest } = scanResult
-    const SECURITY_CONFIG = getSecurityConfig({
+    const DYNAMIC_SECURITY_CONFIG = getSecurityConfig({
         imageScan: !!imageScan,
         codeScan: !!codeScan,
         kubernetesManifest: !!kubernetesManifest,
     })
 
     const threatsArray: Partial<Record<SeveritiesDTO, number>>[] = []
 
-    Object.keys(SECURITY_CONFIG).forEach((category: ScanCategories) => {
-        SECURITY_CONFIG[category].subCategories.forEach((subCategory: ScanSubCategories) => {
+    Object.keys(DYNAMIC_SECURITY_CONFIG).forEach((category: ScanCategories) => {
+        DYNAMIC_SECURITY_CONFIG[category].subCategories.forEach((subCategory: ScanSubCategories) => {
             const severity =
                 subCategory === SUB_CATEGORIES.MISCONFIGURATIONS
                     ? scanResult[category][subCategory]?.misConfSummary?.status

Original file line number	Diff line number	Diff line change
`@@ -55,29 +55,29 @@ const Vulnerabilities = ({`
`55`	`55`	`)`
`56`	`56`	`}`
`57`	`57`
`58`		`- if (!isScanEnabled \|\| !scanResultResponse?.result?.isImageScanEnabled) {`
	`58`	`+ if (scanResultError) {`
`59`	`59`	`return (`
`60`	`60`	`<div className="security-tab-empty">`
`61`		`- <p className="security-tab-empty__title">Scan is Disabled</p>`
	`61`	`+ <p className="security-tab-empty__title">Failed to fetch vulnerabilities</p>`
	`62`	`+ <button className="cta secondary" type="button" onClick={reloadScanResult}>`
	`63`	`+ Reload`
	`64`	`+ </button>`
`62`	`65`	`</div>`
`63`	`66`	`)`
`64`	`67`	`}`
`65`	`68`
`66`		`- if (!isScanned \|\| (scanResultResponse && !scanResultResponse.result.scanned)) {`
	`69`	`+ if (!isScanEnabled \|\| !scanResultResponse.result?.isImageScanEnabled) {`
`67`	`70`	`return (`
`68`	`71`	`<div className="security-tab-empty">`
`69`		`- <p className="security-tab-empty__title">Image was not scanned</p>`
	`72`	`+ <p className="security-tab-empty__title">Scan is Disabled</p>`
`70`	`73`	`</div>`
`71`	`74`	`)`
`72`	`75`	`}`
`73`	`76`
`74`		`- if (scanResultError) {`
	`77`	`+ if (!isScanned \|\| !scanResultResponse.result?.scanned) {`
`75`	`78`	`return (`
`76`	`79`	`<div className="security-tab-empty">`
`77`		`- <p className="security-tab-empty__title">Failed to fetch vulnerabilities</p>`
`78`		`- <button className="cta secondary" type="button" onClick={reloadScanResult}>`
`79`		`- Reload`
`80`		`- </button>`
	`80`	`+ <p className="security-tab-empty__title">Image was not scanned</p>`
`81`	`81`	`</div>`
`82`	`82`	`)`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ interface SecurityConfigCategoryType {`
`14`	`14`	`subCategories: ScanSubCategories[]`
`15`	`15`	`}`
`16`	`16`
`17`		`-export interface GetSecurityConfigReturnType {`
	`17`	`+export interface SecurityConfigType {`
`18`	`18`	`imageScan?: SecurityConfigCategoryType`
`19`	`19`	`codeScan?: SecurityConfigCategoryType`
`20`	`20`	`kubernetesManifest?: SecurityConfigCategoryType`