From e5d60f6ec0aa764c80061e044d30210eb864913d Mon Sep 17 00:00:00 2001
From: Kianna Quach <kianna.quach@hashicorp.com>
Date: Mon, 22 Jan 2024 14:05:04 -0800
Subject: [PATCH 1/3] Add form inline warning

---
 ui/app/styles/helper-classes/spacing.scss                   | 4 ++++
 .../messages/page/create-and-edit-message-form.hbs          | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/ui/app/styles/helper-classes/spacing.scss b/ui/app/styles/helper-classes/spacing.scss
index a208705622a7..8d95939e537f 100644
--- a/ui/app/styles/helper-classes/spacing.scss
+++ b/ui/app/styles/helper-classes/spacing.scss
@@ -98,6 +98,10 @@
   margin: $spacing-4 0;
 }
 
+.has-top-margin-negative-m {
+  margin-top: -$spacing-16;
+}
+
 .has-top-bottom-margin-negative-m {
   margin-top: -$spacing-16;
   margin-bottom: -$spacing-16;
diff --git a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
index cd77066f0df8..a39d82d31592 100644
--- a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
+++ b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
@@ -21,6 +21,12 @@
       <FormField @attr={{attr}} @model={{@message}} @modelValidations={{this.modelValidations}} class="has-bottom-margin-m">
         <Messages::MessageExpirationDateForm @message={{@message}} @attr={{attr}} />
       </FormField>
+      {{#if (eq attr.name "message")}}
+        <Hds::Alert class="has-top-margin-negative-m has-bottom-margin-l" @type="compact" @color="highlight" as |A|>
+          <A.Title>Title here</A.Title>
+          <A.Description>Note: Do not include sensitive info in this message since users are unauthenticated at this stage.</A.Description>
+        </Hds::Alert>
+      {{/if}}
     {{/each}}
 
     <Hds::ButtonSet class="has-top-margin-s has-bottom-margin-m has-top-margin-xl">

From b5b5baa84165f3d17ed856e1b3fff7d322d09c62 Mon Sep 17 00:00:00 2001
From: Kianna Quach <kianna.quach@hashicorp.com>
Date: Mon, 22 Jan 2024 14:06:40 -0800
Subject: [PATCH 2/3] Remove title

---
 .../components/messages/page/create-and-edit-message-form.hbs    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
index a39d82d31592..9d411960a5fa 100644
--- a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
+++ b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
@@ -23,7 +23,6 @@
       </FormField>
       {{#if (eq attr.name "message")}}
         <Hds::Alert class="has-top-margin-negative-m has-bottom-margin-l" @type="compact" @color="highlight" as |A|>
-          <A.Title>Title here</A.Title>
           <A.Description>Note: Do not include sensitive info in this message since users are unauthenticated at this stage.</A.Description>
         </Hds::Alert>
       {{/if}}

From 6029e2ad2ae831a31364eeb231220fd85e5e37f9 Mon Sep 17 00:00:00 2001
From: Kianna Quach <kianna.quach@hashicorp.com>
Date: Mon, 22 Jan 2024 14:12:02 -0800
Subject: [PATCH 3/3] Only show form warning for unauth

---
 .../components/messages/page/create-and-edit-message-form.hbs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
index 9d411960a5fa..c687f1822fd1 100644
--- a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
+++ b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
@@ -21,7 +21,7 @@
       <FormField @attr={{attr}} @model={{@message}} @modelValidations={{this.modelValidations}} class="has-bottom-margin-m">
         <Messages::MessageExpirationDateForm @message={{@message}} @attr={{attr}} />
       </FormField>
-      {{#if (eq attr.name "message")}}
+      {{#if (and (eq attr.name "message") (not @message.authenticated))}}
         <Hds::Alert class="has-top-margin-negative-m has-bottom-margin-l" @type="compact" @color="highlight" as |A|>
           <A.Description>Note: Do not include sensitive info in this message since users are unauthenticated at this stage.</A.Description>
         </Hds::Alert>