feat: refactor EditClusterDrawerContent to use getEditClusterDrawerMetadata for metadata fetching

Author: AbhishekA1509

src/Pages/GlobalConfigurations/ClustersAndEnvironments/EditClusterDrawerContent.tsx

@@ -14,26 +14,20 @@
  * limitations under the License.
  */
 
-import { APIResponseHandler, ClusterProviderType, noop, useQuery } from '@devtron-labs/devtron-fe-common-lib'
+import { APIResponseHandler, noop, useQuery } from '@devtron-labs/devtron-fe-common-lib'
 
 import { importComponentFromFELibrary } from '@Components/common'
 import { URLS } from '@Config/routes'
 
 import ClusterForm from './ClusterForm/ClusterForm'
-import { getCluster } from './cluster.service'
+import { getEditClusterDrawerMetadata } from './cluster.service'
 import { EditClusterDrawerContentProps, EditClusterDrawerMetadataType, EditClusterFormProps } from './cluster.type'
 
 const getSSHConfig: (
     ...props
 ) => Pick<EditClusterFormProps, 'sshUsername' | 'sshPassword' | 'sshAuthKey' | 'sshServerAddress'> =
     importComponentFromFELibrary('getSSHConfig', noop, 'function')
 
-const getCloudProviderForCluster: (clusterId: number) => Promise<ClusterProviderType> = importComponentFromFELibrary(
-    'getCloudProviderForCluster',
-    null,
-    'function',
-)
-
 const EditClusterDrawerContent = ({
     handleModalClose,
     sshTunnelConfig,
@@ -50,26 +44,14 @@ const EditClusterDrawerContent = ({
     insecureSkipTlsVerify,
     costModuleConfig,
 }: EditClusterDrawerContentProps) => {
-    const getClusterMetadata = async (): Promise<EditClusterDrawerMetadataType> => {
-        if (!clusterId) {
-            return { prometheusAuthResult: null, clusterProvider: null }
-        }
-
-        const [prometheusAuthResult, clusterProvider] = await Promise.all([
-            getCluster(+clusterId),
-            getCloudProviderForCluster ? getCloudProviderForCluster(+clusterId) : null,
-        ])
-        return { prometheusAuthResult, clusterProvider }
-    }
-
     const {
         isFetching: isMetadataLoading,
         data: metadata,
         error: metadataError,
         refetch: reloadMetadata,
     } = useQuery<EditClusterDrawerMetadataType, EditClusterDrawerMetadataType, [string, number], false>({
         queryKey: ['get-cluster-metadata', clusterId],
-        queryFn: () => getClusterMetadata(),
+        queryFn: () => getEditClusterDrawerMetadata(clusterId),
         enabled: !!clusterId,
     })
 

src/Pages/GlobalConfigurations/ClustersAndEnvironments/cluster.service.ts

@@ -14,11 +14,18 @@
  * limitations under the License.
  */
 
-import { get, post, put, trash } from '@devtron-labs/devtron-fe-common-lib'
+import { ClusterProviderType, get, post, put, trash } from '@devtron-labs/devtron-fe-common-lib'
 
+import { importComponentFromFELibrary } from '@Components/common'
 import { Routes } from '@Config/constants'
 
-import { DeleteClusterPayload, Environment, EnvironmentDTO } from './cluster.type'
+import { DeleteClusterPayload, EditClusterDrawerMetadataType, Environment, EnvironmentDTO } from './cluster.type'
+
+const getCloudProviderForCluster: (clusterId: number) => Promise<ClusterProviderType> = importComponentFromFELibrary(
+    'getCloudProviderForCluster',
+    null,
+    'function',
+)
 
 export const getEnvironmentList = async (): Promise<Environment[]> => {
     const { result } = await get<EnvironmentDTO[]>(Routes.ENVIRONMENT)
@@ -86,3 +93,15 @@ export function deleteCluster(payload: DeleteClusterPayload): Promise<any> {
 export function deleteEnvironment(request): Promise<any> {
     return trash(Routes.ENVIRONMENT, request)
 }
+
+export const getEditClusterDrawerMetadata = async (clusterId: number): Promise<EditClusterDrawerMetadataType> => {
+    if (!clusterId) {
+        return { prometheusAuthResult: null, clusterProvider: null }
+    }
+
+    const [prometheusAuthResult, clusterProvider] = await Promise.all([
+        getCluster(+clusterId),
+        getCloudProviderForCluster ? getCloudProviderForCluster(+clusterId) : null,
+    ])
+    return { prometheusAuthResult, clusterProvider }
+}