Merge pull request #374 from devtron-labs/fix/plugin-policy-uat

fix: group env options by cluster

Author: eshankvaish

package-lock.json

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

package.json

@@ -18,11 +18,11 @@ import { ResponseType, Teams } from '@Common/Types'
 import { getTeamListMin } from '@Common/Common.service'
 import { get } from '@Common/Api'
 import { ClusterType } from '@Shared/Services'
-import { EnvironmentType, EnvListMinDTO } from '@Shared/types'
+import { EnvListMinDTO } from '@Shared/types'
 import { EnvironmentTypeEnum } from '@Shared/constants'
 import { ROUTES } from '@Common/Constants'
 import { stringComparatorBySortOrder } from '@Shared/Helpers'
-import { AppsGroupedByProjectsType, ClusterDTO } from './types'
+import { AppsGroupedByProjectsType, ClusterDTO, EnvironmentsGroupedByClustersType } from './types'
 
 export const getAppOptionsGroupedByProjects = async (): Promise<AppsGroupedByProjectsType> => {
     const { result } = (await get(ROUTES.APP_LIST_MIN)) as ResponseType<AppsGroupedByProjectsType>
@@ -70,30 +70,47 @@ export const getClusterOptions = async (): Promise<ClusterType[]> => {
         .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
 }
 
-export const getEnvironmentOptions = async (): Promise<EnvironmentType[]> => {
+export const getEnvironmentOptionsGroupedByClusters = async (): Promise<EnvironmentsGroupedByClustersType> => {
     const { result } = (await get(ROUTES.ENVIRONMENT_LIST_MIN)) as ResponseType<EnvListMinDTO[]>
 
     if (!result) {
         return []
     }
 
-    return result
-        .map(
-            ({
-                id,
-                environment_name: name,
-                isVirtualEnvironment,
-                cluster_name: cluster,
-                default: isDefault,
-                namespace,
-            }) => ({
-                id,
-                name,
-                isVirtual: isVirtualEnvironment ?? false,
-                cluster,
-                environmentType: isDefault ? EnvironmentTypeEnum.production : EnvironmentTypeEnum.nonProduction,
-                namespace,
-            }),
-        )
-        .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
+    const sortedEnvList = result.map(
+        ({
+            id,
+            environment_name: name,
+            isVirtualEnvironment,
+            cluster_name: cluster,
+            default: isDefault,
+            namespace,
+        }) => ({
+            id,
+            name,
+            isVirtual: isVirtualEnvironment ?? false,
+            cluster,
+            environmentType: isDefault ? EnvironmentTypeEnum.production : EnvironmentTypeEnum.nonProduction,
+            namespace,
+        }),
+    )
+
+    const envGroupedByCluster = Object.values(
+        sortedEnvList.reduce<
+            Record<EnvironmentsGroupedByClustersType[number]['clusterName'], EnvironmentsGroupedByClustersType[number]>
+        >((acc, env) => {
+            if (!acc[env.cluster]) {
+                acc[env.cluster] = {
+                    clusterName: env.cluster,
+                    envList: [],
+                }
+            }
+
+            acc[env.cluster].envList.push(env)
+
+            return acc
+        }, {}),
+    ).sort((a, b) => stringComparatorBySortOrder(a.clusterName, b.clusterName))
+
+    return envGroupedByCluster
 }

src/Shared/Hooks/useGetResourceKindsOptions/service.ts

@@ -16,9 +16,9 @@
 
 // ====== Service Types: Start ====== //
 
-import { ResourceKindType } from '@Shared/types'
+import { EnvironmentType, ResourceKindType } from '@Shared/types'
 import { ServerErrors } from '@Common/ServerError'
-import { getAppOptionsGroupedByProjects, getClusterOptions, getEnvironmentOptions, getProjectOptions } from './service'
+import { getAppOptionsGroupedByProjects, getClusterOptions, getProjectOptions } from './service'
 
 export interface AppType {
     name: string
@@ -30,6 +30,11 @@ export type AppsGroupedByProjectsType = {
     appList: AppType[]
 }[]
 
+export type EnvironmentsGroupedByClustersType = {
+    clusterName: EnvironmentType['cluster']
+    envList: EnvironmentType[]
+}[]
+
 export interface ClusterDTO {
     id: number
     cluster_name: string
@@ -54,7 +59,7 @@ export interface UseGetResourceKindOptionsReturnType {
         [ResourceKindType.devtronApplication]: Awaited<ReturnType<typeof getAppOptionsGroupedByProjects>>
         [ResourceKindType.project]: Awaited<ReturnType<typeof getProjectOptions>>
         [ResourceKindType.cluster]: Awaited<ReturnType<typeof getClusterOptions>>
-        [ResourceKindType.environment]: Awaited<ReturnType<typeof getEnvironmentOptions>>
+        [ResourceKindType.environment]: EnvironmentsGroupedByClustersType
     }
     resourcesOptionsError: ServerErrors
     refetchResourcesOptions: () => void

src/Shared/Hooks/useGetResourceKindsOptions/types.ts

@@ -17,7 +17,12 @@
 import { useMemo } from 'react'
 import { ResourceKindType } from '@Shared/types'
 import { useAsync } from '@Common/Helper'
-import { getAppOptionsGroupedByProjects, getClusterOptions, getEnvironmentOptions, getProjectOptions } from './service'
+import {
+    getAppOptionsGroupedByProjects,
+    getClusterOptions,
+    getEnvironmentOptionsGroupedByClusters,
+    getProjectOptions,
+} from './service'
 import { UseGetResourceKindOptionsReturnType, UseGetResourceKindsOptionsProps } from './types'
 import { getResourcesToFetchMap } from './utils'
 
@@ -43,7 +48,7 @@ const useGetResourceKindsOptions = ({
                 resourcesToFetchMap[ResourceKindType.devtronApplication] ? getAppOptionsGroupedByProjects() : null,
                 resourcesToFetchMap[ResourceKindType.project] ? getProjectOptions() : null,
                 resourcesToFetchMap[ResourceKindType.cluster] ? getClusterOptions() : null,
-                resourcesToFetchMap[ResourceKindType.environment] ? getEnvironmentOptions() : null,
+                resourcesToFetchMap[ResourceKindType.environment] ? getEnvironmentOptionsGroupedByClusters() : null,
             ]),
         [resourcesToFetchMap],
         resourcesToFetch.length > 0,