Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/security-summary-card

Author: arunjaindev

.eslintignore

@@ -5,7 +5,7 @@
 .eslintrc.js
 vite.config.mts
 
-# The following files have eslint errors/warningssrc/App.tsx
+# The following files have eslint errors/warnings
 src/App.tsx
 src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
 src/components/AppSelector/AppSelector.tsx
@@ -82,9 +82,7 @@ src/components/ClusterNodes/constants.ts
 src/components/Hotjar/Hotjar.tsx
 src/components/Jobs/ExpandedRow/ExpandedRow.tsx
 src/components/Jobs/JobDetails/JobDetails.tsx
-src/components/Jobs/JobList/JobListContainer.tsx
 src/components/Jobs/JobList/JobListView.tsx
-src/components/Jobs/JobList/JobsList.tsx
 src/components/Jobs/Jobs.tsx
 src/components/Jobs/JobsEmptyState.tsx
 src/components/Jobs/Service.ts
@@ -159,16 +157,12 @@ src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx
 src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx
 src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx
 src/components/app/grepSSEworker.ts
-src/components/app/list-new/AppList.tsx
 src/components/app/list-new/AppListService.ts
 src/components/app/list-new/GenericAppList.tsx
 src/components/app/list-new/HelmAppList.tsx
-src/components/app/list/AppListView.tsx
-src/components/app/list/DevtronAppListContainer.tsx
 src/components/app/list/TriggerUrl.tsx
 src/components/app/list/__tests__/AppListView.test.tsx
 src/components/app/list/appList.modal.ts
-src/components/app/list/appStatus/AppStatus.tsx
 src/components/app/list/emptyView/Empty.tsx
 src/components/app/list/expandedRow/ExpandedRow.tsx
 src/components/app/service.ts
@@ -286,7 +280,6 @@ src/components/common/eaEmptyState/EAEmptyState.tsx
 src/components/common/edge/rectangularEdge.tsx
 src/components/common/edge/straightEdge.tsx
 src/components/common/errorBoundary.tsx
-src/components/common/filter/filters.tsx
 src/components/common/formFields/CopyButton.tsx
 src/components/common/formFields/CustomPassword.tsx
 src/components/common/formFields/DevtronSwitch.tsx

src/App.tsx

@@ -98,6 +98,8 @@ export default function App() {
             }
         } else {
             didMountRef.current = true
+            // Removing any toast explicitly due to race condition of offline toast for some users
+            ToastManager.dismissToast(onlineToastRef.current)
         }
     }, [isOnline])
 

src/assets/gif/ic-empty-select-cluster.gif

