From e17db2e0d615bc4e60af9fa73db9d96a52281720 Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Mon, 19 Sep 2022 13:07:31 -0700
Subject: [PATCH] Update fieldset (#1334)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 🤖 add helpertext to fieldset and update text
---
 .../components/rose/form/fieldset/index.hbs   | 10 +++++++
 .../rose/form/fieldset/index.stories.mdx      | 27 +++++++++++--------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/addons/rose/addon/components/rose/form/fieldset/index.hbs b/addons/rose/addon/components/rose/form/fieldset/index.hbs
index 6d0eae5ab..36b6a0446 100644
--- a/addons/rose/addon/components/rose/form/fieldset/index.hbs
+++ b/addons/rose/addon/components/rose/form/fieldset/index.hbs
@@ -19,6 +19,16 @@
     </div>
   {{/if}}
 
+  {{#if @helperText}}
+      <Rose::Form::HelperText
+        @id='helper-text-{{this.id}}'
+        @error={{@error}}
+        @link={{@link}}
+        @linkText={{@linkText}}
+      >
+        {{@helperText}}
+      </Rose::Form::HelperText>
+    {{/if}}
   <div class='rose-form-fieldset-body'>
     {{yield to='body'}}
   </div>
diff --git a/addons/rose/addon/components/rose/form/fieldset/index.stories.mdx b/addons/rose/addon/components/rose/form/fieldset/index.stories.mdx
index 9dd61a4c6..9a52718c0 100644
--- a/addons/rose/addon/components/rose/form/fieldset/index.stories.mdx
+++ b/addons/rose/addon/components/rose/form/fieldset/index.stories.mdx
@@ -7,10 +7,10 @@ import { text, boolean, select } from '@storybook/addon-knobs';
 
 # Form Fieldset
 
-Renders a simple fieldset with title, description and body.
+Renders a simple fieldset with title, description and body and an optional helperText
 
 ```html
-<Rose::Form::Fieldset>
+<Rose::Form::Fieldset @helperText={{helperText}}>
   <:title>Title</:title>
   <:description>Description</:description>
   <:body>Rest of the form</:body>
@@ -18,12 +18,17 @@ Renders a simple fieldset with title, description and body.
 ```
 
 <Preview>
-    <Story name="Basic Fieldset">{{
-        template: hbs`
-            <Rose::Form::Fieldset>
-                <:title>Title</:title>
-                <:description>Description</:description>
-                <:body>Rest of the form</:body>
-            </Rose::Form::Fieldset>`
-        }}</Story>
-</Preview>
\ No newline at end of file
+  <Story name="Basic Fieldset">
+    {{
+      template: hbs`
+        <Rose::Form::Fieldset @helperText={{helperText}}>
+          <:title>Title</:title>
+          <:description>Description</:description>
+          <:body>Rest of the form</:body>
+        </Rose::Form::Fieldset>`,
+      context: {
+        helperText: text('helperText', 'This is an optional help text.'),
+      },
+    }}
+  </Story>
+</Preview>