Merge branch 'feat/env-list-header' of https://github.com/devtron-labs/dashboard into feat/env-list-header

Author: arunjaindev

package.json

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

src/components/ApplicationGroup/List/EnvironmentsList.tsx

@@ -83,7 +83,7 @@ const EnvironmentsList = ({ isSuperAdmin }: AppGroupAdminType) => {
     const [clusterListLoading, clusterListRes, clusterListError, reloadClusterList] =
         useAsync(getClusterListMinWithoutAuth)
 
-    const clusterOptions: SelectPickerOptionType[] = useMemo(
+    const clusterOptions: SelectPickerOptionType<string, string>[] = useMemo(
         () =>
             clusterListRes?.result.map((clusterItem) => ({
                 label: clusterItem.cluster_name,

src/components/Jobs/Types.ts

@@ -99,9 +99,9 @@ export interface JobListPayload
 }
 
 export interface JobsMasterFilters {
-    status: SelectPickerOptionType[]
-    projects: SelectPickerOptionType[]
-    environments: SelectPickerOptionType[]
+    status: SelectPickerOptionType<JobListStatusDTO, JobListStatus>[]
+    projects: SelectPickerOptionType<string, string>[]
+    environments: SelectPickerOptionType<string, string>[]
 }
 
 export interface JobListFilterConfig
@@ -122,7 +122,7 @@ export interface JobListProps
     jobListCount: number
     openJobCreateModel: (event) => void
     setJobCount: React.Dispatch<React.SetStateAction<number>>
-    getLabelFromValue: (filterKey: JobListUrlFilters, filterValue: string) => React.ReactNode
+    getLabelFromValue: (filterKey: JobListUrlFilters, filterValue: string) => string
 }
 
 export interface JobListViewProps

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-1":
-  version: 1.18.1-pre-1
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-1"
+"@devtron-labs/devtron-fe-common-lib@npm:1.18.0-alpha-7":
+  version: 1.18.0-alpha-7
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.18.0-alpha-7"
   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/af4699e7a37da3ece8c6d708c13dfe4f0909fc17290ec810d93d19b47ec03e03ab3fa5acc0c6021819203aad64e47fe1daa574ed4759c803f51950e1c83449a1
+  checksum: 10c0/22e793a3908903ffd36755b0f63fc2c41a452fe4599d986c7dd7c372a1ceff9f5751668e53b61fd12ef03bd72ed9c6b0a7e2ee9ae4c03bc8f035703427d5d344
   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-1"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.18.0-alpha-7"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"