chore: code refactoring

Author: shivani170

src/components/common/hooks/useOnline/service.ts

@@ -1,13 +1,26 @@
-export const getFallbackInternetConnectivity = (controller: AbortController): Promise<any> => {
-    const timeoutId = setTimeout(() => {
-        controller.abort()
-    }, 20000)
-
-    return fetch('https://www.google.com/favicon.ico', {
-        method: 'HEAD',
-        mode: 'no-cors',
-        signal: controller.signal,
-    }).finally(() => {
-        clearTimeout(timeoutId)
-    })
+import { Routes } from '@Config/constants'
+
+const DEFAULT_TIMEOUT = 10000
+
+const fetchWithTimeout = (url: string, options: RequestInit, controller: AbortController): Promise<any> => {
+    const timeoutId = setTimeout(() => controller.abort(), DEFAULT_TIMEOUT)
+
+    return fetch(url, { ...options, signal: controller.signal }).finally(() => clearTimeout(timeoutId))
+}
+
+export const getFallbackInternetConnectivity = (controller: AbortController): Promise<any> =>
+    fetchWithTimeout(
+        'https://www.google.com/favicon.ico',
+        {
+            method: 'HEAD',
+            mode: 'no-cors',
+        },
+        controller,
+    )
+
+export const getInternetConnectivity = (controller: AbortController): Promise<any> => {
+    const baseUrl = window._env_?.CENTRAL_API_ENDPOINT ?? 'https://api.devtron.ai'
+    const url = `${baseUrl}/${Routes.HEALTH}`
+
+    return fetchWithTimeout(url, {}, controller).then((res) => res.json())
 }

src/components/common/hooks/useOnline/useOnline.ts

@@ -2,10 +2,8 @@ import { useEffect, useRef, useState } from 'react'
 
 import { getIsRequestAborted, noop, useMainContext } from '@devtron-labs/devtron-fe-common-lib'
 
-import { getInternetConnectivity } from '@Services/service'
-
 import { INTERNET_CONNECTIVITY_INTERVAL } from '../constants'
-import { getFallbackInternetConnectivity } from './service'
+import { getFallbackInternetConnectivity, getInternetConnectivity } from './service'
 
 export const useOnline = ({ onOnline = noop }: { onOnline?: () => void }) => {
     const [online, setOnline] = useState(structuredClone(navigator.onLine))

src/services/service.ts

@@ -37,13 +37,11 @@ import { Routes } from '../config'
 import {
     CDPipelines,
     AppListMin,
-    ProjectFilteredApps,
     AppOtherEnvironment,
     ClusterEnvironmentDetailList,
     ClusterListResponse,
     LoginCountType,
     ConfigOverrideWorkflowDetailsResponse,
-    AllWorkflows,
     MinChartRefDTO,
     ClusterEnvTeams,
 } from './service.types'
@@ -558,16 +556,3 @@ export const validateContainerConfiguration = (request: any): Promise<any> => {
 export const getTemplateOptions = (appId: number, envId: number): Promise<ResponseType<TemplateListDTO[]>> =>
     get(getUrlWithSearchParams(Routes.DEPLOYMENT_OPTIONS, { appId, envId }))
 
-export const getInternetConnectivity = (controller: AbortController): Promise<any> => {
-    const timeoutId = setTimeout(() => {
-        controller.abort()
-    }, 10000)
-
-    return fetch(`${window._env_?.CENTRAL_API_ENDPOINT ?? 'https://api.devtron.ai'}/${Routes.HEALTH}`, {
-        signal: controller.signal,
-    })
-        .then((res) => res.json())
-        .finally(() => {
-            clearTimeout(timeoutId)
-        })
-}