feat: add sorting in useGetResourceKindsOptions

Author: eshankvaish

package-lock.json

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

package.json

@@ -5,48 +5,70 @@ import { ClusterType } from '@Shared/Services'
 import { EnvironmentType, EnvListMinDTO } from '@Shared/types'
 import { EnvironmentTypeEnum } from '@Shared/constants'
 import { ROUTES } from '@Common/Constants'
+import { stringComparatorBySortOrder } from '@Shared/Helpers'
 import { AppsGroupedByProjectsType, ClusterDTO } from './types'
 
 export const getAppOptionsGroupedByProjects = async (): Promise<AppsGroupedByProjectsType> => {
     const { result } = (await get('app/min')) as ResponseType<AppsGroupedByProjectsType>
 
-    return result ?? []
+    if (!result) {
+        return []
+    }
+
+    return result
+        .map((project) => ({
+            ...project,
+            appList: project.appList.sort((a, b) => stringComparatorBySortOrder(a.name, b.name)),
+        }))
+        .sort((a, b) => stringComparatorBySortOrder(a.projectName, b.projectName))
 }
 
 export const getProjectOptions = async (): Promise<Pick<Teams, 'id' | 'name'>[]> => {
     const { result } = await getTeamListMin()
 
-    return (
-        result?.map(({ id, name }) => ({
+    if (!result) {
+        return []
+    }
+
+    return result
+        .map(({ id, name }) => ({
             id,
             name,
-        })) ?? []
-    )
+        }))
+        .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
 }
 
 export const getClusterOptions = async (): Promise<ClusterType[]> => {
     const { result } = (await get('cluster/autocomplete')) as ResponseType<ClusterDTO[]>
 
-    return (
-        result?.map((cluster) => ({
+    if (!result) {
+        return []
+    }
+
+    return result
+        .map((cluster) => ({
             id: cluster.id,
             name: cluster.cluster_name,
             isVirtual: cluster.isVirtualCluster ?? false,
-        })) ?? []
-    )
+        }))
+        .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
 }
 
 export const getEnvironmentOptions = async (): Promise<EnvironmentType[]> => {
     const { result } = (await get(ROUTES.ENVIRONMENT_LIST_MIN)) as ResponseType<EnvListMinDTO[]>
 
-    return (
-        result?.map((environment) => ({
+    if (!result) {
+        return []
+    }
+
+    return result
+        .map((environment) => ({
             id: environment.id,
             name: environment.environment_name,
             isVirtual: environment.isVirtualEnvironment ?? false,
             cluster: environment.cluster_name,
             environmentType: environment.default ? EnvironmentTypeEnum.production : EnvironmentTypeEnum.nonProduction,
             namespace: environment.namespace,
-        })) ?? []
-    )
+        }))
+        .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
 }