From 7f52999ed556ab0500aab8aa62981a137a3cbb5c Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Tue, 7 May 2024 10:32:08 -0400 Subject: [PATCH] [unreleased bug] FE: Fix empty types to match empty type returned from Policies APIs (#18795) --- frontend/interfaces/policy.ts | 7 +++++-- .../policies/ManagePoliciesPage/ManagePoliciesPage.tsx | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/interfaces/policy.ts b/frontend/interfaces/policy.ts index 3ac0a59c30..41586ea22d 100644 --- a/frontend/interfaces/policy.ts +++ b/frontend/interfaces/policy.ts @@ -74,13 +74,16 @@ export interface IHostPolicy extends IPolicy { response: PolicyStatusResponse; } +// Policies API can return {} export interface ILoadAllPoliciesResponse { - policies: IPolicyStats[]; + policies?: IPolicyStats[]; } +// Team policies API can return {} export interface ILoadTeamPoliciesResponse { - policies: IPolicyStats[]; + policies?: IPolicyStats[]; } + export interface IPolicyFormData { description?: string | number | boolean | undefined; resolution?: string | number | boolean | undefined; diff --git a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx index b1a76ce687..a17b43fb2d 100644 --- a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx +++ b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx @@ -215,10 +215,10 @@ const ManagePolicyPage = ({ }, { enabled: isRouteOk && !isAnyTeamSelected, - select: (data) => data.policies, + select: (data) => data.policies || [], staleTime: 5000, onSuccess: (data) => { - setPoliciesAvailableToAutomate(data); + setPoliciesAvailableToAutomate(data || []); }, } ); @@ -273,12 +273,12 @@ const ManagePolicyPage = ({ }, { enabled: isRouteOk && isPremiumTier && !!teamIdForApi, - select: (data: ILoadTeamPoliciesResponse) => data.policies, + select: (data: ILoadTeamPoliciesResponse) => data.policies || [], onSuccess: (data) => { const allPoliciesAvailableToAutomate = data.filter( (policy: IPolicy) => policy.team_id === currentTeamId ); - setPoliciesAvailableToAutomate(allPoliciesAvailableToAutomate); + setPoliciesAvailableToAutomate(allPoliciesAvailableToAutomate || []); }, } );