Merge branch 'main' into vite_exploration

Author: vivek-devtron

.eslintignore

@@ -231,6 +231,9 @@ src/components/app/list/appStatus/AppStatus.tsx
 src/components/app/list/emptyView/Empty.tsx
 src/components/app/list/expandedRow/ExpandedRow.tsx
 src/components/app/list/types.tsx
+src/components/app/list-new/ExternalArgoList.tsx
+src/components/externalArgoApps/ExternalArgoApp.tsx
+src/components/externalArgoApps/ExternalArgoAppDetail.tsx
 src/components/app/service.ts
 src/components/app/types.ts
 src/components/bulkEdits/BulkEdits.tsx

src/components/ApplicationGroup/Details/EnvironmentOverview/EnvironmentOverview.tsx

@@ -25,7 +25,6 @@ import {
 } from '../../AppGroup.types'
 import './envOverview.scss'
 import { Moment12HourFormat } from '../../../../config'
-import { EditDescRequest } from '../../../app/types'
 import { ReactComponent as ActivityIcon } from '../../../../assets/icons/ic-activity.svg'
 import { ReactComponent as DockerIcon } from '../../../../assets/icons/git/docker.svg'
 import { ReactComponent as HibernateIcon } from '../../../../assets/icons/ic-hibernate-3.svg'

src/components/app/list-new/AppList.tsx

@@ -1,4 +1,4 @@
-import { get, ResponseType } from '@devtron-labs/devtron-fe-common-lib'
+import { get } from '@devtron-labs/devtron-fe-common-lib'
 import { getNamespaceListMin as getNamespaceList, getAppFilters } from '../../../services/service'
 import { Routes, SERVER_MODE } from '../../../config'
 import {
@@ -10,40 +10,7 @@ import {
 import { APP_STATUS } from '../config'
 import { getProjectList } from '../../project/service'
 import { getClusterList } from '../../cluster/cluster.service'
-
-export interface AppListResponse extends ResponseType {
-    result?: AppsListResult
-}
-
-interface AppsListResult {
-    clusterIds: number[]
-    applicationType: string // DEVTRON-CHART-STORE, DEVTRON-APP ,HELM-APP
-    errored: boolean
-    errorMsg: string
-    helmApps: HelmApp[]
-}
-
-export interface HelmApp {
-    appName: string
-    appId: string
-    isExternal: boolean
-    chartName: string
-    chartVersion: string
-    chartAvatar: string
-    projectId: number
-    lastDeployedAt: string
-    environmentDetail: AppEnvironmentDetail
-    appStatus: string
-}
-
-export interface AppEnvironmentDetail {
-    environmentName: string
-    environmentId: number
-    namespace: string
-    clusterName: string
-    clusterId: number
-    isVirtualEnvironment?: boolean
-}
+import { AppListResponse } from './AppListType';
 
 async function commonAppFilters(serverMode) {
     if (serverMode === SERVER_MODE.FULL) {
@@ -210,8 +177,19 @@ export const getNamespaces = (
     })
 }
 
-export const getDevtronInstalledHelmApps = (clusterIdsCsv: string, appStatuses?: string): Promise<AppListResponse> => {
-    let url = `${Routes.CHART_INSTALLED}`
+export const getDevtronInstalledHelmApps = (clusterIdsCsv: string, appStatuses?: string) : Promise<AppListResponse> => {
+    let url = Routes.CHART_INSTALLED
+    if (clusterIdsCsv) {
+        url = `${url}?clusterIds=${clusterIdsCsv}`
+    }
+    if (appStatuses) {
+        url = `${url}${clusterIdsCsv ? '&' : '?'}appStatuses=${appStatuses}`
+    }
+    return get(url)
+}
+
+export const getArgoInstalledExternalApps = (clusterIdsCsv: string, appStatuses?: string) => {
+    let url = Routes.ARGO_APPS
     if (clusterIdsCsv) {
         url = `${url}?clusterIds=${clusterIdsCsv}`
     }

src/components/app/list-new/AppListService.ts

@@ -0,0 +1,47 @@
+import { ResponseType } from '@devtron-labs/devtron-fe-common-lib'
+
+export interface ArgoAppListResult {
+    appName: string
+    clusterName: string
+    namespace: string
+    appStatus: string
+    syncStatus?: string
+    clusterId?: string
+}
+export interface ArgoAppListResponse extends ArgoAppListResult {
+    result?: ArgoAppListResult
+}
+
+export interface AppEnvironmentDetail {
+    environmentName: string
+    environmentId: number
+    namespace: string
+    clusterName: string
+    clusterId: number
+    isVirtualEnvironment?: boolean
+}
+
+export interface HelmApp {
+    appName: string
+    appId: string
+    isExternal: boolean
+    chartName: string
+    chartVersion: string
+    chartAvatar: string
+    projectId: number
+    lastDeployedAt: string
+    environmentDetail: AppEnvironmentDetail
+    appStatus: string
+}
+
+interface AppsListResult {
+    clusterIds: number[]
+    applicationType: string // DEVTRON-CHART-STORE, DEVTRON-APP ,HELM-APP
+    errored: boolean
+    errorMsg: string
+    helmApps: HelmApp[]
+}
+
+export interface AppListResponse extends ResponseType {
+    result?: AppsListResult
+}