Merge branch 'feat/resource-scan-v2' into demo/resource-browser

Author: vivek-devtron

src/Common/SegmentedBarChart/SegmentedBarChart.tsx

@@ -24,8 +24,12 @@ const SegmentedBarChart: React.FC<SegmentedBarChartProps> = ({
                 {entities?.map((entity) => (
                     <div className="flexbox dc__gap-4 dc__align-items-center">
                         <div className="dot" style={{ backgroundColor: entity.color, width: '10px', height: '10px' }} />
-                        <span className={countClassName}>{entity.value}</span>
-                        <span className={labelClassName}>{entity.label}</span>
+                        <span className={countClassName} data-testid={`segmented-bar-chart-${entity.label}-value`}>
+                            {entity.value}
+                        </span>
+                        <span className={labelClassName} data-testid={`segmented-bar-chart-${entity.label}-label`}>
+                            {entity.label}
+                        </span>
                     </div>
                 ))}
             </div>

src/Shared/Components/ScannedByToolModal/ScannedByToolModal.tsx

@@ -1,25 +1,30 @@
+import React from 'react'
 import { IMAGE_SCAN_TOOL, SCAN_TOOL_ID_TRIVY } from '../../constants'
 import { ScannedByToolModalProps } from './types'
 import { ReactComponent as ICClair } from '../../../Assets/Icon/ic-clair.svg'
 import { ReactComponent as ICTrivy } from '../../../Assets/Icon/ic-trivy.svg'
 
-const ScannedByToolModal = ({ scanToolId }: ScannedByToolModalProps) => {
+const ScannedByToolModal: React.FC<ScannedByToolModalProps> = ({
+    scanToolId,
+    fontSize = 13,
+    spacingBetweenTextAndIcon = 6,
+}) => {
     const isTrivy = scanToolId === SCAN_TOOL_ID_TRIVY
 
     return (
-        <>
-            <span className="dc__italic-font-style fs-13">
+        <div className="flexbox" style={{ gap: `${spacingBetweenTextAndIcon}px` }}>
+            <span className={`dc__italic-font-style fs-${fontSize}`}>
                 Scanned by
                 <span className="fw-6 ml-4" data-testid="scanned-by-tool">
                     {isTrivy ? IMAGE_SCAN_TOOL.Trivy : IMAGE_SCAN_TOOL.Clair}
                 </span>
             </span>
             {isTrivy ? (
-                <ICTrivy className="h-20 w-20 ml-6 dc__no-shrink" />
+                <ICTrivy className="icon-dim-20 dc__no-shrink" />
             ) : (
-                <ICClair className="h-20 w-20 ml-6 dc__no-shrink" />
+                <ICClair className="icon-dim-20 dc__no-shrink" />
             )}
-        </>
+        </div>
     )
 }
 

src/Shared/Components/ScannedByToolModal/types.ts

@@ -1,3 +1,5 @@
 export interface ScannedByToolModalProps {
     scanToolId?: number
+    fontSize?: number
+    spacingBetweenTextAndIcon?: number
 }