Merge pull request #887 from devtron-labs/feat/cmd-bar-chart-search

feat: cmd bar resource search

Author: AbhishekA1509

package-lock.json

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

package.json

@@ -20,10 +20,9 @@ import { ROUTES } from '@Common/Constants'
 import { ResponseType, Teams } from '@Common/Types'
 import { EnvironmentTypeEnum } from '@Shared/constants'
 import { stringComparatorBySortOrder } from '@Shared/Helpers'
-import { ClusterType } from '@Shared/Services'
 import { EnvListMinDTO } from '@Shared/types'
 
-import { AppsGroupedByProjectsType, ClusterDTO, EnvironmentsGroupedByClustersType } from './types'
+import { AppsGroupedByProjectsType, EnvironmentsGroupedByClustersType } from './types'
 
 export const getAppOptionsGroupedByProjects = async (): Promise<AppsGroupedByProjectsType> => {
     const { result } = (await get(ROUTES.APP_LIST_MIN)) as ResponseType<AppsGroupedByProjectsType>
@@ -55,23 +54,6 @@ export const getProjectOptions = async (): Promise<Pick<Teams, 'id' | 'name'>[]>
         .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
 }
 
-export const getClusterOptions = async (): Promise<ClusterType[]> => {
-    const { result } = (await get(ROUTES.CLUSTER_LIST_MIN)) as ResponseType<ClusterDTO[]>
-
-    if (!result) {
-        return []
-    }
-
-    return result
-        .map(({ id, cluster_name: name, isVirtualCluster, isProd }) => ({
-            id,
-            name,
-            isVirtual: isVirtualCluster ?? false,
-            isProd: isProd ?? false,
-        }))
-        .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
-}
-
 export const getEnvironmentOptionsGroupedByClusters = async (): Promise<EnvironmentsGroupedByClustersType> => {
     const { result } = (await get(ROUTES.ENVIRONMENT_LIST_MIN)) as ResponseType<EnvListMinDTO[]>
 

src/Shared/Hooks/useGetResourceKindsOptions/service.ts

@@ -17,9 +17,10 @@
 // ====== Service Types: Start ====== //
 
 import { ServerErrors } from '@Common/ServerError'
+import { getClusterOptions } from '@Shared/index'
 import { EnvironmentType, ResourceKindType } from '@Shared/types'
 
-import { getAppOptionsGroupedByProjects, getClusterOptions, getProjectOptions } from './service'
+import { getAppOptionsGroupedByProjects, getProjectOptions } from './service'
 
 export interface AppType {
     name: string
@@ -36,13 +37,6 @@ export type EnvironmentsGroupedByClustersType = {
     envList: EnvironmentType[]
 }[]
 
-export interface ClusterDTO {
-    id: number
-    cluster_name: string
-    isVirtualCluster: boolean
-    isProd: boolean
-}
-
 // ====== Service Types: End ====== //
 
 export interface UseGetResourceKindsOptionsProps {

src/Shared/Hooks/useGetResourceKindsOptions/types.ts

@@ -17,14 +17,10 @@
 import { useMemo } from 'react'
 
 import { useAsync } from '@Common/Helper'
+import { getClusterOptions } from '@Shared/index'
 import { ResourceKindType } from '@Shared/types'
 
-import {
-    getAppOptionsGroupedByProjects,
-    getClusterOptions,
-    getEnvironmentOptionsGroupedByClusters,
-    getProjectOptions,
-} from './service'
+import { getAppOptionsGroupedByProjects, getEnvironmentOptionsGroupedByClusters, getProjectOptions } from './service'
 import { UseGetResourceKindOptionsReturnType, UseGetResourceKindsOptionsProps } from './types'
 import { getResourcesToFetchMap } from './utils'
 

src/Shared/Hooks/useGetResourceKindsOptions/useGetResourceKindsOptions.tsx

@@ -122,6 +122,13 @@ export type CommandBarAdditionalItemsId =
     | 'app-management-flux-app-list'
     | 'app-management-argo-app-list'
     | `app-management-devtron-app-list-${number}`
+    | 'search-app-list-view'
+    | `chart-list-${number}`
+    | 'search-chart-list-view'
+    | `helm-app-list-${number}`
+    | 'search-helm-app-list-view'
+    | `cluster-list-${number}`
+    | 'search-cluster-list-view'
 
 export interface GetUserPreferencesParsedDTO {
     viewPermittedEnvOnly?: boolean

src/Shared/Hooks/useUserPreferences/types.ts

@@ -17,7 +17,7 @@
 import { AppConfigProps, GetTemplateAPIRouteType } from '@Pages/index'
 
 import { get, getUrlWithSearchParams, post, ROUTES } from '../../Common'
-import { getTemplateAPIRoute } from '..'
+import { ClusterMinDTO, ClusterType, getTemplateAPIRoute, stringComparatorBySortOrder } from '..'
 import { EnvironmentDataValuesDTO, GetPolicyApiUrlProps, GetResourceApiUrlProps } from './types'
 
 export const getResourceApiUrl = <T>({ baseUrl, kind, version, suffix, queryParams }: GetResourceApiUrlProps<T>) =>
@@ -40,3 +40,20 @@ export const saveCDPipeline = (request, { isTemplateView }: Required<Pick<AppCon
 }
 
 export const getEnvironmentData = () => get<EnvironmentDataValuesDTO>(ROUTES.ENVIRONMENT_DATA)
+
+export const getClusterOptions = async (): Promise<ClusterType[]> => {
+    const { result } = await get<ClusterMinDTO[]>(ROUTES.CLUSTER_LIST_MIN)
+
+    if (!result) {
+        return []
+    }
+
+    return result
+        .map(({ id, cluster_name: name, isVirtualCluster, isProd }) => ({
+            id,
+            name,
+            isVirtual: isVirtualCluster ?? false,
+            isProd: isProd ?? false,
+        }))
+        .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
+}

src/Shared/Services/common.service.ts

@@ -62,3 +62,10 @@ export interface EnvironmentDataValuesDTO extends Pick<MainContext, 'featureGitO
     devtronManagedLicensingEnabled: boolean
     isResourceRecommendationEnabled?: boolean
 }
+
+export interface ClusterMinDTO {
+    id: number
+    cluster_name: string
+    isVirtualCluster: boolean
+    isProd: boolean
+}