Merge pull request #2084 from devtron-labs/feat/security-policy

feat: add column for security policy in security modal

Author: arunjaindev

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.16",
+        "@devtron-labs/devtron-fe-common-lib": "0.3.17",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/components/ApplicationGroup/AppGroup.service.ts

@@ -197,7 +197,7 @@ export const getEnvAppList = (
     signal?: AbortSignal,
 ): Promise<EnvAppType> => {
     const options = signal ? { signal } : null
-    const { searchKey = '', cluster = [], offset = 0, pageSize = 20 } = filterConfig ?? {}
+    const { searchKey = '', cluster = [], offset, pageSize } = filterConfig ?? {}
     const params: GetEnvAppListParamsType = {
         envName: searchKey,
         clusterIds: cluster?.join(),

src/components/ClusterNodes/ClusterOverview.tsx

@@ -205,9 +205,11 @@ function ClusterOverview({ isSuperAdmin, selectedCluster }: ClusterOverviewProps
                         errorType: _nodeError,
                         filterText: clusterCapacityResponse.value.result.nodeErrors[_nodeError],
                     })
-                    setClusterErrorList(_errorList)
                 }
             }
+            if (_errorList.length > 0) {
+                setClusterErrorList(_errorList)
+            }
         } else {
             setErrorCode(clusterCapacityResponse.reason['code'])
         }
@@ -259,7 +261,7 @@ function ClusterOverview({ isSuperAdmin, selectedCluster }: ClusterOverviewProps
             return
         }
         return (
-            <div className="mb-16 dc__border br-4 pt-12">
+            <div className="mb-16 dc__border br-4 pt-12 bcn-0">
                 <div className="flexbox pointer mb-12 pl-16 pr-16">
                     <Error className="mt-2 mb-2 mr-8 icon-dim-20" />
                     <span className="fw-6 fs-13 cn-9 mr-16">

src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx

@@ -195,6 +195,7 @@ const ResourceBrowserActionMenu: React.FC<ResourceBrowserActionMenuType> = ({
                     isLoading={resourceScanLoading}
                     error={resourceScanError}
                     responseData={resourceScanResponse?.result}
+                    hidePolicy
                 />
             )}
         </>

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

@@ -36,8 +36,7 @@ export const useGetAppSecurityDetails = ({
     )
 
     const [executionDetailsLoading, executionDetailsResponse, executionDetailsError, reloadExecutionDetails] = useAsync(
-        () =>
-            getExecutionDetails(appId && artifactId ? { appId, artifactId } : { appId, envId, imageScanDeployInfoId }),
+        () => getExecutionDetails(artifactId ? { appId, envId, artifactId } : { appId, envId, imageScanDeployInfoId }),
         [appId, envId, imageScanDeployInfoId, artifactId],
         !isSecurityScanV2Enabled && !!appId,
     )

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

@@ -197,6 +197,7 @@ export const SecurityVulnerabilityCard = ({
                     isLoading={scanDetailsLoading}
                     error={scanDetailsError}
                     responseData={scanDetailsResponse?.result}
+                    hidePolicy
                 />
             )}
         </button>

src/components/app/details/cIDetails/CIDetails.tsx

@@ -744,6 +744,7 @@ const SecurityTab = ({ ciPipelineId, artifactId, status, appIdFromParent }: Secu
                 SecurityModalSidebar={SecurityModalSidebar}
                 isSecurityScanV2Enabled={isSecurityScanV2Enabled}
                 responseData={isSecurityScanV2Enabled ? scanResultResponse?.result : parseExecutionDetailResponse(executionDetailsResponse?.result)}
+                hidePolicy
             />
         </div>
     )

src/components/app/details/triggerView/cdMaterial.tsx

@@ -1577,6 +1577,7 @@ const CDMaterial = ({
                                 isSecurityModuleInstalled={state.isSecurityModuleInstalled}
                                 artifactId={+mat.id}
                                 applicationId={appId}
+                                environmentId={envId}
                                 changesCard={renderGitMaterialInfo(mat)}
                                 isScanned={mat.scanned}
                                 isScanEnabled={mat.scanEnabled}

src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx

@@ -221,6 +221,7 @@ const NodeDeleteComponent = ({ nodeDetails, appDetails, isDeploymentBlocked }: N
                     isLoading={resourceScanLoading}
                     error={resourceScanError}
                     responseData={resourceScanResponse?.result}
+                    hidePolicy
                 />
             )}
             {renderDeleteResourcePopup()}

src/components/v2/appDetails/sourceInfo/environmentStatus/EnvironmentStatus.component.tsx

@@ -202,7 +202,7 @@ const EnvironmentStatusComponent = ({
                     {renderLastUpdatedBlock()}
                     {renderChartUsedBlock()}
                     {renderUpgraderChartBlock()}
-                    {isScanV2Enabled && <SecurityVulnerabilityCard cardLoading={cardLoading} installedAppId={appDetails?.installedAppId} />}
+                    {isScanV2Enabled && appDetails?.appType === AppType.DEVTRON_HELM_CHART && <SecurityVulnerabilityCard cardLoading={cardLoading} installedAppId={appDetails?.installedAppId} />}
                 </div>
             )}
             {showAppStatusDetail && (