From dc0501e3761419a64b755d9d3f8e9a136d7914f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 23 Apr 2025 12:45:28 +0200
Subject: [PATCH] Alerting: Simplify actions (#103494)

---
 .../rule-editor/alert-rule-form/AlertRuleForm.tsx   | 13 -------------
 .../unified/rule-editor/RuleEditorExisting.test.tsx |  6 ++----
 public/locales/en-US/grafana.json                   |  1 -
 public/test/helpers/alertingRuleEditor.tsx          |  1 -
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx
index a1c3dea3c79..5a76be0933f 100644
--- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/AlertRuleForm.tsx
@@ -268,19 +268,6 @@ export const AlertRuleForm = ({ existing, prefill, isManualRestore }: Props) =>
 
   const actionButtons = (
     <Stack justifyContent="flex-end" alignItems="center">
-      {existing && (
-        <Button
-          data-testid="save-rule"
-          variant="primary"
-          type="button"
-          size="sm"
-          onClick={handleSubmit((values) => submit(values, false), onInvalid)}
-          disabled={isSubmitting}
-        >
-          {isSubmitting && <Spinner className={styles.buttonSpinner} inline={true} />}
-          <Trans i18nKey="alerting.alert-rule-form.action-buttons.save">Save rule</Trans>
-        </Button>
-      )}
       <Button
         data-testid="save-rule-and-exit"
         variant="primary"
diff --git a/public/app/features/alerting/unified/rule-editor/RuleEditorExisting.test.tsx b/public/app/features/alerting/unified/rule-editor/RuleEditorExisting.test.tsx
index 8f6538f60b7..ad58c4a002d 100644
--- a/public/app/features/alerting/unified/rule-editor/RuleEditorExisting.test.tsx
+++ b/public/app/features/alerting/unified/rule-editor/RuleEditorExisting.test.tsx
@@ -116,9 +116,7 @@ describe('RuleEditor grafana managed rules', () => {
     await user.type(screen.getByPlaceholderText('Enter custom annotation content...'), 'value');
 
     // save and check what was sent to backend
-    await user.click(ui.buttons.save.get());
-
-    expect(screen.getByText('New folder')).toBeInTheDocument();
+    await user.click(ui.buttons.saveAndExit.get());
   });
 
   it('saves evaluation interval correctly', async () => {
@@ -142,7 +140,7 @@ describe('RuleEditor grafana managed rules', () => {
       (req) => req.method === 'POST' && req.url.includes('/api/ruler/grafana/api/v1/rules/uuid020c61ef')
     );
 
-    await user.click(ui.buttons.save.get());
+    await user.click(ui.buttons.saveAndExit.get());
 
     const [request] = await capture;
     const postBody = await request.json();
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 8ec3abefc96..1c8e02997c4 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -410,7 +410,6 @@
       "action-buttons": {
         "delete": "Delete",
         "edit-yaml": "Edit YAML",
-        "save": "Save rule",
         "save-exit": "Save rule and exit"
       },
       "title-delete-rule": "Delete rule"
diff --git a/public/test/helpers/alertingRuleEditor.tsx b/public/test/helpers/alertingRuleEditor.tsx
index d15eee0a08b..9e601269b11 100644
--- a/public/test/helpers/alertingRuleEditor.tsx
+++ b/public/test/helpers/alertingRuleEditor.tsx
@@ -40,7 +40,6 @@ export const ui = {
   },
   buttons: {
     saveAndExit: byRole('button', { name: 'Save rule and exit' }),
-    save: byRole('button', { name: 'Save rule' }),
     addAnnotation: byRole('button', { name: /Add info/ }),
     addLabel: byRole('button', { name: /Add label/ }),
     preview: byRole('button', { name: /^Preview$/ }),