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'}}}
+=======
+
+ {{#if @model.errors.name}}
+
+ {{#each @model.errors.name as |error|}}
+ {{error.message}}
+ {{/each}}
+
+ {{/if}}
+
+
+
+ {{#if @model.errors.description}}
+
+ {{#each @model.errors.description as |error|}}
+ {{error.message}}
+ {{/each}}
+
+ {{/if}}
+
+
+ Place Radio Button Group Here
+
+ {{#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)}}
+
+ {{/if}}
+
+>>>>>>> 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}}
-{{{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,
});
}