@@ -24,13 +24,15 @@ import {
     PipelineType,
     CommonNodeAttr,
     WorkflowType,
+    getUrlWithSearchParams,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { CdPipelineResult, CiPipelineResult, WorkflowResult, CiPipeline } from '../app/details/triggerView/types'
 import { WebhookListResponse } from '../ciPipeline/Webhook/types'
 import { processWorkflow } from '../app/details/triggerView/workflow.service'
 import { WorkflowTrigger } from '../app/details/triggerView/config'
 import { ModuleNameMap, Routes, URLS } from '../../config'
 import {
+    AppGroupFilterConfig,
     AppGroupList,
     CIConfigListType,
     CheckPermissionResponse,
@@ -41,6 +43,7 @@ import {
     EnvDeploymentStatusType,
     EnvGroupListResponse,
     EnvGroupResponse,
+    GetEnvAppListParamsType,
     WorkflowsResponseType,
 } from './AppGroup.types'
 import { getModuleConfigured } from '../app/details/appDetails/appDetails.service'
@@ -190,26 +193,20 @@ export const getConfigAppList = (envId: number, appIds: string): Promise<ConfigA
 }
 
 export const getEnvAppList = (
-    params?: {
-        envName?: string
-        clusterIds?: string
-        offset?: string
-        size?: string
-    },
+    filterConfig?: Partial<AppGroupFilterConfig>,
     signal?: AbortSignal,
 ): Promise<EnvAppType> => {
     const options = signal ? { signal } : null
-
-    if (params) {
-        const urlParams = Object.entries(params).map(([key, value]) => {
-            if (!value) {
-                return
-            }
-            return `${key}=${value}`
-        })
-        return get(`${Routes.ENVIRONMENT_APPS}?${urlParams.filter((s) => s).join('&')}`, options)
+    const { searchKey = '', cluster = [], offset = 0, pageSize = 20 } = filterConfig ?? {}
+    const params: GetEnvAppListParamsType = {
+        envName: searchKey,
+        clusterIds: cluster?.join(),
+        offset,
+        size: pageSize,
     }
-    return get(Routes.ENVIRONMENT_APPS, options)
+
+    const url = getUrlWithSearchParams(Routes.ENVIRONMENT_APPS, params)
+    return get(url, options)
 }
 
 export const getDeploymentStatus = (envId: number, appIds: string): Promise<EnvDeploymentStatusType> => {

src/assets/icons/ic-select-cluster.svg

@@ -27,6 +27,7 @@ import {
     AppInfoListType,
     GVKType,
     RuntimeParamsListItemType,
+    UseUrlFiltersReturnType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { MultiValue } from 'react-select'
 import { WebhookPayloads } from '../app/details/triggerView/types'
@@ -254,9 +255,21 @@ export interface ApplicationRouteType {
     fetchEnvConfig: () => void
 }
 
-export interface EnvironmentsListViewType {
-    removeAllFilters: () => void
+export interface AppGroupFilterConfig
+    extends Pick<UseUrlFiltersReturnType<never>, 'searchKey' | 'offset' | 'pageSize'> {
+    cluster: string[]
+}
+
+export interface GetEnvAppListParamsType extends Pick<AppGroupFilterConfig, 'offset'> {
+    size: number
+    envName: string
+    clusterIds: string
+}
+
+export interface EnvironmentsListViewType
+    extends Pick<UseUrlFiltersReturnType<never>, 'changePage' | 'changePageSize' | 'clearFilters'> {
     isSuperAdmin: boolean
+    filterConfig: AppGroupFilterConfig
 }
 
 export interface EnvironmentLinkProps {
@@ -591,3 +604,9 @@ export interface ManageAppsResponseType {
     id: string
     error: string
 }
+
+export enum AppGroupUrlFilters {
+    cluster = 'cluster',
+}
+
+export interface AppGroupUrlFiltersType extends Record<AppGroupUrlFilters, string[]> {}

src/components/ApplicationGroup/AppGroup.service.ts

@@ -27,7 +27,7 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 import { DEFAULT_GIT_BRANCH_VALUE, DOCKER_FILE_ERROR_TITLE, SOURCE_NOT_CONFIGURED } from '../../config'
 import { getEnvAppList } from './AppGroup.service'
-import { CDWorkflowStatusType, CIWorkflowStatusType, ProcessWorkFlowStatusType } from './AppGroup.types'
+import { AppGroupUrlFilters, CDWorkflowStatusType, CIWorkflowStatusType, ProcessWorkFlowStatusType } from './AppGroup.types'
 
 let timeoutId
 
@@ -151,7 +151,7 @@ export const envListOptions = (inputValue: string, signal?: AbortSignal): Promis
                 resolve([])
                 return
             }
-            getEnvAppList({ envName: inputValue }, signal)
+            getEnvAppList({ searchKey: inputValue }, signal)
                 .then((response) => {
                     let appList = []
                     if (response.result) {
@@ -283,3 +283,7 @@ export const processConsequenceData = (data: BlockedStateData): ConsequenceType
     }
     return data.ciBlockState
 }
+
+export const parseSearchParams = (searchParams: URLSearchParams) => ({
+    [AppGroupUrlFilters.cluster]: searchParams.getAll(AppGroupUrlFilters.cluster),
+})

src/components/ApplicationGroup/AppGroup.types.ts

@@ -204,16 +204,19 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
         setAppGroupListData(result)
         setDescription(result.description)
         if (result.apps?.length) {
-            setAppListOptions(
-                result.apps
-                    .map((app): OptionType => {
-                        return {
-                            value: `${app.appId}`,
-                            label: app.appName,
-                        }
-                    })
-                    .sort(sortOptionsByLabel),
-            )
+            const _appListOptions = result.apps
+                .map((app): OptionType => {
+                    return {
+                        value: `${app.appId}`,
+                        label: app.appName,
+                    }
+                })
+                .sort(sortOptionsByLabel)
+
+            setAppListOptions(_appListOptions)
+            if (selectedGroupFilter.length) {
+                setSelectedAppList(_appListOptions.filter((app) => selectedGroupFilter[0].appIds.includes(+app.value)))
+            }
         }
         setAppListLoading(false)
     }