From 19908768a46caf1e6c70380bce28ba72c8c0f547 Mon Sep 17 00:00:00 2001
From: Zhihe Li <zhihe.li@hashicorp.com>
Date: Mon, 22 Apr 2024 20:56:26 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20HDS=20labels=20and?=
 =?UTF-8?q?=20helpers=20in=20host=20sets=20(#2266)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 🐛 Fix HDS labels and helpers in host sets
---
 addons/core/translations/form/en-us.yaml              |  2 +-
 ui/admin/app/components/form/host-set/aws/index.hbs   | 11 ++++++++---
 ui/admin/app/components/form/host-set/azure/index.hbs |  5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 077a2a6fa..f76e4f818 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -168,7 +168,7 @@ ip_addresses:
   help: Read-only public and private IP addresses given by the plugin host catalog provider
 sync-interval:
   label: Sync Interval
-  help: Optional. Number of seconds between the time Boundary syncs hosts in this set.
+  help: Number of seconds between the time Boundary syncs hosts in this set.
 tags:
   label: Tags
 secret-editor:
diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
index 415445380..916cf59b1 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -97,7 +97,11 @@
     </:field>
   </Form::Field::ListWrapper>
 
-  <Form::Field::ListWrapper @layout='horizontal' @disabled={{form.disabled}}>
+  <Form::Field::ListWrapper
+    @layout='horizontal'
+    @isOptional={{true}}
+    @disabled={{form.disabled}}
+  >
     <:fieldset as |F|>
       <F.Legend>
         {{t 'resources.host-set.form.filter.label'}}
@@ -127,13 +131,14 @@
     name='sync_interval_seconds'
     @value={{@model.sync_interval_seconds}}
     @isInvalid={{@model.errors.sync_interval_seconds}}
+    @isOptional={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'sync_interval_seconds')}}
     as |F|
   >
-    <F.Label>{{t 'form.name.label'}}</F.Label>
+    <F.Label>{{t 'form.sync-interval.label'}}</F.Label>
     <F.HelperText>
-      {{t 'form.name.help'}}
+      {{t 'form.sync-interval.help'}}
       <Hds::Link::Inline @href={{doc-url 'host-set.sync-interval-seconds'}}>
         {{t 'actions.learn-more'}}
       </Hds::Link::Inline>
diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs
index ac303d047..b0b548981 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -123,13 +123,14 @@
     name='sync_interval_seconds'
     @value={{@model.sync_interval_seconds}}
     @isInvalid={{@model.errors.sync_interval_seconds}}
+    @isOptional={{true}}
     disabled={{form.disabled}}
     {{on 'input' (set-from-event @model 'sync_interval_seconds')}}
     as |F|
   >
-    <F.Label>{{t 'form.name.label'}}</F.Label>
+    <F.Label>{{t 'form.sync-interval.label'}}</F.Label>
     <F.HelperText>
-      {{t 'form.name.help'}}
+      {{t 'form.sync-interval.help'}}
       <Hds::Link::Inline @href={{doc-url 'host-set.sync-interval-seconds'}}>
         {{t 'actions.learn-more'}}
       </Hds::Link::Inline>