From 9c678b50ff5bc022cae3b8fe698eb9e43cd0a39d Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Thu, 9 May 2024 15:45:02 -0400
Subject: [PATCH] [unreleased bug] UI: Hide add policies button on initial
 empty state (#18883)

---
 .../ManagePoliciesPage/ManagePoliciesPage.tsx | 61 ++++++-------------
 frontend/services/entities/team_policies.ts   |  2 +-
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
index a17b43fb2d..509978de94 100644
--- a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
@@ -311,38 +311,9 @@ const ManagePolicyPage = ({
     }
   );
 
-  const {
-    data: teamPoliciesCount,
-    isFetching: isFetchingTeamCount,
-    refetch: refetchTeamPoliciesCount,
-  } = useQuery<
-    IPoliciesCountResponse,
-    Error,
-    number,
-    ITeamPoliciesCountQueryKey[]
-  >(
-    [
-      {
-        scope: "teamPoliciesCount",
-        query: searchQuery,
-        teamId: teamIdForApi || 0, // TODO: Fix number/undefined type
-        mergeInherited: false,
-      },
-    ],
-    ({ queryKey }) => teamPoliciesAPI.getCount(queryKey[0]),
-    {
-      enabled: isRouteOk && !!teamIdForApi,
-      keepPreviousData: true,
-      refetchOnWindowFocus: false,
-      retry: 1,
-      select: (data) => data.count,
-    }
-  );
-
   const canAddOrDeletePolicy =
     isGlobalAdmin || isGlobalMaintainer || isTeamMaintainer || isTeamAdmin;
   const canManageAutomations = isGlobalAdmin || isTeamAdmin;
-  const hasPoliciesToAutomateOrDelete = policiesAvailableToAutomate.length > 0;
 
   const {
     data: config,
@@ -379,7 +350,6 @@ const ManagePolicyPage = ({
     if (teamId) {
       refetchTeamPolicies();
       refetchTeamPoliciesCountMergeInherited();
-      refetchTeamPoliciesCount();
     } else {
       refetchGlobalPolicies(); // Only call on global policies as this is expensive
       refetchGlobalPoliciesCount();
@@ -601,13 +571,18 @@ const ManagePolicyPage = ({
     ? teamPoliciesError
     : globalPoliciesError;
 
-  const policyResults = isAnyTeamSelected ? !!teamPolicies : !!globalPolicies;
+  const policyResults = isAnyTeamSelected
+    ? teamPolicies && teamPolicies.length > 0
+    : globalPolicies && globalPolicies.length > 0;
 
   // Show CTA buttons if there is no errors AND there are policy results or a search filter
   const showCtaButtons =
     !policiesErrors && (policyResults || searchQuery !== "");
 
   const automationsConfig = isAnyTeamSelected ? teamConfig : config;
+  const hasPoliciesToAutomateOrDelete = policiesAvailableToAutomate.length > 0;
+  const showAutomationsDropdown =
+    canManageAutomations && automationsConfig && hasPoliciesToAutomateOrDelete;
 
   // NOTE: backend uses webhook_settings to store automated policy ids for both webhooks and integrations
   let currentAutomatedPolicies: number[] = [];
@@ -768,19 +743,17 @@ const ManagePolicyPage = ({
           </div>
           {showCtaButtons && (
             <div className={`${baseClass} button-wrap`}>
-              {canManageAutomations &&
-                automationsConfig &&
-                hasPoliciesToAutomateOrDelete && (
-                  <div className={`${baseClass}__manage-automations-wrapper`}>
-                    <Dropdown
-                      className={`${baseClass}__manage-automations-dropdown`}
-                      onChange={onSelectAutomationOption}
-                      placeholder="Manage automations"
-                      searchable={false}
-                      options={getAutomationsDropdownOptions()}
-                    />
-                  </div>
-                )}
+              {showAutomationsDropdown && (
+                <div className={`${baseClass}__manage-automations-wrapper`}>
+                  <Dropdown
+                    className={`${baseClass}__manage-automations-dropdown`}
+                    onChange={onSelectAutomationOption}
+                    placeholder="Manage automations"
+                    searchable={false}
+                    options={getAutomationsDropdownOptions()}
+                  />
+                </div>
+              )}
               {canAddOrDeletePolicy && (
                 <div className={`${baseClass}__action-button-container`}>
                   <Button
diff --git a/frontend/services/entities/team_policies.ts b/frontend/services/entities/team_policies.ts
index 0380f2106c..a10d954e8b 100644
--- a/frontend/services/entities/team_policies.ts
+++ b/frontend/services/entities/team_policies.ts
@@ -159,7 +159,7 @@ export default {
   getCount: async ({
     query,
     teamId,
-    mergeInherited = false,
+    mergeInherited = true,
   }: Pick<
     IPoliciesCountApiParams,
     "query" | "teamId" | "mergeInherited"