Merge pull request #449 from devtron-labs/feat/image-card-security

feat: remove envId from params for scan v2 in image card

Author: arunjaindev

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.2.10",
+    "version": "1.2.11",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -29,7 +29,7 @@ export interface ImageCardAccordionProps extends MaterialSecurityInfoType {
     isScanEnabled: boolean
     SecurityModalSidebar: React.FC<SidebarPropsType>
     getSecurityScan: (
-        props: Pick<AppDetailsPayload, 'appId' | 'envId' | 'artifactId'>,
+        props: Pick<AppDetailsPayload, 'appId' | 'artifactId'>,
     ) => Promise<ResponseType<ApiResponseResultType>>
 }
 

src/Shared/Components/ImageCardAccordion/types.ts

@@ -12,8 +12,10 @@ import {
     stopPropagation,
     VisibleModal2,
 } from '@Common/index'
-import { ReactComponent as ICClose } from '@Icons/ic-close.svg'
+import { ReactComponent as ICClose } from '@Icons/ic-cross.svg'
 import { ReactComponent as ICBack } from '@Icons/ic-caret-left-small.svg'
+import { Button, ButtonStyleType, ButtonVariantType } from '@Shared/Components/Button'
+import { ComponentSizeType } from '@Shared/constants'
 import { Table, InfoCard } from './components'
 import { DEFAULT_SECURITY_MODAL_STATE } from './constants'
 import { getTableData, getInfoCardData } from './config'
@@ -64,16 +66,16 @@ const SecurityModal: React.FC<SecurityModalPropsType> = ({
     const renderHeader = () => (
         <div className="flexbox dc__content-space dc__align-items-center pl-20 pr-20 pt-12 pb-12 dc__border-bottom">
             <span className="fs-16 fw-6 lh-24 cn-9">Security</span>
-            <button
-                type="button"
-                className="dc__unset-button-styles"
+            <Button
+                dataTestId="close-security-modal"
+                ariaLabel="close-security-modal"
+                icon={<ICClose />}
                 onClick={handleModalClose}
-                aria-label="Close Modal"
-            >
-                <div className="flex p-4">
-                    <ICClose className="icon-dim-16" />
-                </div>
-            </button>
+                showAriaLabelInTippy={false}
+                size={ComponentSizeType.xs}
+                style={ButtonStyleType.neutral}
+                variant={ButtonVariantType.borderLess}
+            />
         </div>
     )
 

src/Shared/Components/Security/SecurityModal/SecurityModal.tsx

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