diff --git a/plugins/kubernetes/src/hooks/useKubernetesObjects.ts b/plugins/kubernetes/src/hooks/useKubernetesObjects.ts index 70281d8d49..161bba2ecf 100644 --- a/plugins/kubernetes/src/hooks/useKubernetesObjects.ts +++ b/plugins/kubernetes/src/hooks/useKubernetesObjects.ts @@ -26,8 +26,8 @@ import { import { useApi } from '@backstage/core-plugin-api'; export interface KubernetesObjects { - kubernetesObjects: ObjectsByEntityResponse | undefined; - error: string | undefined; + kubernetesObjects?: ObjectsByEntityResponse; + error?: string; } export const useKubernetesObjects = ( @@ -36,20 +36,18 @@ export const useKubernetesObjects = ( ): KubernetesObjects => { const kubernetesApi = useApi(kubernetesApiRef); const kubernetesAuthProvidersApi = useApi(kubernetesAuthProvidersApiRef); - const [kubernetesObjects, setKubernetesObjects] = useState< - ObjectsByEntityResponse | undefined - >(undefined); - - const [error, setError] = useState(undefined); + const [result, setResult] = useState({ + kubernetesObjects: undefined, + error: undefined + }); const getObjects = async () => { let clusters = []; try { clusters = await kubernetesApi.getClusters(); - setError(null); } catch (e) { - setError(e.message); + setResult({ error: e.message }); return; } @@ -76,18 +74,17 @@ export const useKubernetesObjects = ( authProviderStr, requestBody, ); - setError(null); } catch (e) { - setError(e.message); + setResult({ error: e.message }); return; } } try { - setKubernetesObjects(await kubernetesApi.getObjectsByEntity(requestBody)); - setError(null); + const objects = await kubernetesApi.getObjectsByEntity(requestBody); + setResult({ kubernetesObjects: objects }) } catch (e) { - setError(e.message); + setResult({ error: e.message }) return; } }; @@ -102,8 +99,5 @@ export const useKubernetesObjects = ( getObjects(); }, intervalMs); - return { - kubernetesObjects, - error, - }; + return result; };