From 19c2e9197dc6207c25c057eae69d5712d92b062a Mon Sep 17 00:00:00 2001
From: jacobshandling <61553566+jacobshandling@users.noreply.github.com>
Date: Fri, 2 May 2025 09:32:34 -0700
Subject: [PATCH] UI: Enable Integrations > Advanced save button in GitOps Mode
 (#28748)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## For #28747

<img width="639" alt="Screenshot 2025-05-01 at 4 28 22 PM"
src="https://github.com/user-attachments/assets/0808d9fd-8866-4eb1-a84e-bef1efdd6919"
/>

- [x] Changes file added for user-visible changes in `changes/
- [x] Manual QA for all new/changed functionality

---------

Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
---
 changes/28747-allow-advanced-save-in-GOM      |  1 +
 .../cards/Advanced/Advanced.tsx               | 21 +++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 changes/28747-allow-advanced-save-in-GOM

diff --git a/changes/28747-allow-advanced-save-in-GOM b/changes/28747-allow-advanced-save-in-GOM
new file mode 100644
index 0000000000..d1ac19ceb3
--- /dev/null
+++ b/changes/28747-allow-advanced-save-in-GOM
@@ -0,0 +1 @@
+* Enable saving Integrations > Advanced in GitOps mode
diff --git a/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx b/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx
index 6d500a1c1e..699e16ffb6 100644
--- a/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx
+++ b/frontend/pages/admin/OrgSettingsPage/cards/Advanced/Advanced.tsx
@@ -486,19 +486,14 @@ const Advanced = ({
               )}
             />
           </div>
-          <GitOpsModeTooltipWrapper
-            tipOffset={-8}
-            renderChildren={(disableChildren) => (
-              <Button
-                type="submit"
-                disabled={Object.keys(formErrors).length > 0 || disableChildren}
-                className="save-loading button-wrap"
-                isLoading={isUpdatingSettings}
-              >
-                Save
-              </Button>
-            )}
-          />
+          <Button
+            type="submit"
+            disabled={Object.keys(formErrors).length > 0}
+            className="save-loading button-wrap"
+            isLoading={isUpdatingSettings}
+          >
+            Save
+          </Button>
         </form>
       </div>
     </div>