Merge pull request #183 from devtron-labs/feat/fluxCD

chore: move app list constants to common constants

Author: arunjaindev

package-lock.json

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

package.json

@@ -33,11 +33,23 @@ export default function AppStatus({
     }
     const appStatusLowerCase = status?.toLowerCase()
     const isNotDeployed = appStatusLowerCase === StatusConstants.NOT_DEPLOYED.noSpaceLower
-    const iconClass = isNotDeployed ? StatusConstants.NOT_DEPLOYED.lowerCase : appStatusLowerCase
+    const isNotReady = appStatus === StatusConstants.NOT_READY.normalCase
     const statusMessage = status || (isVirtualEnv ? StatusConstants.NOT_AVILABLE.normalCase : '-')
     const notDeployed = isJobView ? YET_TO_RUN : StatusConstants.NOT_DEPLOYED.normalCase
     const textContent = isNotDeployed ? notDeployed : statusMessage
 
+    const getIconClass = () => {
+        if (isNotDeployed) {
+            return StatusConstants.NOT_DEPLOYED.lowerCase
+        }
+        if (isNotReady) {
+            return StatusConstants.NOT_READY.lowerCase
+        }
+        return appStatusLowerCase
+    }
+
+    const iconClass = getIconClass()
+
     const renderIcon = () => {
         if (iconClass) {
             return <span className={`dc__app-summary__icon icon-dim-16 ${iconClass} ${iconClass}--node`} />

src/Common/AppStatus/AppStatus.tsx

@@ -20,6 +20,11 @@ export const StatusConstants = {
         normalCase: 'Not deployed',
         lowerCase: 'not-deployed',
     },
+    NOT_READY: {
+        noSpaceLower: 'notready',
+        normalCase: 'Not Ready',
+        lowerCase: 'not-ready',
+    },
     APP_STATUS: {
         noSpaceLower: 'appStatus',
         normalText: 'App status',

src/Common/AppStatus/constants.ts

@@ -564,6 +564,7 @@ export enum DeploymentAppTypes {
     GITOPS = 'argo_cd',
     MANIFEST_DOWNLOAD = 'manifest_download',
     MANIFEST_PUSH = 'manifest_push',
+    FLUX = 'flux',
 }
 
 export interface VulnerabilityType {

src/Common/Types.ts

@@ -22,7 +22,7 @@ import { ReactComponent as DropDown } from '../../../../Assets/Icon/ic-dropdown-
 import { ReactComponent as ChartIcon } from '../../../../Assets/Icon/ic-charts.svg'
 import { ReactComponent as AddIcon } from '../../../../Assets/Icon/ic-add.svg'
 import { ReactComponent as JobIcon } from '../../../../Assets/Icon/ic-k8s-job.svg'
-import AppListConstants from './constants'
+import { AppListConstants } from '../../../constants'
 import './HeaderWithCreateButton.scss'
 import { useMainContext } from '../../../Providers'
 

src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx

@@ -406,10 +406,36 @@ export const APP_STATUS_HEADERS = ['KIND', 'NAME', 'STATUS', 'MESSAGE']
 export const MATERIAL_EXCLUDE_TIPPY_TEXT =
     'Not available for build as this commit contains changes in excluded files or folders'
 
+export const AppListConstants = {
+    SAMPLE_NODE_REPO_URL: 'https://github.com/devtron-labs/getting-started-nodejs',
+    CREATE_DEVTRON_APP_URL: 'create-d-app',
+    AppTabs: {
+        DEVTRON_APPS: 'Devtron Apps',
+        HELM_APPS: 'Helm Apps',
+        ARGO_APPS: 'ArgoCD Apps',
+        FLUX_APPS: 'FluxCD Apps',
+    },
+    AppType: {
+        DEVTRON_APPS: 'd',
+        HELM_APPS: 'h',
+        ARGO_APPS: 'a',
+        FLUX_APPS: 'f',
+    },
+    FilterType: {
+        PROJECT: 'team',
+        CLUTSER: 'cluster',
+        NAMESPACE: 'namespace',
+        ENVIRONMENT: 'environment',
+        APP_STATUS: 'appStatus',
+        TEMPLATE_TYPE: 'templateType',
+    },
+}
+
 export enum K8sResourcePayloadAppType {
     DEVTRON_APP = 0,
     HELM_APP = 1,
     EXTERNAL_ARGO_APP = 2,
+    EXTERNAL_FLUX_APP = 3,
 }
 
 // Disallowing this rule since ansi specifically works with escape characters

src/Shared/Components/Header/HeaderWithCreateButton/constants.ts

@@ -163,6 +163,7 @@ export enum AppType {
     DEVTRON_HELM_CHART = 'devtron_helm_chart',
     EXTERNAL_HELM_CHART = 'external_helm_chart',
     EXTERNAL_ARGO_APP = 'external_argo_app',
+    EXTERNAL_FLUX_APP = 'external_flux_app',
 }
 
 export interface HelmReleaseStatus {
@@ -180,6 +181,11 @@ interface MaterialInfo {
     url: string
     webhookData: string
 }
+export interface FluxAppStatusDetail {
+    status: string
+    message: string
+    reason: string
+}
 export interface AppDetails {
     appId?: number
     appName: string
@@ -221,6 +227,8 @@ export interface AppDetails {
     helmPackageName?: string
     appStatus?: string
     chartAvatar?: string
+    fluxTemplateType?: string
+    FluxAppStatusDetail?: FluxAppStatusDetail
 }
 
 export enum RegistryType {

src/Shared/constants.tsx

@@ -69,7 +69,8 @@ export interface customEnv {
     FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: boolean
     ENABLE_RESOURCE_SCAN_V2?: boolean
     HIDE_RESOURCE_WATCHER?: boolean
-    ORGANIZATION_NAME?: string
+    ORGANIZATION_NAME: string
+    FEATURE_EXTERNAL_FLUX_CD_ENABLE: boolean
     FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE?: boolean
     FEATURE_STEP_WISE_LOGS_ENABLE?: boolean
     FEATURE_IMAGE_PROMOTION_ENABLE?: boolean