From 6a8bbcad9d06be158eb0ec7624eae23b07f5784c Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 26 Jan 2022 10:38:04 -0500
Subject: [PATCH 01/40] feat: Add type param support to creation form of host
 catalog

---
 .../app/components/form/host-catalog/index.hbs    | 14 ++++++++++++++
 .../components/form/host-catalog/static/index.hbs |  1 +
 .../app/routes/scopes/scope/host-catalogs/new.js  | 15 +++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 ui/admin/app/components/form/host-catalog/static/index.hbs

diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 39571b820..2df4c07d9 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -45,6 +45,20 @@
       </field.errors>
     {{/if}}
   </form.textarea>
+
+  <p>Place Radio Button Group Here</p>
+
+  {{#if @model.isNew}}
+    {{#if @model.type}}
+      {{component
+        (concat 'form/host-catalog/' @model.type)
+        model=@model
+        submit=@submit
+        cancel=@cancel
+      }}
+    {{/if}}
+  {{/if}}
+
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
new file mode 100644
index 000000000..6754ba2a0
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -0,0 +1 @@
+I'm a static host catalog form.
\ No newline at end of file
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 9af8baaef..5105e168a 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -1,16 +1,27 @@
 import Route from '@ember/routing/route';
 
 export default class ScopesScopeHostCatalogsNewRoute extends Route {
+  // =attributes
+
+  queryParams = {
+    type: {
+      refreshModel: true,
+    },
+  };
+
   // =methods
 
   /**
    * Creates a new unsaved host catalog belonging to the current scope.
    * @return {HostCatalogModel}
    */
-  model() {
+  model(params) {
     const scopeModel = this.modelFor('scopes.scope');
+    // TODO Use model provider type method
+    //  to set params.type to 'static' if type is not provided
+    params.type = 'static';
     return this.store.createRecord('host-catalog', {
-      type: 'static',
+      type: params.type,
       scopeModel,
     });
   }

From 9255d6dd984d9fd45d0303d5cffebd3ad3630dae Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 26 Jan 2022 10:49:28 -0500
Subject: [PATCH 02/40] feat: Trigger update to host catalog type

---
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js  | 10 ++++++++++
 .../app/templates/scopes/scope/host-catalogs/new.hbs   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 5105e168a..b8f6a396d 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+import { action } from '@ember/object';
 
 export default class ScopesScopeHostCatalogsNewRoute extends Route {
   // =attributes
@@ -25,4 +26,13 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
       scopeModel,
     });
   }
+
+  /**
+   * Update type of host catalog
+   * @param {string} type
+   */
+  @action
+  async changeType(type) {
+    await this.router.replaceWith({ type });
+  }
 }
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
index fb936598e..983c1e86f 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -18,6 +18,7 @@
       @model={{@model}}
       @submit={{route-action 'save' @model}}
       @cancel={{route-action 'cancel' @model}}
+      @changeType={{route-action 'changeType' @model.type}}
     />
   </page.body>
 

From 07b2c646b1efb504990b9975c485bbaef93201cf Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 26 Jan 2022 10:56:38 -0500
Subject: [PATCH 03/40] feat: Question on default host catalog type value

---
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index b8f6a396d..c95aea7b4 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -18,8 +18,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
-    // TODO Use model provider type method
-    //  to set params.type to 'static' if type is not provided
+    // FIXME Should default static type be specified when type is undefined?
     params.type = 'static';
     return this.store.createRecord('host-catalog', {
       type: params.type,

From feec5d96f3a68bcf6fbeb8ab7f11f2ba81842274 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Tue, 25 Jan 2022 19:12:18 -0800
Subject: [PATCH 04/40] typed host catalog init

---
 .../form/host-catalog/aws/index.hbs           | 38 +++++++++++++++++++
 .../form/host-catalog/azure/index.hbs         | 38 +++++++++++++++++++
 .../form/host-catalog/static/index.hbs        | 38 +++++++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 ui/admin/app/components/form/host-catalog/aws/index.hbs
 create mode 100644 ui/admin/app/components/form/host-catalog/azure/index.hbs
 create mode 100644 ui/admin/app/components/form/host-catalog/static/index.hbs

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
new file mode 100644
index 000000000..2632020d2
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -0,0 +1,38 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  {{!-- @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}} --}}
+  as |form|
+>
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+ 
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
new file mode 100644
index 000000000..2632020d2
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -0,0 +1,38 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  {{!-- @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}} --}}
+  as |form|
+>
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+ 
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
new file mode 100644
index 000000000..2632020d2
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -0,0 +1,38 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  {{!-- @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}} --}}
+  as |form|
+>
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+ 
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file

From f13a3ee18cafe39b4ff1d8d446f2bf8b59675649 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 26 Jan 2022 09:34:23 -0800
Subject: [PATCH 05/40] split host catalog into other types

---
 .../app/components/form/auth-method/index.hbs |  4 +-
 .../form/host-catalog/aws/index.hbs           |  2 +-
 .../form/host-catalog/azure/index.hbs         |  2 +-
 .../components/form/host-catalog/index.hbs    | 65 +++----------------
 .../form/host-catalog/static/index.hbs        |  2 +-
 5 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/ui/admin/app/components/form/auth-method/index.hbs b/ui/admin/app/components/form/auth-method/index.hbs
index 77cf37d4d..224c8006f 100644
--- a/ui/admin/app/components/form/auth-method/index.hbs
+++ b/ui/admin/app/components/form/auth-method/index.hbs
@@ -8,4 +8,6 @@
     addStringItem=@addStringItem
     addAccountClaimMapItem=@addAccountClaimMapItem
   }}
-{{/if}}
\ No newline at end of file
+{{/if}}
+
+{{{log @model 'mdelll'}}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 2632020d2..5c8278a97 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -6,7 +6,7 @@
   @showEditToggle={{if @model.isNew false true}} --}}
   as |form|
 >
-
+AWASSS!
   <form.input
     @name='name'
     @type='name'
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 2632020d2..3bfff4bd0 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -6,7 +6,7 @@
   @showEditToggle={{if @model.isNew false true}} --}}
   as |form|
 >
-
+AZURE!!
   <form.input
     @name='name'
     @type='name'
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 39571b820..2177276d7 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -1,56 +1,11 @@
-<Rose::Form
-  @onSubmit={{@submit}}
-  @cancel={{@cancel}}
-  @disabled={{@model.isSaving}}
-  @error={{@model.errors.base}}
-  @showEditToggle={{if @model.isNew false true}}
-  as |form|
->
+{{#if @model.compositeType}}
+  {{component
+    (concat 'form/host-catalog/' @model.compositeType)
+    model=@model
+    submit=@submit
+    cancel=@cancel
+    changeType=@changeType
+  }}
+{{/if}}
 
-  <form.input
-    @name='name'
-    @type='name'
-    @value={{@model.name}}
-    @label={{t 'form.name.label'}}
-    @helperText={{t 'form.name.help'}}
-    @error={{@model.errors.name}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.name}}
-      <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.input>
-
-  <form.textarea
-    @name='description'
-    @type='description'
-    @value={{@model.description}}
-    @label={{t 'form.description.label'}}
-    @helperText={{t 'form.description.help'}}
-    @error={{@model.errors.description}}
-    disabled={{@model.isSaving}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.description}}
-      <field.errors as |errors|>
-        {{#each @model.errors.description as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.textarea>
-  {{#if (can 'save model' @model)}}
-    <form.actions
-      @disabled={{if @model.cannotSave @model.cannotSave}}
-      @enableEditText={{t 'actions.edit-form'}}
-      @submitText={{t 'actions.save'}}
-      @cancelText={{t 'actions.cancel'}}
-    />
-  {{/if}}
-</Rose::Form>
\ No newline at end of file
+{{{log @model 'modede'}}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 2632020d2..ab96e4e79 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -6,7 +6,7 @@
   @showEditToggle={{if @model.isNew false true}} --}}
   as |form|
 >
-
+STATIC!!
   <form.input
     @name='name'
     @type='name'

From e0f569229b13aa34678a41bae23e46d4cbeeb2f4 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 26 Jan 2022 14:35:31 -0800
Subject: [PATCH 06/40] static form with radioCards

---
 .../form/host-catalog/aws/index.hbs           | 39 +------------------
 .../form/host-catalog/azure/index.hbs         | 39 +------------------
 .../components/form/host-catalog/index.hbs    |  1 -
 .../form/host-catalog/static/index.hbs        | 38 ++++++++++++++++--
 4 files changed, 36 insertions(+), 81 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 5c8278a97..d4a50149c 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -1,38 +1 @@
-<Rose::Form
-  @onSubmit={{@submit}}
-  @cancel={{@cancel}}
-  @disabled={{@model.isSaving}}
-  {{!-- @error={{@model.errors.base}}
-  @showEditToggle={{if @model.isNew false true}} --}}
-  as |form|
->
-AWASSS!
-  <form.input
-    @name='name'
-    @type='name'
-    @value={{@model.name}}
-    @label={{t 'form.name.label'}}
-    @helperText={{t 'form.name.help'}}
-    @error={{@model.errors.name}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.name}}
-      <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.input>
-
- 
-  {{#if (can 'save model' @model)}}
-    <form.actions
-      @disabled={{if @model.cannotSave @model.cannotSave}}
-      @enableEditText={{t 'actions.edit-form'}}
-      @submitText={{t 'actions.save'}}
-      @cancelText={{t 'actions.cancel'}}
-    />
-  {{/if}}
-</Rose::Form>
\ No newline at end of file
+AWS Form
\ No newline at end of file
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 3bfff4bd0..2c7cb5293 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -1,38 +1 @@
-<Rose::Form
-  @onSubmit={{@submit}}
-  @cancel={{@cancel}}
-  @disabled={{@model.isSaving}}
-  {{!-- @error={{@model.errors.base}}
-  @showEditToggle={{if @model.isNew false true}} --}}
-  as |form|
->
-AZURE!!
-  <form.input
-    @name='name'
-    @type='name'
-    @value={{@model.name}}
-    @label={{t 'form.name.label'}}
-    @helperText={{t 'form.name.help'}}
-    @error={{@model.errors.name}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.name}}
-      <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.input>
-
- 
-  {{#if (can 'save model' @model)}}
-    <form.actions
-      @disabled={{if @model.cannotSave @model.cannotSave}}
-      @enableEditText={{t 'actions.edit-form'}}
-      @submitText={{t 'actions.save'}}
-      @cancelText={{t 'actions.cancel'}}
-    />
-  {{/if}}
-</Rose::Form>
\ No newline at end of file
+Azure Form
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 2177276d7..975d98f62 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -4,7 +4,6 @@
     model=@model
     submit=@submit
     cancel=@cancel
-    changeType=@changeType
   }}
 {{/if}}
 
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index ab96e4e79..b77d02fa5 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -2,11 +2,8 @@
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
   @disabled={{@model.isSaving}}
-  {{!-- @error={{@model.errors.base}}
-  @showEditToggle={{if @model.isNew false true}} --}}
   as |form|
 >
-STATIC!!
   <form.input
     @name='name'
     @type='name'
@@ -26,7 +23,40 @@ STATIC!!
     {{/if}}
   </form.input>
 
- 
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  <Rose::Form::Radio::Group @name='types' as |radioGroup|>
+    <radioGroup.card
+      @label={{t 'resources.host-catalog.types.static'}}
+      @value='static'
+      @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+      @layout='tile'
+    />
+    <radioGroup.card
+      @label={{t 'resources.host-catalog.types.dynamic'}}
+      @value='dynamic'
+      @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+      @layout='tile'
+    />
+  </Rose::Form::Radio::Group>
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}

From d595b6c899add134b3c36e56e339e72a11a679fd Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 26 Jan 2022 16:36:11 -0800
Subject: [PATCH 07/40] further updates

---
 addons/core/translations/resources/en-us.yaml |  1 +
 .../form/host-catalog/static/index.hbs        | 38 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 4ac6c4023..308161cb1 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -78,6 +78,7 @@ host-catalog:
   title: Host Catalog
   title_plural: Host Catalogs
   description: A host catalog is a collection of hosts and host sets.
+  type: Type
   messages:
     welcome:
       title: Welcome to Host Catalogs
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index b77d02fa5..1c88faefc 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -42,21 +42,25 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-
-  <Rose::Form::Radio::Group @name='types' as |radioGroup|>
-    <radioGroup.card
-      @label={{t 'resources.host-catalog.types.static'}}
-      @value='static'
-      @helperText={{t 'resources.host-catalog.form.types.static.help'}}
-      @layout='tile'
-    />
-    <radioGroup.card
-      @label={{t 'resources.host-catalog.types.dynamic'}}
-      @value='dynamic'
-      @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
-      @layout='tile'
-    />
-  </Rose::Form::Radio::Group>
+  <form.fieldset>
+    <:title>{{t 'resources.host-catalog.type'}}</:title>
+    <:body>
+      <form.radioGroup @name='types' as |radioGroup|>
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.static'}}
+          @value='static'
+          @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+          @layout='wide'
+        />
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.dynamic'}}
+          @value='dynamic'
+          @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+          @layout='wide'
+        />
+      </form.radioGroup>
+    </:body>
+  </form.fieldset>
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
@@ -65,4 +69,6 @@
       @cancelText={{t 'actions.cancel'}}
     />
   {{/if}}
-</Rose::Form>
\ No newline at end of file
+</Rose::Form>
+
+{{{log @model.compositeType 'compostite type'}}}
\ No newline at end of file

From c1d71e51663889d2dec2818497db7df181b12abf Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 26 Jan 2022 10:38:04 -0500
Subject: [PATCH 08/40] feat: Add type param support to creation form of host
 catalog

---
 .../components/form/host-catalog/index.hbs    | 66 ++++++++++++++++++-
 .../form/host-catalog/static/index.hbs        |  2 +-
 .../routes/scopes/scope/host-catalogs/new.js  | 15 ++++-
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 975d98f62..fc04f322d 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -7,4 +7,68 @@
   }}
 {{/if}}
 
