Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 30

UI - add missing null handling on team settings (#17548)

Browse source
This commit is contained in:
Jacob Shandling 2024-03-11 17:05:30 -05:00 committed by GitHub
parent 14be6a0fc8
commit eaf8f41dd0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/interfaces/config.ts
View file

@ -214,6 +214,7 @@ export interface IConfig {
export interface IWebhookSettings { export interface IWebhookSettings {
failing_policies_webhook: IWebhookFailingPolicies; failing_policies_webhook: IWebhookFailingPolicies;
// TODO - this can be null
host_status_webhook: IWebhookHostStatus; host_status_webhook: IWebhookHostStatus;
vulnerabilities_webhook: IWebhookSoftwareVulnerabilities; vulnerabilities_webhook: IWebhookSoftwareVulnerabilities;
} }

5
frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx
View file

@ -190,7 +190,8 @@ const TeamSettings = ({ location, router }: ITeamSubnavProps) => {
setPercentageHostsDropdownOptions( setPercentageHostsDropdownOptions(
getCustomDropdownOptions( getCustomDropdownOptions(
HOST_STATUS_WEBHOOK_HOST_PERCENTAGE_DROPDOWN_OPTIONS, 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}%` (val) => `${val}%`
) )
); );
@ -198,7 +199,7 @@ const TeamSettings = ({ location, router }: ITeamSubnavProps) => {
setWindowDropdownOptions( setWindowDropdownOptions(
getCustomDropdownOptions( getCustomDropdownOptions(
HOST_STATUS_WEBHOOK_WINDOW_DROPDOWN_OPTIONS, 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" : ""}` (val) => `${val} day${val !== 1 ? "s" : ""}`
) )
); );