From eaf8f41dd0a654fd4e4ec783e6d0f19afa8a3b62 Mon Sep 17 00:00:00 2001
From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:05:30 -0500
Subject: [PATCH] UI - add missing null handling on team settings (#17548)

---
 frontend/interfaces/config.ts                                | 1 +
 .../TeamDetailsWrapper/TeamSettings/TeamSettings.tsx         | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/interfaces/config.ts b/frontend/interfaces/config.ts
index d39e567260..207e440a79 100644
--- a/frontend/interfaces/config.ts
+++ b/frontend/interfaces/config.ts
@@ -214,6 +214,7 @@ export interface IConfig {
 
 export interface IWebhookSettings {
   failing_policies_webhook: IWebhookFailingPolicies;
+  // TODO - this can be null
   host_status_webhook: IWebhookHostStatus;
   vulnerabilities_webhook: IWebhookSoftwareVulnerabilities;
 }
diff --git a/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx b/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx
index ded0f776e2..5a6b358098 100644
--- a/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx
+++ b/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx
@@ -190,7 +190,8 @@ const TeamSettings = ({ location, router }: ITeamSubnavProps) => {
       setPercentageHostsDropdownOptions(
         getCustomDropdownOptions(
           HOST_STATUS_WEBHOOK_HOST_PERCENTAGE_DROPDOWN_OPTIONS,
-          teamConfig?.webhook_settings.host_status_webhook.host_percentage ?? 1,
+          teamConfig?.webhook_settings?.host_status_webhook?.host_percentage ??
+            1,
           (val) => `${val}%`
         )
       );
@@ -198,7 +199,7 @@ const TeamSettings = ({ location, router }: ITeamSubnavProps) => {
       setWindowDropdownOptions(
         getCustomDropdownOptions(
           HOST_STATUS_WEBHOOK_WINDOW_DROPDOWN_OPTIONS,
-          teamConfig?.webhook_settings.host_status_webhook.days_count ?? 1,
+          teamConfig?.webhook_settings?.host_status_webhook?.days_count ?? 1,
           (val) => `${val} day${val !== 1 ? "s" : ""}`
         )
       );