-{{{log @model 'modede'}}}
\ No newline at end of file
+<<<<<<< HEAD
+{{{log @model 'modede'}}}
+=======
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  <p>Place Radio Button Group Here</p>
+
+  {{#if @model.isNew}}
+    {{#if @model.type}}
+      {{component
+        (concat 'form/host-catalog/' @model.type)
+        model=@model
+        submit=@submit
+        cancel=@cancel
+      }}
+    {{/if}}
+  {{/if}}
+
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
+>>>>>>> 6a8bbcad (feat: Add type param support to creation form of host catalog)
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 1c88faefc..42c75e421 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -71,4 +71,4 @@
   {{/if}}
 </Rose::Form>
 
-{{{log @model.compositeType 'compostite type'}}}
\ No newline at end of file
+{{{log @model.compositeType 'compostite type'}}}
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 9af8baaef..5105e168a 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -1,16 +1,27 @@
 import Route from '@ember/routing/route';
 
 export default class ScopesScopeHostCatalogsNewRoute extends Route {
+  // =attributes
+
+  queryParams = {
+    type: {
+      refreshModel: true,
+    },
+  };
+
   // =methods
 
   /**
    * Creates a new unsaved host catalog belonging to the current scope.
    * @return {HostCatalogModel}
    */
-  model() {
+  model(params) {
     const scopeModel = this.modelFor('scopes.scope');
+    // TODO Use model provider type method
+    //  to set params.type to 'static' if type is not provided
+    params.type = 'static';
     return this.store.createRecord('host-catalog', {
-      type: 'static',
+      type: params.type,
       scopeModel,
     });
   }

From cc56fb9636c99667e668f183570e505fcc81bab0 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 26 Jan 2022 10:49:28 -0500
Subject: [PATCH 09/40] feat: Trigger update to host catalog type

---
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js  | 10 ++++++++++
 .../app/templates/scopes/scope/host-catalogs/new.hbs   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 5105e168a..b8f6a396d 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+import { action } from '@ember/object';
 
 export default class ScopesScopeHostCatalogsNewRoute extends Route {
   // =attributes
@@ -25,4 +26,13 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
       scopeModel,
     });
   }
+
+  /**
+   * Update type of host catalog
+   * @param {string} type
+   */
+  @action
+  async changeType(type) {
+    await this.router.replaceWith({ type });
+  }
 }
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
index fb936598e..983c1e86f 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -18,6 +18,7 @@
       @model={{@model}}
       @submit={{route-action 'save' @model}}
       @cancel={{route-action 'cancel' @model}}
+      @changeType={{route-action 'changeType' @model.type}}
     />
   </page.body>
 

From 46b6c51f5de0cdbf3ceaadcc8ea3be78fd298601 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 26 Jan 2022 10:56:38 -0500
Subject: [PATCH 10/40] feat: Question on default host catalog type value

---
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index b8f6a396d..c95aea7b4 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -18,8 +18,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
-    // TODO Use model provider type method
-    //  to set params.type to 'static' if type is not provided
+    // FIXME Should default static type be specified when type is undefined?
     params.type = 'static';
     return this.store.createRecord('host-catalog', {
       type: params.type,

From 2de2a79e7c8ec4b259aa12af596afea8c6513672 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 27 Jan 2022 10:07:50 -0500
Subject: [PATCH 11/40] fix: Protect catalog type selectors in edit mode

---
 .../components/form/host-catalog/index.hbs    |  6 +----
 .../form/host-catalog/static/index.hbs        | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index fc04f322d..28a7711d1 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -7,9 +7,6 @@
   }}
 {{/if}}
 
-<<<<<<< HEAD
-{{{log @model 'modede'}}}
-=======
   <form.input
     @name='name'
     @type='name'
@@ -70,5 +67,4 @@
       @cancelText={{t 'actions.cancel'}}
     />
   {{/if}}
-</Rose::Form>
->>>>>>> 6a8bbcad (feat: Add type param support to creation form of host catalog)
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 42c75e421..e39512155 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -42,6 +42,7 @@
       </field.errors>
     {{/if}}
   </form.textarea>
+<<<<<<< HEAD
   <form.fieldset>
     <:title>{{t 'resources.host-catalog.type'}}</:title>
     <:body>
@@ -61,6 +62,32 @@
       </form.radioGroup>
     </:body>
   </form.fieldset>
+=======
+
+  {{#if @model.isNew}}
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.type'}}</:title>
+      <:body>
+        <form.radioGroup @name='types' @changed={{@changeType}}
+          as |radioGroup|>
+          <radioGroup.card
+            @label={{t 'resources.host-catalog.types.static'}}
+            @value='static'
+            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @layout='wide'
+          />
+          <radioGroup.card
+            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @value='dynamic'
+            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @layout='wide'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
+  {{/if}}
+
+>>>>>>> f3d3bdd7 (fix: Protect catalog type selectors in edit mode)
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}

From b2b2f63bf38df433411a9e62b59893c6ddfbdb41 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 27 Jan 2022 10:11:12 -0500
Subject: [PATCH 12/40] feat: Add missing queryParam to hostcatalog create
 controller

---
 .../controllers/scopes/scope/host-catalogs/new.js  |  7 +++++++
 .../app/routes/scopes/scope/host-catalogs/new.js   |  5 +++++
 .../scopes/scope/host-catalogs/new-test.js         | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
 create mode 100644 ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/new-test.js

diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
new file mode 100644
index 000000000..182b9c423
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
@@ -0,0 +1,7 @@
+import Controller from '@ember/controller';
+
+export default class ScopesScopeHostCatalogsNewController extends Controller {
+  // =attributes
+
+  queryParams = ['type'];
+}
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index c95aea7b4..43c4a025e 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -1,7 +1,12 @@
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsNewRoute extends Route {
+  // =services
+
+  @service router;
+
   // =attributes
 
   queryParams = {
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/new-test.js b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/new-test.js
new file mode 100644
index 000000000..c872fa28a
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/new-test.js
@@ -0,0 +1,14 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Controller | scopes/scope/host-catalogs/new', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let controller = this.owner.lookup(
+      'controller:scopes/scope/host-catalogs/new'
+    );
+    assert.ok(controller);
+  });
+});

From 67c4440a9091c0ecc29502ad0a233b8471fad387 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 27 Jan 2022 10:43:22 -0500
Subject: [PATCH 13/40] fix: Reflect catalog type in creation url

---
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 43c4a025e..e8bf1cef8 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -23,20 +23,24 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
-    // FIXME Should default static type be specified when type is undefined?
-    params.type = 'static';
+    if (!params.type) params.type = 'static';
     return this.store.createRecord('host-catalog', {
       type: params.type,
       scopeModel,
     });
   }
 
+  afterModel(model) {
+    this.router.replaceWith({ queryParams: { type: model.compositeType } });
+  }
+
   /**
    * Update type of host catalog
    * @param {string} type
    */
   @action
   async changeType(type) {
-    await this.router.replaceWith({ type });
+    console.log(type, 'GET TYPE HERE');
+    await this.router.replaceWith({ queryParams: { type } });
   }
 }

From 0577cdec76f7bc9b1337140e677a4823731816f0 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Fri, 28 Jan 2022 00:01:17 -0800
Subject: [PATCH 14/40] more updates

---
 .../components/form/host-catalog/index.hbs    | 70 ++-----------------
 .../form/host-catalog/plugin/index.hbs        |  2 +
 .../form/host-catalog/static/index.hbs        | 30 +-------
 .../routes/scopes/scope/host-catalogs/new.js  |  3 +-
 4 files changed, 13 insertions(+), 92 deletions(-)
 create mode 100644 ui/admin/app/components/form/host-catalog/plugin/index.hbs

diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 28a7711d1..1b1dbf68d 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -1,70 +1,14 @@
-{{#if @model.compositeType}}
+COMES JERE
+{{{log 'BLLL' @model.compositeType}}}
+{{{log 'NNFRM' @model.isNew}}}
+
+{{#if @model.isNew}}
+{{!-- {{#if @model.compositeType}} --}}
   {{component
     (concat 'form/host-catalog/' @model.compositeType)
     model=@model
     submit=@submit
     cancel=@cancel
   }}
+{{!-- {{/if}} --}}
 {{/if}}
-
-  <form.input
-    @name='name'
-    @type='name'
-    @value={{@model.name}}
-    @label={{t 'form.name.label'}}
-    @helperText={{t 'form.name.help'}}
-    @error={{@model.errors.name}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.name}}
-      <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.input>
-
-  <form.textarea
-    @name='description'
-    @type='description'
-    @value={{@model.description}}
-    @label={{t 'form.description.label'}}
-    @helperText={{t 'form.description.help'}}
-    @error={{@model.errors.description}}
-    disabled={{@model.isSaving}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.description}}
-      <field.errors as |errors|>
-        {{#each @model.errors.description as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.textarea>
-
-  <p>Place Radio Button Group Here</p>
-
-  {{#if @model.isNew}}
-    {{#if @model.type}}
-      {{component
-        (concat 'form/host-catalog/' @model.type)
-        model=@model
-        submit=@submit
-        cancel=@cancel
-      }}
-    {{/if}}
-  {{/if}}
-
-  {{#if (can 'save model' @model)}}
-    <form.actions
-      @disabled={{if @model.cannotSave @model.cannotSave}}
-      @enableEditText={{t 'actions.edit-form'}}
-      @submitText={{t 'actions.save'}}
-      @cancelText={{t 'actions.cancel'}}
-    />
-  {{/if}}
-</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/plugin/index.hbs b/ui/admin/app/components/form/host-catalog/plugin/index.hbs
new file mode 100644
index 000000000..0191a0174
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/plugin/index.hbs
@@ -0,0 +1,2 @@
+THIS IS DYNAINC
+{{{log @model 'NAMEEEE'}}}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index e39512155..bad64bf24 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -1,3 +1,4 @@
+STATIC {{{log 'STATTTTTIC' @model}}}
 <Rose::Form
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
@@ -21,7 +22,7 @@
         {{/each}}
       </field.errors>
     {{/if}}
-  </form.input>
+  </form.input> --}}
 
   <form.textarea
     @name='description'
@@ -42,7 +43,6 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-<<<<<<< HEAD
   <form.fieldset>
     <:title>{{t 'resources.host-catalog.type'}}</:title>
     <:body>
@@ -62,32 +62,6 @@
       </form.radioGroup>
     </:body>
   </form.fieldset>
-=======
-
-  {{#if @model.isNew}}
-    <form.fieldset>
-      <:title>{{t 'resources.host-catalog.type'}}</:title>
-      <:body>
-        <form.radioGroup @name='types' @changed={{@changeType}}
-          as |radioGroup|>
-          <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static'}}
-            @value='static'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
-            @layout='wide'
-          />
-          <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic'}}
-            @value='dynamic'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
-            @layout='wide'
-          />
-        </form.radioGroup>
-      </:body>
-    </form.fieldset>
-  {{/if}}
-
->>>>>>> f3d3bdd7 (fix: Protect catalog type selectors in edit mode)
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index e8bf1cef8..cf9f74624 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -12,6 +12,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
   queryParams = {
     type: {
       refreshModel: true,
+      replace: true
     },
   };
 
@@ -23,7 +24,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
-    if (!params.type) params.type = 'static';
+    if (!params.type) params.type = 'plugin';
     return this.store.createRecord('host-catalog', {
       type: params.type,
       scopeModel,

From 36eab2e0f1b1cae213a5d2373ec341a8320b6da1 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Fri, 28 Jan 2022 08:53:16 -0800
Subject: [PATCH 15/40] unknown type

---
 addons/api/addon/models/host-catalog.js            | 14 +++++++++++++-
 .../app/components/form/host-catalog/index.hbs     |  4 ++--
 .../app/routes/scopes/scope/host-catalogs/new.js   |  2 ++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addons/api/addon/models/host-catalog.js b/addons/api/addon/models/host-catalog.js
index ec34b50e3..33fce7bc7 100644
--- a/addons/api/addon/models/host-catalog.js
+++ b/addons/api/addon/models/host-catalog.js
@@ -26,7 +26,15 @@ export default class HostCatalogModel extends GeneratedHostCatalogModel {
    * @type {boolean}
    */
   get isUnknown() {
-    return this.isPlugin && !types.includes(this.plugin.name);
+    console.log(this.isPlugin, 'IS IT PLUGIN', this.plugin, types);
+    // if(this.plugin === undefined) {
+    //   console.log('in USEFNNFNF')
+    //   return false;
+    // } else {
+    //   console.log('in ELSE EE')
+
+      return this.isPlugin && !types.includes(this.plugin.name);
+    // }
   }
 
   /**
@@ -51,6 +59,8 @@ export default class HostCatalogModel extends GeneratedHostCatalogModel {
    * @type {string}
    */
   get compositeType() {
+    console.log(this, this.isPlugin, 'WHAT IS PLUGNI');
+   // if(this.plugin === undefined) return 'static';
     if (this.isUnknown) return 'unknown';
     if (this.isPlugin) return this.plugin.name;
     return 'static';
@@ -65,7 +75,9 @@ export default class HostCatalogModel extends GeneratedHostCatalogModel {
       this.type = 'static';
     } else {
       this.type = 'plugin';
+     
       this.plugin = { name: type };
+      console.log('COMPOSITI' ,  this.plugin, type)
     }
   }
 }
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 1b1dbf68d..1740712ef 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -2,8 +2,8 @@ COMES JERE
 {{{log 'BLLL' @model.compositeType}}}
 {{{log 'NNFRM' @model.isNew}}}
 
-{{#if @model.isNew}}
-{{!-- {{#if @model.compositeType}} --}}
+{{!-- {{#if @model.isNew}} --}}
+{{#if @model.compositeType}}
   {{component
     (concat 'form/host-catalog/' @model.compositeType)
     model=@model
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index cf9f74624..c93bdbce6 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -25,8 +25,10 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
     if (!params.type) params.type = 'plugin';
+    params.name = 'Avon';
     return this.store.createRecord('host-catalog', {
       type: params.type,
+      name: params.name,
       scopeModel,
     });
   }

From 19f48b2ca308a1102eca57d910d66a20a965735b Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Fri, 28 Jan 2022 17:27:59 -0800
Subject: [PATCH 16/40] show provider info when dynamic is selected

---
 .../form/host-catalog/plugin/index.hbs        |  2 --
 .../form/host-catalog/static/index.hbs        |  3 +--
 .../form/host-catalog/static/index.js         | 26 +++++++++++++++++++
 .../routes/scopes/scope/host-catalogs/new.js  |  7 ++---
 4 files changed, 29 insertions(+), 9 deletions(-)
 delete mode 100644 ui/admin/app/components/form/host-catalog/plugin/index.hbs
 create mode 100644 ui/admin/app/components/form/host-catalog/static/index.js

diff --git a/ui/admin/app/components/form/host-catalog/plugin/index.hbs b/ui/admin/app/components/form/host-catalog/plugin/index.hbs
deleted file mode 100644
index 0191a0174..000000000
--- a/ui/admin/app/components/form/host-catalog/plugin/index.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-THIS IS DYNAINC
-{{{log @model 'NAMEEEE'}}}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index bad64bf24..42c75e421 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -1,4 +1,3 @@
-STATIC {{{log 'STATTTTTIC' @model}}}
 <Rose::Form
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
@@ -22,7 +21,7 @@ STATIC {{{log 'STATTTTTIC' @model}}}
         {{/each}}
       </field.errors>
     {{/if}}
-  </form.input> --}}
+  </form.input>
 
   <form.textarea
     @name='description'
diff --git a/ui/admin/app/components/form/host-catalog/static/index.js b/ui/admin/app/components/form/host-catalog/static/index.js
new file mode 100644
index 000000000..8b55cf8b8
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/static/index.js
@@ -0,0 +1,26 @@
+import Component from '@glimmer/component';
+import { options } from 'api/models/credential-library';
+import { computed, action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+
+export default class FormHostCatalogIndexComponent extends Component {
+  // =properties
+  /**
+  /**
+   */
+   @tracked showDynamicPlugins = false;
+  // =actions
+
+  @action
+  toggleType(type) {
+    this.renderDynamicPlugins(type);
+  }
+  renderDynamicPlugins(type) {
+   if(type === 'dynamic') {
+      this.showDynamicPlugins = true;
+   } else {
+    this.showDynamicPlugins = false;
+   }
+ }
+
+}
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index c93bdbce6..49a4a69da 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -24,11 +24,9 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
-    if (!params.type) params.type = 'plugin';
-    params.name = 'Avon';
+    if (!params.type) params.type = 'static';
     return this.store.createRecord('host-catalog', {
-      type: params.type,
-      name: params.name,
+      compositeType: params.type, //static or aws or azure
       scopeModel,
     });
   }
@@ -43,7 +41,6 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   @action
   async changeType(type) {
-    console.log(type, 'GET TYPE HERE');
     await this.router.replaceWith({ queryParams: { type } });
   }
 }

From ce633ec0c0e579a19018ff8fa01b5f832ce3958a Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Tue, 25 Jan 2022 19:12:18 -0800
Subject: [PATCH 17/40] typed host catalog init

---
 ui/admin/app/components/form/host-catalog/aws/index.hbs   | 2 +-
 ui/admin/app/components/form/host-catalog/azure/index.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index d4a50149c..b9990fda4 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -1 +1 @@
-AWS Form
\ No newline at end of file
+AWS Form
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 2c7cb5293..0dea00f73 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -1 +1 @@
-Azure Form
\ No newline at end of file
+Azure Form

From 043b760cd67397c42cc668b4fb2edf3f5431f485 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Fri, 28 Jan 2022 00:01:17 -0800
Subject: [PATCH 18/40] more updates

---
 ui/admin/app/components/form/host-catalog/plugin/index.hbs | 2 ++
 ui/admin/app/components/form/host-catalog/static/index.hbs | 3 ++-
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 ui/admin/app/components/form/host-catalog/plugin/index.hbs

diff --git a/ui/admin/app/components/form/host-catalog/plugin/index.hbs b/ui/admin/app/components/form/host-catalog/plugin/index.hbs
new file mode 100644
index 000000000..0191a0174
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/plugin/index.hbs
@@ -0,0 +1,2 @@
+THIS IS DYNAINC
+{{{log @model 'NAMEEEE'}}}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 42c75e421..bad64bf24 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -1,3 +1,4 @@
+STATIC {{{log 'STATTTTTIC' @model}}}
 <Rose::Form
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
@@ -21,7 +22,7 @@
         {{/each}}
       </field.errors>
     {{/if}}
-  </form.input>
+  </form.input> --}}
 
   <form.textarea
     @name='description'
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 49a4a69da..62ed87dfc 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -24,7 +24,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
-    if (!params.type) params.type = 'static';
+    if (!params.type) params.type = 'plugin';
     return this.store.createRecord('host-catalog', {
       compositeType: params.type, //static or aws or azure
       scopeModel,

From 1e80414b329d223c5c5754099203a03674547eee Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Fri, 28 Jan 2022 08:53:16 -0800
Subject: [PATCH 19/40] unknown type

---
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 62ed87dfc..f299f980c 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -25,6 +25,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
     if (!params.type) params.type = 'plugin';
+    params.name = 'Avon';
     return this.store.createRecord('host-catalog', {
       compositeType: params.type, //static or aws or azure
       scopeModel,

From 73566b0583f3475271fd2c31909fb763071f826d Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Fri, 28 Jan 2022 17:27:59 -0800
Subject: [PATCH 20/40] show provider info when dynamic is selected

---
 ui/admin/app/components/form/host-catalog/plugin/index.hbs | 2 --
 ui/admin/app/components/form/host-catalog/static/index.hbs | 3 +--
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js      | 3 +--
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 ui/admin/app/components/form/host-catalog/plugin/index.hbs

diff --git a/ui/admin/app/components/form/host-catalog/plugin/index.hbs b/ui/admin/app/components/form/host-catalog/plugin/index.hbs
deleted file mode 100644
index 0191a0174..000000000
--- a/ui/admin/app/components/form/host-catalog/plugin/index.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-THIS IS DYNAINC
-{{{log @model 'NAMEEEE'}}}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index bad64bf24..42c75e421 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -1,4 +1,3 @@
-STATIC {{{log 'STATTTTTIC' @model}}}
 <Rose::Form
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
@@ -22,7 +21,7 @@ STATIC {{{log 'STATTTTTIC' @model}}}
         {{/each}}
       </field.errors>
     {{/if}}
-  </form.input> --}}
+  </form.input>
 
   <form.textarea
     @name='description'
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index f299f980c..49a4a69da 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -24,8 +24,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   model(params) {
     const scopeModel = this.modelFor('scopes.scope');
-    if (!params.type) params.type = 'plugin';
-    params.name = 'Avon';
+    if (!params.type) params.type = 'static';
     return this.store.createRecord('host-catalog', {
       compositeType: params.type, //static or aws or azure
       scopeModel,

From fdef23de89293970c337a8de2a780969c8f54a7a Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 31 Jan 2022 13:16:03 -0800
Subject: [PATCH 21/40] rebase main

---
 addons/api/addon/models/host-catalog.js            | 14 +-------------
 ui/admin/app/components/form/auth-method/index.hbs |  4 +---
 .../app/components/form/host-catalog/index.hbs     |  8 ++------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/addons/api/addon/models/host-catalog.js b/addons/api/addon/models/host-catalog.js
index 33fce7bc7..ec34b50e3 100644
--- a/addons/api/addon/models/host-catalog.js
+++ b/addons/api/addon/models/host-catalog.js
@@ -26,15 +26,7 @@ export default class HostCatalogModel extends GeneratedHostCatalogModel {
    * @type {boolean}
    */
   get isUnknown() {
-    console.log(this.isPlugin, 'IS IT PLUGIN', this.plugin, types);
-    // if(this.plugin === undefined) {
-    //   console.log('in USEFNNFNF')
-    //   return false;
-    // } else {
-    //   console.log('in ELSE EE')
-
-      return this.isPlugin && !types.includes(this.plugin.name);
-    // }
+    return this.isPlugin && !types.includes(this.plugin.name);
   }
 
   /**
@@ -59,8 +51,6 @@ export default class HostCatalogModel extends GeneratedHostCatalogModel {
    * @type {string}
    */
   get compositeType() {
-    console.log(this, this.isPlugin, 'WHAT IS PLUGNI');
-   // if(this.plugin === undefined) return 'static';
     if (this.isUnknown) return 'unknown';
     if (this.isPlugin) return this.plugin.name;
     return 'static';
@@ -75,9 +65,7 @@ export default class HostCatalogModel extends GeneratedHostCatalogModel {
       this.type = 'static';
     } else {
       this.type = 'plugin';
-     
       this.plugin = { name: type };
-      console.log('COMPOSITI' ,  this.plugin, type)
     }
   }
 }
diff --git a/ui/admin/app/components/form/auth-method/index.hbs b/ui/admin/app/components/form/auth-method/index.hbs
index 224c8006f..77cf37d4d 100644
--- a/ui/admin/app/components/form/auth-method/index.hbs
+++ b/ui/admin/app/components/form/auth-method/index.hbs
@@ -8,6 +8,4 @@
     addStringItem=@addStringItem
     addAccountClaimMapItem=@addAccountClaimMapItem
   }}
-{{/if}}
-
-{{{log @model 'mdelll'}}}
\ No newline at end of file
+{{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 1740712ef..35a4a94bd 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -1,8 +1,4 @@
-COMES JERE
-{{{log 'BLLL' @model.compositeType}}}
-{{{log 'NNFRM' @model.isNew}}}
-
-{{!-- {{#if @model.isNew}} --}}
+{{#if @model.isNew}}
 {{#if @model.compositeType}}
   {{component
     (concat 'form/host-catalog/' @model.compositeType)
@@ -10,5 +6,5 @@ COMES JERE
     submit=@submit
     cancel=@cancel
   }}
-{{!-- {{/if}} --}}
+{{/if}}
 {{/if}}

From 55acdc76b6abf595209f55781014dd7fcd075873 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Tue, 1 Feb 2022 11:12:33 -0800
Subject: [PATCH 22/40] move up component logic

---
 addons/core/translations/resources/en-us.yaml |   8 ++
 .../form/host-catalog/aws/index.hbs           | 130 +++++++++++++++++-
 .../form/host-catalog/azure/index.hbs         | 130 +++++++++++++++++-
 .../components/form/host-catalog/index.hbs    |  32 +++--
 .../app/components/form/host-catalog/index.js |  29 ++++
 .../form/host-catalog/static/index.hbs        |  40 +++++-
 .../form/host-catalog/static/index.js         |  26 ----
 .../scopes/scope/host-catalogs/new.js         |  16 +++
 .../routes/scopes/scope/host-catalogs/new.js  |   3 +-
 9 files changed, 370 insertions(+), 44 deletions(-)
 create mode 100644 ui/admin/app/components/form/host-catalog/index.js
 delete mode 100644 ui/admin/app/components/form/host-catalog/static/index.js

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 308161cb1..d7a3a1db3 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -89,6 +89,14 @@ host-catalog:
     unknown: Unknown
     aws: AWS
     azure: Azure
+    dynamic: Dynamic
+  form:
+    provider-details: Provider Details 
+    types:
+      static: 
+        help: Provide a list of hosts and host sets with static addresses
+      dynamic: 
+        help: Automate discovery of target hosts and services on Azure or AWS
 host-set:
   title: Host Set
   title_plural: Host Sets
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index b9990fda4..208468752 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -1 +1,129 @@
-AWS Form
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  as |form|
+>
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+  <form.fieldset>
+    <:title>{{t 'form.type.label'}}</:title>
+    <:body>
+      <form.radioGroup
+        @name='aws-types'
+        @changed={{@toggleType}}
+        @selectedValue='dynamic'
+        as |radioGroup|
+      >
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.static'}}
+          @value='static'
+          @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+          @layout='wide'
+        />
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.dynamic'}}
+          @value='dynamic'
+          @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+          @layout='wide'
+        />
+      </form.radioGroup>
+    </:body>
+  </form.fieldset>
+
+  {{#if @showDynamicPlugins}}
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:body>
+        <form.radioGroup
+          @name='aws-plugins'
+          @selectedValue={{@model.compositeType}}
+          @changed={{route-action 'changeType'}}
+          as |radioGroup|
+        >
+          <radioGroup.card
+            @label='AWS'
+            @value='aws'
+            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @layout='tile'
+          />
+          <radioGroup.card
+            @label='Azure'
+            @value='azure'
+            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @layout='tile'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
+  {{/if}}
+
+  <form.input
+    @name='Region'
+    @type='region'
+    @value='region'
+    @label='Region'
+    readonly={{false}}
+  />
+
+  <form.input
+    @name='accesskey'
+    @type='accesskey'
+    @value='accesskey'
+    @label='Access key ID'
+    readonly={{false}}
+  />
+
+  <form.input
+    @name='secretaccesskey'
+    @type='secretaccesskey'
+    @value='secretaccesskey'
+    @label='Secret Access Key'
+    readonly={{false}}
+  />
+
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
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 0dea00f73..208468752 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -1 +1,129 @@
-Azure Form
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  as |form|
+>
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+  <form.fieldset>
+    <:title>{{t 'form.type.label'}}</:title>
+    <:body>
+      <form.radioGroup
+        @name='aws-types'
+        @changed={{@toggleType}}
+        @selectedValue='dynamic'
+        as |radioGroup|
+      >
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.static'}}
+          @value='static'
+          @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+          @layout='wide'
+        />
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.dynamic'}}
+          @value='dynamic'
+          @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+          @layout='wide'
+        />
+      </form.radioGroup>
+    </:body>
+  </form.fieldset>
+
+  {{#if @showDynamicPlugins}}
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:body>
+        <form.radioGroup
+          @name='aws-plugins'
+          @selectedValue={{@model.compositeType}}
+          @changed={{route-action 'changeType'}}
+          as |radioGroup|
+        >
+          <radioGroup.card
+            @label='AWS'
+            @value='aws'
+            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @layout='tile'
+          />
+          <radioGroup.card
+            @label='Azure'
+            @value='azure'
+            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @layout='tile'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
+  {{/if}}
+
+  <form.input
+    @name='Region'
+    @type='region'
+    @value='region'
+    @label='Region'
+    readonly={{false}}
+  />
+
+  <form.input
+    @name='accesskey'
+    @type='accesskey'
+    @value='accesskey'
+    @label='Access key ID'
+    readonly={{false}}
+  />
+
+  <form.input
+    @name='secretaccesskey'
+    @type='secretaccesskey'
+    @value='secretaccesskey'
+    @label='Secret Access Key'
+    readonly={{false}}
+  />
+
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 35a4a94bd..d41b3749b 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -1,10 +1,24 @@
 {{#if @model.isNew}}
-{{#if @model.compositeType}}
-  {{component
-    (concat 'form/host-catalog/' @model.compositeType)
-    model=@model
-    submit=@submit
-    cancel=@cancel
-  }}
-{{/if}}
-{{/if}}
+  <div>{{@model.type}} {{@model.compositeType}}</div>
+  {{#if @model.isStatic}}
+    {{component
+      (concat 'form/host-catalog/' @model.compositeType)
+      model=@model
+      submit=@submit
+      cancel=@cancel
+      toggleType=this.toggleType
+      showDynamicPlugins=this.showDynamicPlugins
+    }}
+  {{/if}}
+
+  {{#if this.showDynamicPlugins}}
+    {{component
+      (concat 'form/host-catalog/' @model.compositeType)
+      model=@model
+      submit=@submit
+      cancel=@cancel
+      toggleType=this.toggleType
+      showDynamicPlugins=this.showDynamicPlugins
+    }}
+  {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/index.js b/ui/admin/app/components/form/host-catalog/index.js
new file mode 100644
index 000000000..ed49133db
--- /dev/null
+++ b/ui/admin/app/components/form/host-catalog/index.js
@@ -0,0 +1,29 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+
+export default class FormHostCatalogIndexComponent extends Component {
+  // =properties
+  /**
+  /**
+   */
+  @tracked showDynamicPlugins = false;
+  // =actions
+
+  @action
+  toggleType(type) {
+    this.renderDynamicPlugins(type);
+  }
+  //show dynamic type radio cards -> aws and azure if the type is dynamic
+  //call route action to update the query and rerender the model if static is selected
+  renderDynamicPlugins(type) {
+    if (type === 'dynamic') {
+      this.showDynamicPlugins = true;
+    } else {
+      this.showDynamicPlugins = false;
+      //CHECK:how to call the action to update query param
+      this.args.model.type = 'static';
+      this.args.changeType();
+    }
+  }
+}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 42c75e421..c3201cb81 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -43,9 +43,14 @@
     {{/if}}
   </form.textarea>
   <form.fieldset>
-    <:title>{{t 'resources.host-catalog.type'}}</:title>
+    <:title>{{t 'form.type.label'}}</:title>
     <:body>
-      <form.radioGroup @name='types' as |radioGroup|>
+      <form.radioGroup
+        @name='types'
+        @selectedValue={{@model.type}}
+        @changed={{@toggleType}}
+        as |radioGroup|
+      >
         <radioGroup.card
           @label={{t 'resources.host-catalog.types.static'}}
           @value='static'
@@ -61,6 +66,33 @@
       </form.radioGroup>
     </:body>
   </form.fieldset>
+
+  {{#if @showDynamicPlugins}}
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:body>
+        <form.radioGroup
+          @name='plugins'
+          @changed={{route-action 'changeType'}}
+          as |radioGroup|
+        >
+          <radioGroup.card
+            @label='AWS'
+            @value='aws'
+            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @layout='tile'
+          />
+          <radioGroup.card
+            @label='Azure'
+            @value='azure'
+            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @layout='tile'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
+  {{/if}}
+
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
@@ -69,6 +101,4 @@
       @cancelText={{t 'actions.cancel'}}
     />
   {{/if}}
-</Rose::Form>
-
-{{{log @model.compositeType 'compostite type'}}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/static/index.js b/ui/admin/app/components/form/host-catalog/static/index.js
deleted file mode 100644
index 8b55cf8b8..000000000
--- a/ui/admin/app/components/form/host-catalog/static/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Component from '@glimmer/component';
-import { options } from 'api/models/credential-library';
-import { computed, action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-
-export default class FormHostCatalogIndexComponent extends Component {
-  // =properties
-  /**
-  /**
-   */
-   @tracked showDynamicPlugins = false;
-  // =actions
-
-  @action
-  toggleType(type) {
-    this.renderDynamicPlugins(type);
-  }
-  renderDynamicPlugins(type) {
-   if(type === 'dynamic') {
-      this.showDynamicPlugins = true;
-   } else {
-    this.showDynamicPlugins = false;
-   }
- }
-
-}
diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
index 182b9c423..3b0c5b729 100644
--- a/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
@@ -1,7 +1,23 @@
 import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
 
 export default class ScopesScopeHostCatalogsNewController extends Controller {
   // =attributes
 
   queryParams = ['type'];
+  @tracked showDynamicPlugins = false;
+
+  @action
+  async toggleType(type) {
+    this.renderDynamicPlugins(type);
+  }
+
+  renderDynamicPlugins(type) {
+    if (type !== 'static') {
+      this.showDynamicPlugins = true;
+    } else {
+      this.showDynamicPlugins = false;
+    }
+  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 49a4a69da..53a2fea97 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -6,13 +6,12 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
   // =services
 
   @service router;
-
   // =attributes
 
   queryParams = {
     type: {
       refreshModel: true,
-      replace: true
+      replace: true,
     },
   };
 

From f7a2dd14e33636d5ad70d991d05347ce845415cf Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Tue, 1 Feb 2022 22:35:00 -0500
Subject: [PATCH 23/40] chore: Integrate compositetypes into route

---
 addons/api/addon/models/host-catalog.js       |  2 +-
 .../form/host-catalog/aws/index.hbs           | 74 +++++++++++-------
 .../form/host-catalog/azure/index.hbs         | 75 ++++++++++++-------
 .../components/form/host-catalog/index.hbs    | 58 ++++++++------
 .../app/components/form/host-catalog/index.js | 44 +++++------
 .../form/host-catalog/static/index.hbs        | 72 ++++++++++--------
 .../scopes/scope/host-catalogs/new.js         | 16 ----
 .../routes/scopes/scope/host-catalogs/new.js  | 18 ++---
 .../scopes/scope/host-catalogs/new.hbs        |  2 +-
 9 files changed, 205 insertions(+), 156 deletions(-)

diff --git a/addons/api/addon/models/host-catalog.js b/addons/api/addon/models/host-catalog.js
index ec34b50e3..08e1a7d82 100644
--- a/addons/api/addon/models/host-catalog.js
+++ b/addons/api/addon/models/host-catalog.js
@@ -26,7 +26,7 @@ export default class HostCatalogModel extends GeneratedHostCatalogModel {
    * @type {boolean}
    */
   get isUnknown() {
-    return this.isPlugin && !types.includes(this.plugin.name);
+    return this.isPlugin && !types.includes(this.plugin?.name);
   }
 
   /**
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 208468752..ca157a9f0 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -2,6 +2,8 @@
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
   @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
   <form.input
@@ -42,32 +44,33 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-  <form.fieldset>
-    <:title>{{t 'form.type.label'}}</:title>
-    <:body>
-      <form.radioGroup
-        @name='aws-types'
-        @changed={{@toggleType}}
-        @selectedValue='dynamic'
-        as |radioGroup|
-      >
-        <radioGroup.card
-          @label={{t 'resources.host-catalog.types.static'}}
-          @value='static'
-          @helperText={{t 'resources.host-catalog.form.types.static.help'}}
-          @layout='wide'
-        />
-        <radioGroup.card
-          @label={{t 'resources.host-catalog.types.dynamic'}}
-          @value='dynamic'
-          @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
-          @layout='wide'
-        />
-      </form.radioGroup>
-    </:body>
-  </form.fieldset>
+  
+  {{#if @model.isNew}}
+    <form.fieldset>
+      <:title>{{t 'form.type.label'}}</:title>
+      <:body>
+        <form.radioGroup
+          @name='types'
+          @selectedValue={{@model.type}}
+          @changed={{route-action 'changeType'}}
+          as |radioGroup|
+        >
+          <radioGroup.card
+            @label={{t 'resources.host-catalog.types.static'}}
+            @value='static'
+            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @layout='wide'
+          />
+          <radioGroup.card
+            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @value='plugin'
+            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @layout='wide'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
 
-  {{#if @showDynamicPlugins}}
     <form.fieldset>
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
@@ -92,13 +95,32 @@
         </form.radioGroup>
       </:body>
     </form.fieldset>
+  {{else}}
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:body>
+        <form.radioGroup
+          @name='aws-plugin'
+          @selectedValue={{@model.compositeType}}
+          @disabled={{true}}
+          as |radioGroup|
+        >
+          <radioGroup.card
+            @label='AWS'
+            @value='aws'
+            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @layout='tile'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
   {{/if}}
 
   <form.input
     @name='Region'
     @type='region'
     @value='region'
-    @label='Region'
+    @label='AWS Region'
     readonly={{false}}
   />
 
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 208468752..80b9f9275 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -2,6 +2,9 @@
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
   @disabled={{@model.isSaving}}
+  @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
   <form.input
@@ -42,32 +45,33 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-  <form.fieldset>
-    <:title>{{t 'form.type.label'}}</:title>
-    <:body>
-      <form.radioGroup
-        @name='aws-types'
-        @changed={{@toggleType}}
-        @selectedValue='dynamic'
-        as |radioGroup|
-      >
-        <radioGroup.card
-          @label={{t 'resources.host-catalog.types.static'}}
-          @value='static'
-          @helperText={{t 'resources.host-catalog.form.types.static.help'}}
-          @layout='wide'
-        />
-        <radioGroup.card
-          @label={{t 'resources.host-catalog.types.dynamic'}}
-          @value='dynamic'
-          @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
-          @layout='wide'
-        />
-      </form.radioGroup>
-    </:body>
-  </form.fieldset>
+  
+  {{#if @model.isNew}}
+    <form.fieldset>
+      <:title>{{t 'form.type.label'}}</:title>
+      <:body>
+        <form.radioGroup
+          @name='types'
+          @selectedValue={{@model.type}}
+          @changed={{route-action 'changeType'}}
+          as |radioGroup|
+        >
+          <radioGroup.card
+            @label={{t 'resources.host-catalog.types.static'}}
+            @value='static'
+            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @layout='wide'
+          />
+          <radioGroup.card
+            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @value='plugin'
+            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @layout='wide'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
 
-  {{#if @showDynamicPlugins}}
     <form.fieldset>
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
@@ -92,13 +96,32 @@
         </form.radioGroup>
       </:body>
     </form.fieldset>
+  {{else}}
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:body>
+        <form.radioGroup
+          @name='azure-plugin'
+          @selectedValue={{@model.compositeType}}
+          @disabled={{true}}
+          as |radioGroup|
+        >
+          <radioGroup.card
+            @label='Azure'
+            @value='azure'
+            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @layout='tile'
+          />
+        </form.radioGroup>
+      </:body>
+    </form.fieldset>
   {{/if}}
 
   <form.input
     @name='Region'
     @type='region'
     @value='region'
-    @label='Region'
+    @label='Azure Region'
     readonly={{false}}
   />
 
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index d41b3749b..39a9d270c 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -1,24 +1,38 @@
-{{#if @model.isNew}}
-  <div>{{@model.type}} {{@model.compositeType}}</div>
-  {{#if @model.isStatic}}
-    {{component
-      (concat 'form/host-catalog/' @model.compositeType)
-      model=@model
-      submit=@submit
-      cancel=@cancel
-      toggleType=this.toggleType
-      showDynamicPlugins=this.showDynamicPlugins
-    }}
-  {{/if}}
+{{component
+    (concat 'form/host-catalog/' @model.compositeType)
+    model=@model
+    submit=@submit
+    cancel=@cancel
+    changeType=@changeType
+  }}
 
-  {{#if this.showDynamicPlugins}}
-    {{component
-      (concat 'form/host-catalog/' @model.compositeType)
-      model=@model
-      submit=@submit
-      cancel=@cancel
-      toggleType=this.toggleType
-      showDynamicPlugins=this.showDynamicPlugins
-    }}
+{{!-- {{#if @model.isStatic}}
+  {{component
+    (concat 'form/host-catalog/' @model.type)
+    model=@model
+    submit=@submit
+    cancel=@cancel
+    form=form
+    toggleType=this.toggleType
+    showDynamicPlugins=this.showDynamicPlugins
+  }}
+{{else if @model.isPlugin}}
+  Model is plugin
+  {{#if @model.isAWS}}
+    Model is Aws
+  {{else if @model.isAzure}}
+    Model is Azure
   {{/if}}
-{{/if}}
\ No newline at end of file
+{{/if}} --}}
+
+{{!-- {{#if @model.type}}
+  {{component
+    (concat 'form/auth-method/' @model.type)
+    model=@model
+    submit=@submit
+    cancel=@cancel
+    removeItemByIndex=@removeItemByIndex
+    addStringItem=@addStringItem
+    addAccountClaimMapItem=@addAccountClaimMapItem
+  }}
+{{/if}} --}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/index.js b/ui/admin/app/components/form/host-catalog/index.js
index ed49133db..f6ac0ba23 100644
--- a/ui/admin/app/components/form/host-catalog/index.js
+++ b/ui/admin/app/components/form/host-catalog/index.js
@@ -3,27 +3,27 @@ import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 
 export default class FormHostCatalogIndexComponent extends Component {
-  // =properties
-  /**
-  /**
-   */
-  @tracked showDynamicPlugins = false;
-  // =actions
+  // // =properties
+  // /**
+  // /**
+  //  */
+  // @tracked showDynamicPlugins = false;
+  // // =actions
 
-  @action
-  toggleType(type) {
-    this.renderDynamicPlugins(type);
-  }
-  //show dynamic type radio cards -> aws and azure if the type is dynamic
-  //call route action to update the query and rerender the model if static is selected
-  renderDynamicPlugins(type) {
-    if (type === 'dynamic') {
-      this.showDynamicPlugins = true;
-    } else {
-      this.showDynamicPlugins = false;
-      //CHECK:how to call the action to update query param
-      this.args.model.type = 'static';
-      this.args.changeType();
-    }
-  }
+  // @action
+  // toggleType(type) {
+  //   this.renderDynamicPlugins(type);
+  // }
+  // //show dynamic type radio cards -> aws and azure if the type is dynamic
+  // //call route action to update the query and rerender the model if static is selected
+  // renderDynamicPlugins(type) {
+  //   if (type === 'dynamic') {
+  //     this.showDynamicPlugins = true;
+  //   } else {
+  //     this.showDynamicPlugins = false;
+  //     //CHECK:how to call the action to update query param
+  //     // this.args.model.type = 'static';
+  //     // this.args.changeType();
+  //   }
+  // }
 }
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 960ed5e2b..b0b607602 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -2,6 +2,8 @@
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
   @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
   <form.input
@@ -42,55 +44,59 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-  <form.fieldset>
-    <:title>{{t 'form.type.label'}}</:title>
-    <:body>
-      <form.radioGroup
-        @name='types'
-        @selectedValue={{@model.type}}
-        @changed={{@toggleType}}
-        as |radioGroup|
-      >
-        <radioGroup.card
-          @label={{t 'resources.host-catalog.types.static'}}
-          @value='static'
-          @helperText={{t 'resources.host-catalog.form.types.static.help'}}
-          @layout='wide'
-        />
-        <radioGroup.card
-          @label={{t 'resources.host-catalog.types.dynamic'}}
-          @value='dynamic'
-          @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
-          @layout='wide'
-        />
-      </form.radioGroup>
-    </:body>
-  </form.fieldset>
 
-  {{#if @showDynamicPlugins}}
+  {{#if @model.isNew}}
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='plugins'
+          @name='types'
+          @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
         >
           <radioGroup.card
-            @label='AWS'
-            @value='aws'
+            @label={{t 'resources.host-catalog.types.static'}}
+            @value='static'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
-            @layout='tile'
+            @layout='wide'
           />
           <radioGroup.card
-            @label='Azure'
-            @value='azure'
+            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @value='plugin'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
-            @layout='tile'
+            @layout='wide'
           />
         </form.radioGroup>
       </:body>
     </form.fieldset>
+
+    {{#if @model.isPlugin}}
+      <form.fieldset>
+        <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+        <:body>
+          <form.radioGroup
+            @name='aws-plugins'
+            @selectedValue={{@model.compositeType}}
+            @changed={{route-action 'changeType'}}
+            as |radioGroup|
+          >
+            <radioGroup.card
+              @label='AWS'
+              @value='aws'
+              @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+              @layout='tile'
+            />
+            <radioGroup.card
+              @label='Azure'
+              @value='azure'
+              @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+              @layout='tile'
+            />
+          </form.radioGroup>
+        </:body>
+      </form.fieldset>
+    {{/if}}
   {{/if}}
 
   {{#if (can 'save model' @model)}}
diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
index 3b0c5b729..182b9c423 100644
--- a/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/new.js
@@ -1,23 +1,7 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 
 export default class ScopesScopeHostCatalogsNewController extends Controller {
   // =attributes
 
   queryParams = ['type'];
-  @tracked showDynamicPlugins = false;
-
-  @action
-  async toggleType(type) {
-    this.renderDynamicPlugins(type);
-  }
-
-  renderDynamicPlugins(type) {
-    if (type !== 'static') {
-      this.showDynamicPlugins = true;
-    } else {
-      this.showDynamicPlugins = false;
-    }
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 53a2fea97..fef70cf13 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -6,12 +6,12 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
   // =services
 
   @service router;
+
   // =attributes
 
   queryParams = {
     type: {
       refreshModel: true,
-      replace: true,
     },
   };
 
@@ -21,17 +21,13 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    * Creates a new unsaved host catalog belonging to the current scope.
    * @return {HostCatalogModel}
    */
-  model(params) {
+  model() {
     const scopeModel = this.modelFor('scopes.scope');
-    if (!params.type) params.type = 'static';
-    return this.store.createRecord('host-catalog', {
-      compositeType: params.type, //static or aws or azure
-      scopeModel,
-    });
+    return this.store.createRecord('host-catalog', { scopeModel });
   }
 
-  afterModel(model) {
-    this.router.replaceWith({ queryParams: { type: model.compositeType } });
+  afterModel(model, transition) {
+    this.changeType(transition.to.queryParams?.type);
   }
 
   /**
@@ -40,6 +36,10 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
    */
   @action
   async changeType(type) {
+    const model = this.modelFor('scopes.scope.host-catalogs.new');
+    if(!type) type = 'static'; // Unknown host catalog type defaults to 'static'
+    if (model.isUnknown) type = 'aws'; //Is this the default case for plugin type?
+    model.compositeType = type;
     await this.router.replaceWith({ queryParams: { type } });
   }
 }
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
index 983c1e86f..210eec22c 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -18,7 +18,7 @@
       @model={{@model}}
       @submit={{route-action 'save' @model}}
       @cancel={{route-action 'cancel' @model}}
-      @changeType={{route-action 'changeType' @model.type}}
+      @changeType={{route-action 'changeType' @model}}
     />
   </page.body>
 

From 096b7ea1424f890d1b7d7d043ec390b13e1e709d Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 2 Feb 2022 11:05:48 -0800
Subject: [PATCH 24/40] remove unused file, lint

---
 .../form/host-catalog/aws/index.hbs           |  2 +-
 .../form/host-catalog/azure/index.hbs         |  3 +-
 .../components/form/host-catalog/index.hbs    | 12 ++++----
 .../app/components/form/host-catalog/index.js | 29 -------------------
 .../form/host-catalog/static/index.hbs        |  2 +-
 .../routes/scopes/scope/host-catalogs/new.js  |  2 +-
 6 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 ui/admin/app/components/form/host-catalog/index.js

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index ca157a9f0..537e2589d 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -44,7 +44,7 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-  
+
   {{#if @model.isNew}}
     <form.fieldset>
       <:title>{{t 'form.type.label'}}</:title>
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 80b9f9275..de9e492aa 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -2,7 +2,6 @@
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
   @disabled={{@model.isSaving}}
-  @disabled={{@model.isSaving}}
   @error={{@model.errors.base}}
   @showEditToggle={{if @model.isNew false true}}
   as |form|
@@ -45,7 +44,7 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-  
+
   {{#if @model.isNew}}
     <form.fieldset>
       <:title>{{t 'form.type.label'}}</:title>
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 39a9d270c..def897e50 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -1,10 +1,10 @@
 {{component
-    (concat 'form/host-catalog/' @model.compositeType)
-    model=@model
-    submit=@submit
-    cancel=@cancel
-    changeType=@changeType
-  }}
+  (concat 'form/host-catalog/' @model.compositeType)
+  model=@model
+  submit=@submit
+  cancel=@cancel
+  changeType=@changeType
+}}
 
 {{!-- {{#if @model.isStatic}}
   {{component
diff --git a/ui/admin/app/components/form/host-catalog/index.js b/ui/admin/app/components/form/host-catalog/index.js
deleted file mode 100644
index f6ac0ba23..000000000
--- a/ui/admin/app/components/form/host-catalog/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-
-export default class FormHostCatalogIndexComponent extends Component {
-  // // =properties
-  // /**
-  // /**
-  //  */
-  // @tracked showDynamicPlugins = false;
-  // // =actions
-
-  // @action
-  // toggleType(type) {
-  //   this.renderDynamicPlugins(type);
-  // }
-  // //show dynamic type radio cards -> aws and azure if the type is dynamic
-  // //call route action to update the query and rerender the model if static is selected
-  // renderDynamicPlugins(type) {
-  //   if (type === 'dynamic') {
-  //     this.showDynamicPlugins = true;
-  //   } else {
-  //     this.showDynamicPlugins = false;
-  //     //CHECK:how to call the action to update query param
-  //     // this.args.model.type = 'static';
-  //     // this.args.changeType();
-  //   }
-  // }
-}
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index b0b607602..50adcf87f 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -107,4 +107,4 @@
       @cancelText={{t 'actions.cancel'}}
     />
   {{/if}}
-</Rose::Form>
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index fef70cf13..40cf6f01a 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -37,7 +37,7 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
   @action
   async changeType(type) {
     const model = this.modelFor('scopes.scope.host-catalogs.new');
-    if(!type) type = 'static'; // Unknown host catalog type defaults to 'static'
+    if (!type) type = 'static'; // Unknown host catalog type defaults to 'static'
     if (model.isUnknown) type = 'aws'; //Is this the default case for plugin type?
     model.compositeType = type;
     await this.router.replaceWith({ queryParams: { type } });

From bd5a7c0aa91d6991e69cf425355da2d4c5407870 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 2 Feb 2022 12:09:13 -0800
Subject: [PATCH 25/40] pull from int branch

---
 .../app/components/form/host-catalog/aws/index.hbs   |  4 ++--
 .../app/components/form/host-catalog/azure/index.hbs | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 537e2589d..d00fa198b 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -124,7 +124,7 @@
     readonly={{false}}
   />
 
-  <form.input
+  {{!-- <form.input
     @name='accesskey'
     @type='accesskey'
     @value='accesskey'
@@ -138,7 +138,7 @@
     @value='secretaccesskey'
     @label='Secret Access Key'
     readonly={{false}}
-  />
+  /> --}}
 
   {{#if (can 'save model' @model)}}
     <form.actions
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 de9e492aa..3bfc74531 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -117,14 +117,14 @@
   {{/if}}
 
   <form.input
-    @name='Region'
-    @type='region'
-    @value='region'
-    @label='Azure Region'
+    @name='tenant_id'
+    @type='tenant_id'
+    @value='tenant_id'
+    @label='Tenant ID'
     readonly={{false}}
   />
 
-  <form.input
+  {{!-- <form.input
     @name='accesskey'
     @type='accesskey'
     @value='accesskey'
@@ -138,7 +138,7 @@
     @value='secretaccesskey'
     @label='Secret Access Key'
     readonly={{false}}
-  />
+  /> --}}
 
   {{#if (can 'save model' @model)}}
     <form.actions

From aed6efe565c73ee92fab4cb9ee8cae41fde58eaa Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 2 Feb 2022 14:39:08 -0800
Subject: [PATCH 26/40] add translations

---
 addons/core/translations/form/en-us.yaml      | 10 ++++++
 .../form/host-catalog/aws/index.hbs           | 30 +++++------------
 .../form/host-catalog/azure/index.hbs         | 31 ++++++-----------
 .../components/form/host-catalog/index.hbs    | 33 +------------------
 .../form/host-catalog/static/index.hbs        |  5 +--
 5 files changed, 33 insertions(+), 76 deletions(-)

diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 05105fbac..87beceb23 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -118,3 +118,13 @@ callback_url:
 filter:
   label: Filter
   help: A boolean expression defining a filter run against the provided information.
+tenant_id: 
+  label: Tenant ID
+subscription_id:
+  label: Subscription ID
+access_key_id:
+  label: Access Key ID
+secret_access_key:
+  label: Secret Access Key
+region: 
+  label: Region
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index d00fa198b..f9f02515f 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -13,6 +13,7 @@
     @label={{t 'form.name.label'}}
     @helperText={{t 'form.name.help'}}
     @error={{@model.errors.name}}
+    disabled={{@model.isSaving}}
     readonly={{false}}
     as |field|
   >
@@ -81,16 +82,18 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='AWS'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label='Azure'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/azure-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -106,10 +109,11 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='AWS'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/aws-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -119,27 +123,11 @@
   <form.input
     @name='Region'
     @type='region'
-    @value='region'
-    @label='AWS Region'
+    @value={{@model.region}}
+    @label={{t 'form.region.label'}}
     readonly={{false}}
   />
 
-  {{!-- <form.input
-    @name='accesskey'
-    @type='accesskey'
-    @value='accesskey'
-    @label='Access key ID'
-    readonly={{false}}
-  />
-
-  <form.input
-    @name='secretaccesskey'
-    @type='secretaccesskey'
-    @value='secretaccesskey'
-    @label='Secret Access Key'
-    readonly={{false}}
-  /> --}}
-
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
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 3bfc74531..b4a9d4713 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -13,6 +13,7 @@
     @label={{t 'form.name.label'}}
     @helperText={{t 'form.name.help'}}
     @error={{@model.errors.name}}
+    disabled={{@model.isSaving}}
     readonly={{false}}
     as |field|
   >
@@ -81,16 +82,18 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='AWS'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label='Azure'
+            @label={{t 'resources.host-catalog.form.types.azure'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/azure-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -106,10 +109,11 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='Azure'
+            @label={{t 'resources.host-catalog.form.types.azure'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/azure-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -119,27 +123,11 @@
   <form.input
     @name='tenant_id'
     @type='tenant_id'
-    @value='tenant_id'
-    @label='Tenant ID'
+    @value={{@model.tenant_id}}
+    @label={{t 'form.tenant_id.label'}}
     readonly={{false}}
   />
 
-  {{!-- <form.input
-    @name='accesskey'
-    @type='accesskey'
-    @value='accesskey'
-    @label='Access key ID'
-    readonly={{false}}
-  />
-
-  <form.input
-    @name='secretaccesskey'
-    @type='secretaccesskey'
-    @value='secretaccesskey'
-    @label='Secret Access Key'
-    readonly={{false}}
-  /> --}}
-
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
@@ -148,4 +136,5 @@
       @cancelText={{t 'actions.cancel'}}
     />
   {{/if}}
+
 </Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index def897e50..90cebebc9 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -4,35 +4,4 @@
   submit=@submit
   cancel=@cancel
   changeType=@changeType
-}}
-
-{{!-- {{#if @model.isStatic}}
-  {{component
-    (concat 'form/host-catalog/' @model.type)
-    model=@model
-    submit=@submit
-    cancel=@cancel
-    form=form
-    toggleType=this.toggleType
-    showDynamicPlugins=this.showDynamicPlugins
-  }}
-{{else if @model.isPlugin}}
-  Model is plugin
-  {{#if @model.isAWS}}
-    Model is Aws
-  {{else if @model.isAzure}}
-    Model is Azure
-  {{/if}}
-{{/if}} --}}
-
-{{!-- {{#if @model.type}}
-  {{component
-    (concat 'form/auth-method/' @model.type)
-    model=@model
-    submit=@submit
-    cancel=@cancel
-    removeItemByIndex=@removeItemByIndex
-    addStringItem=@addStringItem
-    addAccountClaimMapItem=@addAccountClaimMapItem
-  }}
-{{/if}} --}}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 50adcf87f..caac65a1d 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -13,6 +13,7 @@
     @label={{t 'form.name.label'}}
     @helperText={{t 'form.name.help'}}
     @error={{@model.errors.name}}
+    disabled={{@model.isSaving}}
     readonly={{false}}
     as |field|
   >
@@ -82,13 +83,13 @@
             as |radioGroup|
           >
             <radioGroup.card
-              @label='AWS'
+              @label={{t 'resources.host-catalog.form.types.aws'}}
               @value='aws'
               @helperText={{t 'resources.host-catalog.form.types.static.help'}}
               @layout='tile'
             />
             <radioGroup.card
-              @label='Azure'
+              @label={{t 'resources.host-catalog.form.types.azure'}}
               @value='azure'
               @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
               @layout='tile'

From aa51b6213424e42e1843f9c9c2ea481a908daa7e Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 2 Feb 2022 17:39:22 -0800
Subject: [PATCH 27/40] =?UTF-8?q?fix:=20=F0=9F=90=9B=20host=20catalog=20cr?=
 =?UTF-8?q?eation=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acceptance/host-catalogs/create-test.js   | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index b47b3b4ea..1cfafabe7 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -31,6 +31,8 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     hostCatalogs: null,
     hostCatalog: null,
     newHostCatalog: null,
+    newStaticHostCatalog: null,
+    newDynamicHostCatalog: null,
   };
 
   hooks.beforeEach(function () {
@@ -64,6 +66,8 @@ module('Acceptance | host-catalogs | create', function (hooks) {
 
     urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`;
     urls.newHostCatalog = `${urls.hostCatalogs}/new`;
+    urls.newStaticHostCatalog = `${urls.newHostCatalog}?type=static`;
+    urls.newDynamicHostCatalog = `${urls.newHostCatalog}?type=aws`;
     // Generate resource couner
     gethostCatalogCount = () =>
       this.server.schema.hostCatalogs.all().models.length;
@@ -71,11 +75,29 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     authenticateSession({});
   });
 
-  test('Users can create new host catalogs', async function (assert) {
+  test('Users can create new static host catalogs', async function (assert) {
     assert.expect(1);
     const count = gethostCatalogCount();
-    await visit(urls.newHostCatalog);
+    await visit(urls.newStaticHostCatalog);
+    console.log(
+      urls.newStaticHostCatalog,
+      'NEW HOST CATALOGG',
+      gethostCatalogCount()
+    );
     await fillIn('[name="name"]', 'random string');
+    await fillIn('[name="description"]', 'random string');
+    await fillIn('[name="types"]', 'static');
+    await click('[type="submit"]');
+    assert.equal(gethostCatalogCount(), count + 1);
+  });
+
+  test('Users can create new dynamic host catalogs', async function (assert) {
+    assert.expect(1);
+    const count = gethostCatalogCount();
+    await visit(urls.newDynamicHostCatalog);
+    await fillIn('[name="name"]', 'random string');
+    await fillIn('[name="description"]', 'random string');
+    await fillIn('[name="types"]', 'aws');
     await click('[type="submit"]');
     assert.equal(gethostCatalogCount(), count + 1);
   });
@@ -83,7 +105,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
   test('Users can cancel create new host catalogs', async function (assert) {
     assert.expect(2);
     const count = gethostCatalogCount();
-    await visit(urls.newHostCatalog);
+    await visit(urls.newStaticHostCatalog);
     await fillIn('[name="name"]', 'random string');
     await click('.rose-form-actions [type="button"]');
     assert.equal(currentURL(), urls.hostCatalogs);
@@ -111,7 +133,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
         'host-catalogs'
       ].includes('create')
     );
-    assert.notOk(find(`[href="${urls.newHostCatalog}"]`));
+    assert.notOk(find(`[href="${urls.newStaticHostCatalog}"]`));
   });
 
   test('saving a new host catalog with invalid fields displays error messages', async function (assert) {
@@ -135,7 +157,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
         }
       );
     });
-    await visit(urls.newHostCatalog);
+    await visit(urls.newStaticHostCatalog);
     await click('[type="submit"]');
     assert.ok(
       find('[role="alert"]').textContent.trim(),

From b3bde173bab2bca2a707d16aaaaca77d83720f48 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 2 Feb 2022 18:11:01 -0800
Subject: [PATCH 28/40] add missing translations

---
 ui/admin/app/components/form/host-catalog/aws/index.hbs    | 6 +++---
 ui/admin/app/components/form/host-catalog/azure/index.hbs  | 6 +++---
 ui/admin/app/components/form/host-catalog/static/index.hbs | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index f9f02515f..8a12ed1df 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -82,14 +82,14 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.form.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.form.types.aws'}}
+            @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
@@ -109,7 +109,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.form.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
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 b4a9d4713..bba300785 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -82,14 +82,14 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.form.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.form.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
@@ -109,7 +109,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.form.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index caac65a1d..12b4e4e41 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -83,13 +83,13 @@
             as |radioGroup|
           >
             <radioGroup.card
-              @label={{t 'resources.host-catalog.form.types.aws'}}
+              @label={{t 'resources.host-catalog.types.aws'}}
               @value='aws'
-              @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+              @helperText={{t 'resources.host-catalog.types.static.help'}}
               @layout='tile'
             />
             <radioGroup.card
-              @label={{t 'resources.host-catalog.form.types.azure'}}
+              @label={{t 'resources.host-catalog.types.azure'}}
               @value='azure'
               @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
               @layout='tile'

From 323945d76049e123d6b65a83c9e8d67479cdc0bc Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 2 Feb 2022 18:14:02 -0800
Subject: [PATCH 29/40] names

---
 ui/admin/app/components/form/host-catalog/azure/index.hbs  | 2 +-
 ui/admin/app/components/form/host-catalog/static/index.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 bba300785..b3e0bfbd6 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='types'
+          @name='azure-plugins'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 12b4e4e41..be34effa8 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='types'
+          @name='static-types'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|

From 8f11f2536bc66334ba291a5d0324747080af0904 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Thu, 3 Feb 2022 10:38:10 -0800
Subject: [PATCH 30/40] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20helper?=
 =?UTF-8?q?=20text,=20fix=20=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/components/form/host-catalog/aws/index.hbs    |  9 ++++-----
 .../app/components/form/host-catalog/azure/index.hbs  | 11 ++++-------
 .../app/components/form/host-catalog/static/index.hbs |  7 +++----
 .../tests/acceptance/host-catalogs/create-test.js     |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 8a12ed1df..7b294e368 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -72,11 +72,13 @@
       </:body>
     </form.fieldset>
 
+    <Rose::Separator />
+
     <form.fieldset>
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws-plugins'
+          @name='aws_plugins'
           @selectedValue={{@model.compositeType}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -84,14 +86,12 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
           />
@@ -103,7 +103,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws-plugin'
+          @name='aws_plugin'
           @selectedValue={{@model.compositeType}}
           @disabled={{true}}
           as |radioGroup|
@@ -111,7 +111,6 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
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 b3e0bfbd6..bdf8e15c0 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='azure-plugins'
+          @name='azure_plugins'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -71,12 +71,12 @@
         </form.radioGroup>
       </:body>
     </form.fieldset>
-
+    <Rose::Separator />
     <form.fieldset>
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws-plugins'
+          @name='aws_plugins'
           @selectedValue={{@model.compositeType}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -84,14 +84,12 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
           />
@@ -103,7 +101,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='azure-plugin'
+          @name='azure_plugin'
           @selectedValue={{@model.compositeType}}
           @disabled={{true}}
           as |radioGroup|
@@ -111,7 +109,6 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
           />
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index be34effa8..232b63797 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='static-types'
+          @name='static_types'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -73,11 +73,12 @@
     </form.fieldset>
 
     {{#if @model.isPlugin}}
+      <Rose::Separator />
       <form.fieldset>
         <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
         <:body>
           <form.radioGroup
-            @name='aws-plugins'
+            @name='aws_plugins'
             @selectedValue={{@model.compositeType}}
             @changed={{route-action 'changeType'}}
             as |radioGroup|
@@ -85,13 +86,11 @@
             <radioGroup.card
               @label={{t 'resources.host-catalog.types.aws'}}
               @value='aws'
-              @helperText={{t 'resources.host-catalog.types.static.help'}}
               @layout='tile'
             />
             <radioGroup.card
               @label={{t 'resources.host-catalog.types.azure'}}
               @value='azure'
-              @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
               @layout='tile'
             />
           </form.radioGroup>
diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index 1cfafabe7..68cfd6599 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -86,7 +86,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     );
     await fillIn('[name="name"]', 'random string');
     await fillIn('[name="description"]', 'random string');
-    await fillIn('[name="types"]', 'static');
+    await fillIn('[name="static_types"]', 'static');
     await click('[type="submit"]');
     assert.equal(gethostCatalogCount(), count + 1);
   });

From d62a8afd3bccd5b37d1c01810a976277eff328c3 Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Thu, 3 Feb 2022 13:48:29 -0800
Subject: [PATCH 31/40] Update create-test.js

---
 ui/admin/tests/acceptance/host-catalogs/create-test.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index 68cfd6599..1f6fce2ff 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -79,11 +79,6 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     assert.expect(1);
     const count = gethostCatalogCount();
     await visit(urls.newStaticHostCatalog);
-    console.log(
-      urls.newStaticHostCatalog,
-      'NEW HOST CATALOGG',
-      gethostCatalogCount()
-    );
     await fillIn('[name="name"]', 'random string');
     await fillIn('[name="description"]', 'random string');
     await fillIn('[name="static_types"]', 'static');

From a1ac704649f4059a1fb276b526d1eda8bc46d280 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 10:32:13 -0800
Subject: [PATCH 32/40] =?UTF-8?q?chore:=20=F0=9F=A4=96=20update=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/components/form/host-catalog/aws/index.hbs    | 2 +-
 ui/admin/app/components/form/host-catalog/azure/index.hbs  | 4 ++--
 ui/admin/app/components/form/host-catalog/static/index.hbs | 4 ++--
 ui/admin/tests/acceptance/host-catalogs/create-test.js     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 7b294e368..8361e2e5b 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -78,7 +78,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws_plugins'
+          @name='aws_plugin'
           @selectedValue={{@model.compositeType}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
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 bdf8e15c0..34a402fad 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='azure_plugins'
+          @name='azure_plugin'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -76,7 +76,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws_plugins'
+          @name='aws_plugin'
           @selectedValue={{@model.compositeType}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 232b63797..e020a76dd 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='static_types'
+          @name='static_type'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -78,7 +78,7 @@
         <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
         <:body>
           <form.radioGroup
-            @name='aws_plugins'
+            @name='aws_plugin'
             @selectedValue={{@model.compositeType}}
             @changed={{route-action 'changeType'}}
             as |radioGroup|
diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index 68cfd6599..4a22b0156 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -86,7 +86,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     );
     await fillIn('[name="name"]', 'random string');
     await fillIn('[name="description"]', 'random string');
-    await fillIn('[name="static_types"]', 'static');
+    await fillIn('[name="static_type"]', 'static');
     await click('[type="submit"]');
     assert.equal(gethostCatalogCount(), count + 1);
   });

From 2f89d928b17c67635495901af5a7d87b5596072b Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 12:48:32 -0800
Subject: [PATCH 33/40] =?UTF-8?q?fix:=20=F0=9F=90=9B=20move=20out=20route-?=
 =?UTF-8?q?action=20from=20the=20components?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/components/form/host-catalog/aws/index.hbs    | 4 ++--
 ui/admin/app/components/form/host-catalog/azure/index.hbs  | 4 ++--
 ui/admin/app/components/form/host-catalog/static/index.hbs | 4 ++--
 ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 8361e2e5b..a50c29492 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -53,7 +53,7 @@
         <form.radioGroup
           @name='types'
           @selectedValue={{@model.type}}
-          @changed={{route-action 'changeType'}}
+          @changed={{@changeType}}
           as |radioGroup|
         >
           <radioGroup.card
@@ -80,7 +80,7 @@
         <form.radioGroup
           @name='aws_plugin'
           @selectedValue={{@model.compositeType}}
-          @changed={{route-action 'changeType'}}
+          @changed={{@changeType}}
           as |radioGroup|
         >
           <radioGroup.card
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 34a402fad..efd776336 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -53,7 +53,7 @@
         <form.radioGroup
           @name='azure_plugin'
           @selectedValue={{@model.type}}
-          @changed={{route-action 'changeType'}}
+          @changed={{@changeType}}
           as |radioGroup|
         >
           <radioGroup.card
@@ -78,7 +78,7 @@
         <form.radioGroup
           @name='aws_plugin'
           @selectedValue={{@model.compositeType}}
-          @changed={{route-action 'changeType'}}
+          @changed={{@changeType}}
           as |radioGroup|
         >
           <radioGroup.card
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index e020a76dd..b4d22150c 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -53,7 +53,7 @@
         <form.radioGroup
           @name='static_type'
           @selectedValue={{@model.type}}
-          @changed={{route-action 'changeType'}}
+          @changed={{@changeType}}
           as |radioGroup|
         >
           <radioGroup.card
@@ -80,7 +80,7 @@
           <form.radioGroup
             @name='aws_plugin'
             @selectedValue={{@model.compositeType}}
-            @changed={{route-action 'changeType'}}
+            @changed={{@changeType}}
             as |radioGroup|
           >
             <radioGroup.card
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
index 210eec22c..68fad6fd1 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -18,7 +18,7 @@
       @model={{@model}}
       @submit={{route-action 'save' @model}}
       @cancel={{route-action 'cancel' @model}}
-      @changeType={{route-action 'changeType' @model}}
+      @changeType={{route-action 'changeType'}}
     />
   </page.body>
 

From ab95378f6e6f4fdf3531f01a52721e451cf9924c Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 14:04:03 -0800
Subject: [PATCH 34/40] =?UTF-8?q?fix:=20=F0=9F=90=9B=20radioGroup=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/components/form/host-catalog/aws/index.hbs    | 4 ++--
 ui/admin/app/components/form/host-catalog/azure/index.hbs  | 6 +++---
 ui/admin/app/components/form/host-catalog/static/index.hbs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index a50c29492..dbe615370 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -78,7 +78,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws_plugin'
+          @name='provider'
           @selectedValue={{@model.compositeType}}
           @changed={{@changeType}}
           as |radioGroup|
@@ -103,7 +103,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws_plugin'
+          @name='provider'
           @selectedValue={{@model.compositeType}}
           @disabled={{true}}
           as |radioGroup|
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 efd776336..091b704c0 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='azure_plugin'
+          @name='provider'
           @selectedValue={{@model.type}}
           @changed={{@changeType}}
           as |radioGroup|
@@ -76,7 +76,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws_plugin'
+          @name='provider'
           @selectedValue={{@model.compositeType}}
           @changed={{@changeType}}
           as |radioGroup|
@@ -101,7 +101,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='azure_plugin'
+          @name='provider'
           @selectedValue={{@model.compositeType}}
           @disabled={{true}}
           as |radioGroup|
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index b4d22150c..306a3fed8 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -78,7 +78,7 @@
         <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
         <:body>
           <form.radioGroup
-            @name='aws_plugin'
+            @name='provider'
             @selectedValue={{@model.compositeType}}
             @changed={{@changeType}}
             as |radioGroup|

From 14838fc87ff0925b33578651e86efa8f3b20adb2 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 14:10:12 -0800
Subject: [PATCH 35/40] translation label fix

---
 addons/core/translations/resources/en-us.yaml              | 3 ++-
 ui/admin/app/components/form/host-catalog/aws/index.hbs    | 4 ++--
 ui/admin/app/components/form/host-catalog/azure/index.hbs  | 4 ++--
 ui/admin/app/components/form/host-catalog/static/index.hbs | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index d7a3a1db3..5cee71441 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -91,7 +91,8 @@ host-catalog:
     azure: Azure
     dynamic: Dynamic
   form:
-    provider-details: Provider Details 
+    provider-details: 
+      label: Provider Details
     types:
       static: 
         help: Provide a list of hosts and host sets with static addresses
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index dbe615370..683ea2569 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -75,7 +75,7 @@
     <Rose::Separator />
 
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
@@ -100,7 +100,7 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
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 091b704c0..449a1049b 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -73,7 +73,7 @@
     </form.fieldset>
     <Rose::Separator />
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
@@ -98,7 +98,7 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 306a3fed8..2d236acb3 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -75,7 +75,7 @@
     {{#if @model.isPlugin}}
       <Rose::Separator />
       <form.fieldset>
-        <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
+        <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
         <:body>
           <form.radioGroup
             @name='provider'

From aee519aa759e503ebf4921c0ada90922e7186105 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 14:21:52 -0800
Subject: [PATCH 36/40] lint fic

---
 ui/admin/app/components/form/host-catalog/aws/index.hbs   | 8 ++++++--
 ui/admin/app/components/form/host-catalog/azure/index.hbs | 8 ++++++--
 .../app/components/form/host-catalog/static/index.hbs     | 4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 683ea2569..c94fe1f24 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -75,7 +75,9 @@
     <Rose::Separator />
 
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
+      <:title>{{t
+          'resources.host-catalog.form.provider-details.label'
+        }}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
@@ -100,7 +102,9 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
+      <:title>{{t
+          'resources.host-catalog.form.provider-details.label'
+        }}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
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 449a1049b..ee9696527 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -73,7 +73,9 @@
     </form.fieldset>
     <Rose::Separator />
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
+      <:title>{{t
+          'resources.host-catalog.form.provider-details.label'
+        }}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
@@ -98,7 +100,9 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
+      <:title>{{t
+          'resources.host-catalog.form.provider-details.label'
+        }}</:title>
       <:body>
         <form.radioGroup
           @name='provider'
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 2d236acb3..10629e9db 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -75,7 +75,9 @@
     {{#if @model.isPlugin}}
       <Rose::Separator />
       <form.fieldset>
-        <:title>{{t 'resources.host-catalog.form.provider-details.label'}}</:title>
+        <:title>{{t
+            'resources.host-catalog.form.provider-details.label'
+          }}</:title>
         <:body>
           <form.radioGroup
             @name='provider'

From 00aa86cfb7f1c3abfd54670b34ebc2ca55c01a67 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 20:59:27 -0800
Subject: [PATCH 37/40] =?UTF-8?q?fix:=20=F0=9F=90=9B=20translation=20order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/translations/resources/en-us.yaml | 24 ++++++++++---------
 .../form/host-catalog/aws/index.hbs           | 18 +++++++-------
 .../form/host-catalog/azure/index.hbs         | 18 +++++++-------
 .../form/host-catalog/static/index.hbs        | 14 +++++------
 .../scopes/scope/host-catalogs/index.hbs      |  3 +++
 5 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 5cee71441..35e000970 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -85,19 +85,21 @@ host-catalog:
   actions:
     delete: Delete Host Catalog
   types:
-    static: Static
-    unknown: Unknown
-    aws: AWS
-    azure: Azure
-    dynamic: Dynamic
+    static:
+      label: Static
+      help: Provide a list of hosts and host sets with static addresses
+    unknown:
+      label: Unknown
+    aws:
+      label: AWS
+    azure:
+      label: Azure
+    dynamic: 
+      label: Dynamic
+      help: Automate discovery of target hosts and services on Azure or AWS
   form:
-    provider-details: 
+    provider_details: 
       label: Provider Details
-    types:
-      static: 
-        help: Provide a list of hosts and host sets with static addresses
-      dynamic: 
-        help: Automate discovery of target hosts and services on Azure or AWS
 host-set:
   title: Host Set
   title_plural: Host Sets
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index c94fe1f24..77dfc8a52 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -57,15 +57,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static'}}
+            @label={{t 'resources.host-catalog.types.static.label'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.types.static.help'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @label={{t 'resources.host-catalog.types.dynamic.label'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -76,7 +76,7 @@
 
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -86,13 +86,13 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws.label'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure.label'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
@@ -103,7 +103,7 @@
   {{else}}
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -113,7 +113,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws.label'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
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 ee9696527..286d87f93 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -57,15 +57,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static'}}
+            @label={{t 'resources.host-catalog.types.static.label'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.types.static.help'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @label={{t 'resources.host-catalog.types.dynamic.label'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -74,7 +74,7 @@
     <Rose::Separator />
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -84,13 +84,13 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws'}}
+            @label={{t 'resources.host-catalog.types.aws.label'}}
             @value='aws'
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure.label'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
@@ -101,7 +101,7 @@
   {{else}}
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider-details.label'
+          'resources.host-catalog.form.provider_details.label'
         }}</:title>
       <:body>
         <form.radioGroup
@@ -111,7 +111,7 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure'}}
+            @label={{t 'resources.host-catalog.types.azure.label'}}
             @value='azure'
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 10629e9db..548a66288 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -57,15 +57,15 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.static'}}
+            @label={{t 'resources.host-catalog.types.static.label'}}
             @value='static'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+            @helperText={{t 'resources.host-catalog.types.static.help'}}
             @layout='wide'
           />
           <radioGroup.card
-            @label={{t 'resources.host-catalog.types.dynamic'}}
+            @label={{t 'resources.host-catalog.types.dynamic.label'}}
             @value='plugin'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+            @helperText={{t 'resources.host-catalog.types.dynamic.help'}}
             @layout='wide'
           />
         </form.radioGroup>
@@ -76,7 +76,7 @@
       <Rose::Separator />
       <form.fieldset>
         <:title>{{t
-            'resources.host-catalog.form.provider-details.label'
+            'resources.host-catalog.form.provider_details.label'
           }}</:title>
         <:body>
           <form.radioGroup
@@ -86,12 +86,12 @@
             as |radioGroup|
           >
             <radioGroup.card
-              @label={{t 'resources.host-catalog.types.aws'}}
+              @label={{t 'resources.host-catalog.types.aws.label'}}
               @value='aws'
               @layout='tile'
             />
             <radioGroup.card
-              @label={{t 'resources.host-catalog.types.azure'}}
+              @label={{t 'resources.host-catalog.types.azure.label'}}
               @value='azure'
               @layout='tile'
             />
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
index f7def8b62..79e33a11c 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
@@ -62,6 +62,7 @@
                       (concat
                         'resources.host-catalog.types.'
                         hostCatalog.compositeType
+                        '.label'
                       )
                     }}
                   </Rose::Badge>
@@ -71,6 +72,7 @@
                       (concat
                         'resources.host-catalog.types.'
                         hostCatalog.compositeType
+                        '.label'
                       )
                     }}
                   </Rose::Badge>
@@ -86,6 +88,7 @@
                       (concat
                         'resources.host-catalog.types.'
                         hostCatalog.compositeType
+                        '.label'
                       )
                     }}
                   </Rose::Badge>

From 4559c1b650d82f6116fadd215ba1e7088e93e857 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 22:31:58 -0800
Subject: [PATCH 38/40] =?UTF-8?q?fix:=20=F0=9F=90=9B=20label=20and=20paddi?=
 =?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/translations/resources/en-us.yaml |  6 ++++-
 .../rose/components/form/_radio-card.scss     |  2 +-
 .../form/host-catalog/aws/index.hbs           | 16 +++++++++---
 .../form/host-catalog/azure/index.hbs         | 25 +++++++++++++++----
 .../form/host-catalog/static/index.hbs        | 12 +++++++--
 .../acceptance/host-catalogs/create-test.js   |  2 +-
 6 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 35e000970..27e3497c0 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -98,8 +98,12 @@ host-catalog:
       label: Dynamic
       help: Automate discovery of target hosts and services on Azure or AWS
   form:
-    provider_details: 
+    provider:
       label: Provider Details
+      description: This is the provider for this host catalog. The format of the host set filters are specific to each provider.
+      choose_a_provider: 
+        label: Choose a provider 
+        description: There are several built-in plugins for the most common providers. You can choose from on of the included plugins or use a custom plugin.
 host-set:
   title: Host Set
   title_plural: Host Sets
diff --git a/addons/rose/addon/styles/rose/components/form/_radio-card.scss b/addons/rose/addon/styles/rose/components/form/_radio-card.scss
index 5e8018b40..d8b69c896 100644
--- a/addons/rose/addon/styles/rose/components/form/_radio-card.scss
+++ b/addons/rose/addon/styles/rose/components/form/_radio-card.scss
@@ -61,7 +61,7 @@ $radio-svg: (
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  margin: $size-m $size-xs $size-xl 0;
+  margin: $size-m $size-xs $size-m 0;
 
   .radio-card-overlay {
     position: absolute;
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 77dfc8a52..d343e3cdd 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -73,11 +73,18 @@
     </form.fieldset>
 
     <Rose::Separator />
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+    </form.fieldset>
 
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
+          'resources.host-catalog.form.provider.choose_a_provider.label'
         }}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.choose_a_provider.description'
+        }}</:description>
+
       <:body>
         <form.radioGroup
           @name='provider'
@@ -102,9 +109,10 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
-        }}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.description'
+        }}</:description>
       <:body>
         <form.radioGroup
           @name='provider'
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 286d87f93..468416242 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -47,11 +47,15 @@
   </form.textarea>
 
   {{#if @model.isNew}}
+    {{!-- <form.label>{{t
+          'resources.host-catalog.form.provider.label'
+        }}</form.label> --}}
+
     <form.fieldset>
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='provider'
+          @name='types'
           @selectedValue={{@model.type}}
           @changed={{@changeType}}
           as |radioGroup|
@@ -72,10 +76,18 @@
       </:body>
     </form.fieldset>
     <Rose::Separator />
+
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+    </form.fieldset>
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
+          'resources.host-catalog.form.provider.choose_a_provider.label'
         }}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.choose_a_provider.description'
+        }}</:description>
+
       <:body>
         <form.radioGroup
           @name='provider'
@@ -99,10 +111,13 @@
       </:body>
     </form.fieldset>
   {{else}}
+
     <form.fieldset>
-      <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
-        }}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.description'
+        }}</:description>
+
       <:body>
         <form.radioGroup
           @name='provider'
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 548a66288..bc0ac2421 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='static_type'
+          @name='types'
           @selectedValue={{@model.type}}
           @changed={{@changeType}}
           as |radioGroup|
@@ -74,10 +74,18 @@
 
     {{#if @model.isPlugin}}
       <Rose::Separator />
+      <form.fieldset>
+        <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      </form.fieldset>
+
       <form.fieldset>
         <:title>{{t
-            'resources.host-catalog.form.provider_details.label'
+            'resources.host-catalog.form.provider.choose_a_provider.label'
           }}</:title>
+        <:description>{{t
+            'resources.host-catalog.form.provider.choose_a_provider.description'
+          }}</:description>
+
         <:body>
           <form.radioGroup
             @name='provider'
diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index 1dfd696e3..f07467f8e 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -81,7 +81,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     await visit(urls.newStaticHostCatalog);
     await fillIn('[name="name"]', 'random string');
     await fillIn('[name="description"]', 'random string');
-    await fillIn('[name="static_type"]', 'static');
+    await fillIn('[name="types"]', 'static');
     await click('[type="submit"]');
     assert.equal(gethostCatalogCount(), count + 1);
   });

From 92d7380f832c16ed8962626993f374661a991b78 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 8 Feb 2022 13:11:08 -0500
Subject: [PATCH 39/40] =?UTF-8?q?chore:=20=F0=9F=A4=96=20clean=20up=20unus?=
 =?UTF-8?q?ed=20new=20instances?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/routes/scopes/scope/host-catalogs/new.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 40cf6f01a..588ecac90 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -17,6 +17,14 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
 
   // =methods
 
+  /**
+   * Rollback/destroy any new, unsaved instances from this route before
+   * creating another.
+   */
+  beforeModel() {
+    if (this.currentModel?.isNew) this.currentModel.rollbackAttributes();
+  }
+
   /**
    * Creates a new unsaved host catalog belonging to the current scope.
    * @return {HostCatalogModel}

From 353a7f94ad40ffbc91e7423a7058a50e9c31990b Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Tue, 8 Feb 2022 10:30:11 -0800
Subject: [PATCH 40/40] =?UTF-8?q?test:=20=F0=9F=92=8D=20update=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acceptance/host-catalogs/create-test.js    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index f07467f8e..19fc1dd3d 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -97,7 +97,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     assert.equal(gethostCatalogCount(), count + 1);
   });
 
-  test('Users can cancel create new host catalogs', async function (assert) {
+  test('Users can cancel creation of new static host catalogs', async function (assert) {
     assert.expect(2);
     const count = gethostCatalogCount();
     await visit(urls.newStaticHostCatalog);
@@ -107,7 +107,17 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     assert.equal(gethostCatalogCount(), count);
   });
 
-  test('Users can navigate to new host catalogs route with proper authorization', async function (assert) {
+  test('Users can cancel creation of new dynamic host catalogs', async function (assert) {
+    assert.expect(2);
+    const count = gethostCatalogCount();
+    await visit(urls.newDynamicHostCatalog);
+    await fillIn('[name="name"]', 'random string');
+    await click('.rose-form-actions [type="button"]');
+    assert.equal(currentURL(), urls.hostCatalogs);
+    assert.equal(gethostCatalogCount(), count);
+  });
+
+  test('Users can navigate to new static host catalogs route with proper authorization', async function (assert) {
     assert.expect(2);
     await visit(urls.hostCatalogs);
     assert.ok(
@@ -118,7 +128,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     assert.ok(find(`[href="${urls.newHostCatalog}"]`));
   });
 
-  test('Users cannot navigate to new host catalogs route without proper authorization', async function (assert) {
+  test('Users cannot navigate to new static host catalogs route without proper authorization', async function (assert) {
     assert.expect(2);
     instances.scopes.project.authorized_collection_actions['host-catalogs'] =
       [];
@@ -131,7 +141,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     assert.notOk(find(`[href="${urls.newStaticHostCatalog}"]`));
   });
 
-  test('saving a new host catalog with invalid fields displays error messages', async function (assert) {
+  test('saving a new static host catalog with invalid fields displays error messages', async function (assert) {
     assert.expect(2);
     this.server.post('/host-catalogs', () => {
       return new Response(