Merge branch 'main' of github.com:devtron-labs/dashboard into develop

Author: Elessar1802

package.json

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

src/assets/icons/ic-close.svg

@@ -260,12 +260,12 @@ export default function EnvironmentOverview({
     }
 
     const openHibernateModalPopup = () => {
-        setIsDeploymentLoading(true)
+        setIsDeploymentLoading(!!processDeploymentWindowAppGroupOverviewMap)
         setOpenedHibernateModalType(MODAL_TYPE.HIBERNATE)
     }
 
     const openUnHibernateModalPopup = () => {
-        setIsDeploymentLoading(true)
+        setIsDeploymentLoading(!!processDeploymentWindowAppGroupOverviewMap)
         setOpenedHibernateModalType(MODAL_TYPE.UNHIBERNATE)
     }
 

src/components/ApplicationGroup/Details/EnvironmentOverview/EnvironmentOverview.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/ClusterNodes/ClusterOverview.tsx

@@ -759,7 +759,7 @@ node-details-full-screen
         ]
 
         return (
-            <div className="mr-16">
+            <div>
                 <TabGroup tabs={tabs} size={ComponentSizeType.medium} />
             </div>
         )
@@ -861,14 +861,34 @@ node-details-full-screen
 
     const fullScreenClassWrapper = isFullScreen ? 'cluster-full_screen' : 'cluster-terminal-view-container'
 
+    const getNodeGroupOptions = () => {
+        const nodeGroupOptions = nodeGroups.reduce((acc, group) => {
+            if (group.label) {
+                acc.push({
+                    label: group.label,
+                    options: group.options,
+                })
+            } else {
+                const options = group.options.map((option) => ({
+                    label: option.label,
+                    value: option.value,
+                }))
+                acc.push(...options) // Flatten the array into the accumulator
+            }
+            return acc
+        }, [])
+
+        return nodeGroupOptions
+    }
+
     const selectionListData: TerminalSelectionListDataType = {
         firstRow: [
             {
                 type: TerminalWrapperType.REACT_SELECT,
                 classNamePrefix: 'cluster-terminal-node',
                 title: SELECT_TITLE.NODE,
                 placeholder: 'Select node',
-                options: nodeGroups,
+                options: getNodeGroupOptions(),
                 defaultValue: selectedNodeName,
                 value: selectedNodeName,
                 onChange: onChangeNodes,

src/components/ClusterNodes/ClusterTerminal.tsx

@@ -133,6 +133,10 @@ export default function NodeDetailsList({ isSuperAdmin, renderRefreshBar, addTab
         const qs = queryString.parse(location.search)
         const offset = Number(qs['offset'])
         setNodeListOffset(offset || 0)
+        const version = qs['k8sversion']
+        if (version && typeof version === 'string' && selectedVersion.value !== version) {
+            setSelectedVersion({ label: `K8s version: ${version}`, value: version })
+        }
     }, [location.search])
 
     useEffect(() => {

src/components/ClusterNodes/NodeDetailsList.tsx

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

src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.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/AppSecurity.tsx

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

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

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