EVG-21077: Don't access undefined when destructuring useSpruceConfig (e…

…vergreen-ci#2100)
khelif96 · Oct 13, 2023 · 0d29e8b · 0d29e8b
1 parent 07a2fdc
commit 0d29e8b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/hooks/useSpruceConfig.ts b/src/hooks/useSpruceConfig.ts
@@ -5,11 +5,12 @@ import {
 } from "gql/generated/types";
 import { SPRUCE_CONFIG } from "gql/queries";
 
-export const useSpruceConfig = () => {
+export const useSpruceConfig = ():
+  | SpruceConfigQuery["spruceConfig"]
+  | undefined => {
   const { data } = useQuery<SpruceConfigQuery, SpruceConfigQueryVariables>(
     SPRUCE_CONFIG
   );
 
-  const { spruceConfig } = data || {};
-  return spruceConfig;
+  return data?.spruceConfig;
 };
diff --git a/src/pages/distroSettings/tabs/GeneralTab/GeneralTab.tsx b/src/pages/distroSettings/tabs/GeneralTab/GeneralTab.tsx
@@ -12,9 +12,9 @@ export const GeneralTab: React.FC<TabProps> = ({
   minimumHosts,
 }) => {
   const { distroId } = useParams();
-  const { containerPools } = useSpruceConfig();
+  const spruceConfig = useSpruceConfig();
   const containerPoolDistros =
-    containerPools?.pools?.map(({ distro }) => distro) ?? [];
+    spruceConfig?.containerPools?.pools?.map(({ distro }) => distro) ?? [];
 
   const isContainerDistro = containerPoolDistros.includes(distroId);
 

diff --git a/src/pages/distroSettings/tabs/ProviderTab/ProviderTab.tsx b/src/pages/distroSettings/tabs/ProviderTab/ProviderTab.tsx
@@ -32,8 +32,8 @@ export const ProviderTab: React.FC<TabProps> = ({ distro, distroData }) => {
   );
   const { awsRegions } = awsData || {};
 
-  const { containerPools } = useSpruceConfig();
-  const { pools } = containerPools || {};
+  const spruceConfig = useSpruceConfig();
+  const { pools } = spruceConfig?.containerPools || {};
 
   const selectedPoolId = formData?.dockerProviderSettings?.containerPoolId;
   const selectedPool = pools?.find((p) => p.id === selectedPoolId) ?? null;