Merge pull request #2858 from devtron-labs/chore/modal-outside-click

feat: show namespace count for virtual clusters

Author: arunjaindev

package.json

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

src/Pages/GlobalConfigurations/ClustersAndEnvironments/EnvironmentList.tsx

@@ -34,7 +34,7 @@ import {
     EnvListSortableKeys,
     EnvNamespaceRowType,
 } from './cluster.type'
-import { environmentNameComparator, getSelectParsedCategory } from './cluster.util'
+import { environmentNameComparator, getNamespaceCount, getSelectParsedCategory } from './cluster.util'
 import { ClusterEnvironmentDrawer } from './ClusterEnvironmentDrawer'
 import { ClusterActions, ClusterEnvLoader, ClusterIconWithStatus } from './ClusterList.components'
 import { ADD_ENVIRONMENT_FORM_LOCAL_STORAGE_KEY } from './constants'
@@ -290,7 +290,18 @@ const ClustersEnvironmentsList = ({
                         <span className="dc__ellipsis-right">({environments.length} Environments)</span>
                     </div>
                 </Tooltip>
-                {showUnmappedEnvs ? <span>{(namespaceListResult?.result ?? []).length} Namespaces</span> : <span />}
+                {showUnmappedEnvs ? (
+                    <span>
+                        {getNamespaceCount({
+                            isVirtualCluster,
+                            envList: environments,
+                            namespaceList: namespaceListResult?.result,
+                        })}
+                        &nbsp;Namespaces
+                    </span>
+                ) : (
+                    <span />
+                )}
                 <span>{isProd ? 'Production' : 'Non Production'}</span>
                 {category?.label ? <span>{category.label}</span> : <span />}
                 <div className="flex right">

src/Pages/GlobalConfigurations/ClustersAndEnvironments/cluster.util.tsx

@@ -33,6 +33,7 @@ import {
     ClusterEnvFilterKeys,
     ClusterTerminalParamsType,
     emptyClusterTerminalParamsData,
+    Environment,
 } from './cluster.type'
 import { ADD_CLUSTER_FORM_LOCAL_STORAGE_KEY, ADD_ENVIRONMENT_FORM_LOCAL_STORAGE_KEY } from './constants'
 
@@ -169,3 +170,13 @@ export const getBulletColorAccToStatus = (status: ClusterStatusType) => {
             return 'bcr-5'
     }
 }
+
+export const getNamespaceCount = ({
+    isVirtualCluster,
+    envList,
+    namespaceList,
+}: {
+    isVirtualCluster: boolean
+    envList: Environment[]
+    namespaceList: string[]
+}) => (isVirtualCluster ? (envList ?? []).filter(({ namespace }) => !!namespace).length : (namespaceList ?? []).length)

src/components/ApplicationGroup/Details/TriggerView/BulkCITrigger.tsx

@@ -807,7 +807,7 @@ const BulkCITrigger = ({
 
     return (
         <Drawer position="right" width="75%" minWidth="1024px" maxWidth="1200px" onClose={closeBulkCIModal} >
-            <div className="bg__primary bulk-ci-trigger-container">
+            <div className="bg__primary bulk-ci-trigger-container" onClick={stopPropagation}>
                 <div className="flexbox-col flex-grow-1 dc__overflow-hidden">
                     {renderHeaderSection()}
                     {responseListLength ? (

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-2":
-  version: 1.18.1-pre-2
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-2"
+"@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-3":
+  version: 1.18.1-pre-3
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-3"
   dependencies:
     "@codemirror/autocomplete": "npm:6.18.6"
     "@codemirror/lang-json": "npm:6.0.1"
@@ -1774,7 +1774,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/8ca5cd044c4554b6eb320979b8736baccbdc87f4e55a26d45a3c7bffb61cedfa4cdc78fa7434c909d885a389fd9f0598abdf7f6411ac0d53a421a304fa5c2c6c
+  checksum: 10c0/4840d247eb16864917a42aaf8bae5388faf41136c2fa2cc0a303cb19980e5a7f7ced5312716d824c88281f25e2bac446cea1715305b62782986ccf13510f7491
   languageName: node
   linkType: hard
 
@@ -5721,7 +5721,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.18.1-pre-2"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.18.1-pre-3"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"