Merge pull request #915 from devtron-labs/fix/cluster-form-field-errors

fix: cluster form field errors

Author: AbhishekA1509

package-lock.json

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

package.json

@@ -651,17 +651,6 @@ export const getDetailedClusterList = async (
                 ...res
             }) => {
                 const costModuleInstallationStatus = costModuleConfig?.installationStatus || 'NotInstalled'
-                // Need to remove following keys from config if present: openCostServiceName, openCostServicePort, releaseName, namespace
-                const sanitizedCostConfig = costModuleConfig?.config
-                    ? Object.fromEntries(
-                          Object.entries(costModuleConfig.config).filter(
-                              ([key]) =>
-                                  !['openCostServiceName', 'openCostServicePort', 'releaseName', 'namespace'].includes(
-                                      key,
-                                  ),
-                          ),
-                      )
-                    : undefined
 
                 return {
                     ...res,
@@ -678,7 +667,10 @@ export const getDetailedClusterList = async (
                     status: clusterStatus,
                     costModuleConfig: {
                         enabled: costModuleConfig?.enabled || false,
-                        config: sanitizedCostConfig,
+                        config: {
+                            ...(costModuleConfig?.config || {}),
+                            detectedProvider: costModuleConfig?.config?.detectedProvider,
+                        },
                         installationStatus: costModuleInstallationStatus,
                         ...(costModuleInstallationStatus === 'Failed'
                             ? {

src/Common/Common.service.ts

@@ -138,6 +138,7 @@ export const URLS = {
     // AI RECOMMENDATIONS
     AI_RECOMMENDATIONS: AI_RECOMMENDATIONS_ROOT,
     AI_RECOMMENDATIONS_OVERVIEW: `${AI_RECOMMENDATIONS_ROOT}/overview`,
+    EXTERNAL_APPS: 'ea',
 } as const
 
 export const ROUTES = {

src/Common/Constants.ts

@@ -42,6 +42,7 @@ import {
 } from '.'
 import { IllustrationName, SelectPickerOptionType } from '@Shared/Components'
 import { ClusterStatusType } from '@Pages/ResourceBrowser'
+import { ClusterProviderType } from '@PagesDevtron2.0/CostVisibility'
 
 /**
  * Generic response type object with support for overriding the result type
@@ -1126,7 +1127,9 @@ export type EnvironmentsGroupedByClustersType = {
 export type ClusterCostModuleConfigPayload =
     | {
           enabled: true
-          config?: Record<string, any>
+          config?: Record<string, any> & {
+            detectedProvider: ClusterProviderType
+          }
       }
     | {
           enabled: false

src/Common/Types.ts

@@ -13,6 +13,7 @@ const PromoetheusConfigCard = ({
     onPrometheusAuthTypeChange,
 }: PromoetheusConfigProps) => {
     const { endpoint, authType, userName, password, prometheusTlsClientCert, prometheusTlsClientKey } = prometheusConfig
+    const isBasicAuthError = authType.value === AuthenticationType.BASIC && (userName.error || password.error)
 
     return (
         <div className="bg__primary p-20 br-8 flexbox-col dc__gap-16 border__secondary">
@@ -22,7 +23,7 @@ const PromoetheusConfigCard = ({
                     Devtron uses prometheus to store and track cluster metrics
                 </span>
             </div>
-            {(userName.error || password.error || endpoint.error) && (
+            {(isBasicAuthError || endpoint.error) && (
                 <InfoBlock
                     variant="error"
                     description="Fill all the required fields OR turn off the above switch to skip configuring prometheus."