diff --git a/ui/core/app/components/form/host-set/index.hbs b/ui/core/app/components/form/host-set/index.hbs
new file mode 100644
index 000000000..45adc26d0
--- /dev/null
+++ b/ui/core/app/components/form/host-set/index.hbs
@@ -0,0 +1,49 @@
+
+
+
+ {{#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}}
+
+
+
+
+
diff --git a/ui/core/app/router.js b/ui/core/app/router.js
index b0ef0cbf6..5494501f4 100644
--- a/ui/core/app/router.js
+++ b/ui/core/app/router.js
@@ -51,7 +51,9 @@ Router.map(function () {
this.route('host-catalogs', function() {
this.route('new');
this.route('host-catalog', { path: ':host_catalog_id' }, function() {
- this.route('host-sets');
+ this.route('host-sets', function() {
+ this.route('host-set', { path: ':host_set_id' }, function() {});
+ });
});
});
});
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js
index de945f71c..8ef0f103d 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs.js
@@ -6,6 +6,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsRoute extends Route {
// =services
+ @service intl;
@service notify;
// =methods
@@ -40,11 +41,13 @@ export default class ScopesScopeProjectsProjectHostCatalogsRoute extends Route {
*/
@action
async save(hostCatalog) {
+ const { isNew } = hostCatalog;
try {
await hostCatalog.save();
this.refresh();
- // TODO: replace with translated strings
- this.notify.success('Save succeeded.');
+ this.notify.success(
+ this.intl.t(isNew ? 'notify.create-success' : 'notify.save-success')
+ );
this.transitionTo('scopes.scope.projects.project.host-catalogs.host-catalog', hostCatalog);
} catch (error) {
// TODO: replace with translated strings
@@ -61,9 +64,8 @@ export default class ScopesScopeProjectsProjectHostCatalogsRoute extends Route {
try {
await project.destroyRecord();
this.refresh();
+ this.notify.success(this.intl.t('notify.delete-success'));
this.transitionTo('scopes.scope.projects.project.host-catalogs');
- // TODO: replace with translated strings
- this.notify.success('Deleted host catalog succesfully.');
} catch (error) {
// TODO: replace with translated strings
this.notify.error(error.message, { closeAfter: null });
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js
index d25608633..00768575f 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog.js
@@ -17,4 +17,31 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogRoute exte
});
}
+ /**
+ * Renders the host-catalog specific templates for header, navigation, and actions page sections.
+ * @override
+ * @param {object} controller
+ * @param {object} model
+ */
+ renderTemplate(controller, model) {
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog');
+
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog/-header', {
+ into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
+ outlet: 'header',
+ model: model
+ });
+
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog/-navigation', {
+ into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
+ outlet: 'navigation',
+ model: model
+ });
+
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog/-actions', {
+ into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
+ outlet: 'actions',
+ model: model
+ });
+ }
}
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
index c4440322e..f69de9f1a 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.js
@@ -1,8 +1,17 @@
import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsRoute extends Route {
+ // =services
+
+ @service intl;
+ @service notify;
+
+ // =methods
+
/**
- * Loads all host-sets under the current scope and host catalog.
+ * Loads all host-sets under the current host catalog and it's parent scope.
* @return {Promise{[HostSetModel]}}
*/
async model() {
@@ -10,4 +19,60 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsRo
const hostCatalogID = this.modelFor('scopes.scope.projects.project.host-catalogs.host-catalog').id;
return this.store.findAll('host-set', { adapterOptions: { scopeID, hostCatalogID } });
}
+
+ // =actions
+
+ /**
+ * Rollback changes on a host set.
+ * @param {HostSetModel} hostSet
+ */
+ @action
+ cancel(hostSet) {
+ hostSet.rollbackAttributes();
+ }
+
+ /**
+ * Handle save of a host set.
+ * @param {HostSetModel} hostSet
+ * @param {Event} e
+ */
+ @action
+ async save(hostSet) {
+ try {
+ await hostSet.save(this.adapterOptions());
+ this.refresh();
+ this.notify.success(this.intl.t('notify.save-success'));
+ this.transitionTo('scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.host-set', hostSet);
+ } catch (error) {
+ // TODO: replace with translated strings
+ this.notify.error(error.message, { closeAfter: null });
+ }
+ }
+
+ /**
+ * Delete host set in current scope and redirect to index.
+ * @param {HostSetModel} hostSet
+ */
+ @action
+ async delete(hostSet) {
+ try {
+ await hostSet.destroyRecord(this.adapterOptions());
+ this.refresh();
+ this.notify.success(this.intl.t('notify.delete-success'));
+ this.transitionTo('scopes.scope.projects.project.host-catalogs.host-catalog.host-sets');
+ } catch (error) {
+ // TODO: replace with translated strings
+ this.notify.error(error.message, { closeAfter: null });
+ }
+ }
+
+ /**
+ * Configure adapter options using current host catalog scope and it's parent project scope.
+ * @return {object}
+ */
+ adapterOptions() {
+ const scopeID = this.modelFor('scopes.scope.projects.project').id;
+ const hostCatalogID = this.modelFor('scopes.scope.projects.project.host-catalogs.host-catalog').id;
+ return { adapterOptions : { scopeID, hostCatalogID } };
+ }
}
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.js
new file mode 100644
index 000000000..66c552c4d
--- /dev/null
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.js
@@ -0,0 +1,47 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHostSetRoute extends Route {
+ // =methods
+
+ /**
+ * Load a host-set using current host-catalog and it's parent project scope.
+ * @param {object} params
+ * @param {string} params.host_set_id
+ * @return {HostSetModel}
+ */
+ async model({ host_set_id }) {
+ const { id: scopeID } = this.modelFor('scopes.scope.projects.project');
+ const hostCatalogID = this.modelFor('scopes.scope.projects.project.host-catalogs.host-catalog').id;
+ return this.store.findRecord('host-set', host_set_id, {
+ adapterOptions: { scopeID, hostCatalogID }
+ });
+ }
+
+ /**
+ * Renders the host-set specific templates for header, navigation, and action page sections.
+ * @override
+ * @param {object} controller
+ * @param {object} model
+ */
+ renderTemplate(controller, model) {
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets');
+
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header', {
+ into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
+ outlet: 'header',
+ model: model
+ });
+
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation', {
+ into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
+ outlet: 'navigation',
+ model: model
+ });
+
+ this.render('scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions', {
+ into: 'scopes/scope/projects/project/host-catalogs/host-catalog',
+ outlet: 'actions',
+ model: model
+ });
+ }
+}
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index.js
new file mode 100644
index 000000000..261452404
--- /dev/null
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index.js
@@ -0,0 +1,4 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsHostSetIndexRoute extends Route {
+}
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.js
new file mode 100644
index 000000000..dd0a311d8
--- /dev/null
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.js
@@ -0,0 +1,4 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostSetsIndexRoute extends Route {
+}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs
index 0b7c956db..e9bdb8c81 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs
@@ -5,30 +5,15 @@
- {{t "resources.host-catalog"}}
+ {{outlet "header"}}
-
-
- {{t 'actions.delete-host-catalog'}}
-
-
+ {{outlet "actions"}}
-
-
- {{t 'titles.details'}}
-
-
- {{t 'titles.host-sets'}}
-
-
+ {{outlet "navigation"}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
new file mode 100644
index 000000000..b905f8d7d
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-actions.hbs
@@ -0,0 +1,9 @@
+
+
+ {{t 'actions.delete-host-catalog'}}
+
+
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
new file mode 100644
index 000000000..82af78ffe
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs
@@ -0,0 +1 @@
+{{t "resources.host-catalog"}}
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-navigation.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-navigation.hbs
new file mode 100644
index 000000000..030326509
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-navigation.hbs
@@ -0,0 +1,8 @@
+
+
+ {{t 'titles.details'}}
+
+
+ {{t 'titles.host-sets'}}
+
+
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs
index 300abe57b..49966461b 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets.hbs
@@ -1,25 +1,3 @@
-
-
-
- {{t "form.label.name"}}
- {{t "form.label.type"}}
- {{t "form.label.id"}}
-
-
-
- {{#each @model as |hostSet|}}
-
-
- {{hostSet.displayName}}
- {{hostSet.description}}
-
-
- {{hostSet.type}}
-
-
- {{hostSet.id}}
-
-
- {{/each}}
-
-
\ No newline at end of file
+{{title (t "resources.host-sets")}}
+
+{{outlet}}
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs
new file mode 100644
index 000000000..9497cdee3
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-actions.hbs
@@ -0,0 +1,9 @@
+
+
+ {{t 'actions.delete-host-set'}}
+
+
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
new file mode 100644
index 000000000..ae86a8707
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-header.hbs
@@ -0,0 +1 @@
+{{t "resources.host-set"}}
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs
new file mode 100644
index 000000000..62f603a0b
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/-navigation.hbs
@@ -0,0 +1,5 @@
+
+
+ {{t 'titles.details'}}
+
+
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.hbs
new file mode 100644
index 000000000..e2147cab0
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set.hbs
@@ -0,0 +1 @@
+{{outlet}}
\ No newline at end of file
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index.hbs
new file mode 100644
index 000000000..ac0b64897
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index.hbs
@@ -0,0 +1,5 @@
+
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
new file mode 100644
index 000000000..d2cb5be5d
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
@@ -0,0 +1,30 @@
+
+
+
+ {{t "form.label.name"}}
+ {{t "form.label.type"}}
+ {{t "form.label.id"}}
+
+
+
+ {{#each @model as |hostSet|}}
+
+
+
+ {{hostSet.displayName}}
+
+ {{hostSet.description}}
+
+
+ {{hostSet.type}}
+
+
+ {{hostSet.id}}
+
+
+ {{/each}}
+
+
\ No newline at end of file
diff --git a/ui/core/mirage/serializers/host-set.js b/ui/core/mirage/serializers/host-set.js
new file mode 100644
index 000000000..fa67b50ba
--- /dev/null
+++ b/ui/core/mirage/serializers/host-set.js
@@ -0,0 +1,5 @@
+import ApplicationSerializer from './application';
+
+export default ApplicationSerializer.extend({
+ modelName: 'host-set'
+});
diff --git a/ui/core/tests/acceptance/host-sets-test.js b/ui/core/tests/acceptance/host-sets-test.js
index 4f398902f..d01bb6796 100644
--- a/ui/core/tests/acceptance/host-sets-test.js
+++ b/ui/core/tests/acceptance/host-sets-test.js
@@ -75,4 +75,28 @@ module('Acceptance | host sets', function (hooks) {
await a11yAudit();
assert.equal(currentURL(), urls.hostSets);
});
+
+ test('can navigate to a host set form', async function (assert) {
+ assert.expect(0);
+ });
+
+ test('can update a host set and save changes', async function (assert) {
+ assert.expect(0);
+ });
+
+ test('can update a host set and cancel changes', async function (assert) {
+ assert.expect(0);
+ });
+
+ test('errors are displayed when save on auth method fails', async function (assert) {
+ assert.expect(0);
+ });
+
+ test('errors are displayed when delete on a host set fails', async function (assert) {
+ assert.expect(0);
+ });
+
+ test('saving an existing auth method with invalid fields displays error messages', async function (assert) {
+ assert.expect(0);
+ });
});
diff --git a/ui/core/tests/integration/components/form/host-set-test.js b/ui/core/tests/integration/components/form/host-set-test.js
new file mode 100644
index 000000000..9797376cc
--- /dev/null
+++ b/ui/core/tests/integration/components/form/host-set-test.js
@@ -0,0 +1,23 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render, find } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | form/host-set', function(hooks) {
+ setupRenderingTest(hooks);
+
+ test('it renders', async function (assert) {
+ // Set any properties with this.set('myProperty', 'value');
+ // Handle any actions with this.set('myAction', function(val) { ... });
+ this.submit = () => {};
+ this.cancel = () => {};
+
+ await render(hbs`
+ `);
+
+ assert.ok(find('form'));
+ });
+});
diff --git a/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set-test.js b/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set-test.js
new file mode 100644
index 000000000..320e03551
--- /dev/null
+++ b/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set', function(hooks) {
+ setupTest(hooks);
+
+ test('it exists', function(assert) {
+ let route = this.owner.lookup('route:scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set');
+ assert.ok(route);
+ });
+});
diff --git a/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index-test.js b/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index-test.js
new file mode 100644
index 000000000..5f0b9420b
--- /dev/null
+++ b/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index', function(hooks) {
+ setupTest(hooks);
+
+ test('it exists', function(assert) {
+ let route = this.owner.lookup('route:scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/host-set/index');
+ assert.ok(route);
+ });
+});
diff --git a/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index-test.js b/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index-test.js
new file mode 100644
index 000000000..88f8a3f8b
--- /dev/null
+++ b/ui/core/tests/unit/routes/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index', function(hooks) {
+ setupTest(hooks);
+
+ test('it exists', function(assert) {
+ let route = this.owner.lookup('route:scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index');
+ assert.ok(route);
+ });
+});
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 31e60a02d..b274633f8 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -14,6 +14,7 @@ actions:
delete-role: Delete role
delete-project: Delete project
delete-host-catalog: Delete host catalog
+ delete-host-set: Delete host set
auth:
titles:
no-scopes: No Scopes Available
@@ -40,6 +41,7 @@ resources:
host-catalogs: Host Catalogs
auth-method: Auth Method
auth-methods: Auth Methods
+ host-set: Host Set
host-sets: Host Sets
titles:
iam: IAM