From 3c7d096e26a830040c633ef04e23f69059a718fb Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 8 May 2023 10:41:30 +0100
Subject: [PATCH] [v10.0.x] Alerting: Change order of buttons bellow payload
 data editor (#67836)

Alerting: Change order of buttons bellow payload data editor (#67830)

Change order of buttons bellow payload data editor

(cherry picked from commit d10ee8263c95ed315f9ed03127637e8214e66c5f)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
---
 .../components/receivers/PayloadEditor.tsx    | 25 ++++++++++---------
 .../receivers/form/GenerateAlertDataModal.tsx |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
index a39cbdbad48..2194fbcb7a1 100644
--- a/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
+++ b/public/app/features/alerting/unified/components/receivers/PayloadEditor.tsx
@@ -99,9 +99,17 @@ export function PayloadEditor({
         />
 
         <div className={styles.buttonsWrapper}>
-          <Button onClick={onReset} className={styles.button} icon="arrow-up" type="button" variant="secondary">
-            {RESET_TO_DEFAULT}
+          <Button
+            type="button"
+            variant="secondary"
+            className={styles.button}
+            icon="bell"
+            disabled={errorInPayloadJson}
+            onClick={onOpenAlertSelectorModal}
+          >
+            Select alert instances
           </Button>
+
           <Button
             onClick={onOpenEditAlertModal}
             className={styles.button}
@@ -110,17 +118,10 @@ export function PayloadEditor({
             variant="secondary"
             disabled={errorInPayloadJson}
           >
-            Add alert data
+            Add custom alerts
           </Button>
-
-          <Button
-            type="button"
-            variant="secondary"
-            icon="bell"
-            disabled={errorInPayloadJson}
-            onClick={onOpenAlertSelectorModal}
-          >
-            Choose alert instances
+          <Button onClick={onReset} className={styles.button} icon="arrow-up" type="button" variant="destructive">
+            {RESET_TO_DEFAULT}
           </Button>
 
           {payloadFormatError !== null && (
diff --git a/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
index 706eacf3348..060329757a8 100644
--- a/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
+++ b/public/app/features/alerting/unified/components/receivers/form/GenerateAlertDataModal.tsx
@@ -85,7 +85,7 @@ export const GenerateAlertDataModal = ({ isOpen, onDismiss, onAccept }: Props) =
   ];
 
   return (
-    <Modal onDismiss={onDismiss} isOpen={isOpen} title={'Add alert data'}>
+    <Modal onDismiss={onDismiss} isOpen={isOpen} title={'Add custom alerts'}>
       <FormProvider {...formMethods}>
         <form
           onSubmit={(e) => {