From 439d6f0623c8679ae1e4a508c7371df95a8b5431 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 14 Feb 2022 16:09:55 -0600
Subject: [PATCH] Fix flaky e2e policies (#4190)

---
 .../integration/all/app/policiesflow.spec.ts  |  8 +++++--
 .../ManagePoliciesPage/ManagePoliciesPage.tsx | 23 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/cypress/integration/all/app/policiesflow.spec.ts b/cypress/integration/all/app/policiesflow.spec.ts
index ca6b58515a..4dfad51c23 100644
--- a/cypress/integration/all/app/policiesflow.spec.ts
+++ b/cypress/integration/all/app/policiesflow.spec.ts
@@ -110,7 +110,9 @@ describe("Policies flow (seeded)", () => {
       cy.findByText(/backup/i).should("not.exist");
     });
     it("creates a failing policies webhook", () => {
-      cy.findByRole("button", { name: /manage automations/i }).click();
+      cy.getAttached(".button-wrap").within(() => {
+        cy.findByRole("button", { name: /manage automations/i }).click();
+      });
       cy.getAttached(".manage-automations-modal").within(() => {
         cy.getAttached(".fleet-checkbox__input").check({ force: true });
       });
@@ -118,7 +120,9 @@ describe("Policies flow (seeded)", () => {
       cy.findByRole("button", { name: /^Save$/ }).click();
       // Confirm failing policies webhook was added successfully
       cy.findByText(/updated policy automations/i).should("exist");
-      cy.findByRole("button", { name: /manage automations/i }).click();
+      cy.getAttached(".button-wrap").within(() => {
+        cy.findByRole("button", { name: /manage automations/i }).click();
+      });
       cy.getAttached(".manage-automations-modal").within(() => {
         cy.getAttached(".fleet-checkbox__input").should("be.checked");
       });
diff --git a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
index c76bd21c2c..93a34c9e5b 100644
--- a/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx
@@ -362,15 +362,18 @@ const ManagePolicyPage = ({
             </div>
           </div>
           <div className={`${baseClass} button-wrap`}>
-            {canAddOrRemovePolicy && teamId === 0 && (
-              <Button
-                onClick={() => onManageAutomationsClick()}
-                className={`${baseClass}__manage-automations button`}
-                variant="inverse"
-              >
-                <span>Manage automations</span>
-              </Button>
-            )}
+            {canAddOrRemovePolicy &&
+              teamId === 0 &&
+              !isLoadingFailingPoliciesWebhook &&
+              !isLoadingGlobalPolicies && (
+                <Button
+                  onClick={() => onManageAutomationsClick()}
+                  className={`${baseClass}__manage-automations button`}
+                  variant="inverse"
+                >
+                  <span>Manage automations</span>
+                </Button>
+              )}
             {canAddOrRemovePolicy && (
               <div className={`${baseClass}__action-button-container`}>
                 <Button
@@ -450,7 +453,7 @@ const ManagePolicyPage = ({
               />
             ))}
         </div>
-        {showInheritedPoliciesButton && (
+        {showInheritedPoliciesButton && globalPolicies && (
           <span>
             <Button
               variant="unstyled"