From 790d047692f8025d697fe729deb251d719917a3e Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 15 Feb 2022 18:23:25 -0500
Subject: [PATCH] chore: move form fields

---
 addons/core/translations/resources/en-us.yaml    | 16 +++++++++-------
 .../components/form/host-catalog/azure/index.hbs |  4 ++--
 .../app/components/form/host-set/aws/index.hbs   |  4 ++--
 .../app/components/form/host-set/azure/index.hbs |  4 ++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 3098c2f12..1341dcc76 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -84,7 +84,7 @@ host-catalog:
       title: Welcome to Host Catalogs
   actions:
     delete: Delete Host Catalog
-  help: 
+  help:
     static: Provide a list of hosts and host sets with static addresses
     dynamic: Automate discovery of target hosts and services on Azure or AWS
   types:
@@ -93,9 +93,10 @@ host-catalog:
     aws: AWS
     azure: Azure
     dynamic: Dynamic
-  azure_client_id: 
-    label: Client ID
-    help: The client ID for the client you want Boundary to use.
+  form:
+    azure_client_id:
+      label: Client ID
+      help: The client ID for the client you want Boundary to use.
 host-set:
   title: Host Set
   title_plural: Host Sets
@@ -106,9 +107,10 @@ host-set:
     delete: Delete Host Set
     create-and-add-host: Create and Add Host
     add-hosts: Add Existing Host
-  filter: 
-    label: Filter
-    help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider
+  form:
+    filter: 
+      label: Filter
+      help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider
   messages:
     welcome:
       title: Welcome to Host Sets
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index a822b0c84..d19cb2dd3 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -148,8 +148,8 @@
     @name='client_id'
     @type='client_id'
     @value={{@model.client_id}}
-    @label={{t 'resources.host-catalog.azure_client_id.label'}}
-    @helperText={{t 'resources.host-catalog.azure_client_id.help'}}
+    @label={{t 'resources.host-catalog.form.azure_client_id.label'}}
+    @helperText={{t 'resources.host-catalog.form.azure_client_id.help'}}
     @linkText={{t 'actions.learn-more'}}
     readonly={{false}}
   />
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 aceead976..3af6ce47f 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -75,8 +75,8 @@
   </form.fieldset>
 
   <Rose::Form::Fieldset>
-    <:title>{{t 'resources.host-set.filter.label'}}</:title>
-    <:description>{{t 'resources.host-set.filter.help'}}</:description>
+    <:title>{{t 'resources.host-set.form.filter.label'}}</:title>
+    <:description>{{t 'resources.host-set.form.filter.help'}}</:description>
     <:body>
       {{#if @model.errors.filters}}
         <Rose::Form::Errors as |errors|>
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 d306b00f6..686cb70d4 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -78,8 +78,8 @@
     @name='filter'
     @type='filter'
     @value={{@model.filter}}
-    @label={{t 'resources.host-set.filter.label'}}
-    @helperText={{t 'resources.host-set.filter.help'}}
+    @label={{t 'resources.host-set.form.filter.label'}}
+    @helperText={{t 'resources.host-set.form.filter.help'}}
     @linkText={{t 'form. tiltes.learn-more'}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}