diff --git a/addons/api/addon/adapters/host-set.js b/addons/api/addon/adapters/host-set.js
new file mode 100644
index 000000000..fbbe11495
--- /dev/null
+++ b/addons/api/addon/adapters/host-set.js
@@ -0,0 +1,38 @@
+import ApplicationAdapter from './application';
+import { inject as service } from '@ember/service';
+
+export default class HostSetAdapter extends ApplicationAdapter {
+
+ // =services
+
+ @service store;
+
+ // =methods
+
+ /**
+ * Append a host catalog URL ahead of the host sets path if `hostCatalogID` is
+ * passed via adapter options. Otherwise, generate the prefix as normal.
+ *
+ * TODO: generalize the interface to resource-prefixed URLs by accepting
+ * a modelName and an ID, rather than looking for a known key.
+ *
+ * @override
+ * @param {string} path
+ * @param {string} parentURL
+ * @param {string} modelName
+ * @param {string} id
+ * @param {object} snapshot
+ * @return {string} urlPrefix
+ */
+ urlPrefix(path, parentURL, modelName, id, snapshot) {
+ const hostCatalogID = snapshot?.adapterOptions?.hostCatalogID;
+ if (hostCatalogID) {
+ const hostCatalogAdapter = this.store.adapterFor('host-catalog');
+ return hostCatalogAdapter
+ ._buildPrefixedURL('host-catalog', hostCatalogID, snapshot);
+ } else {
+ return super.urlPrefix(...arguments);
+ }
+ }
+
+}
diff --git a/addons/api/addon/adapters/host.js b/addons/api/addon/adapters/host.js
new file mode 100644
index 000000000..ae1747b06
--- /dev/null
+++ b/addons/api/addon/adapters/host.js
@@ -0,0 +1,38 @@
+import ApplicationAdapter from './application';
+import { inject as service } from '@ember/service';
+
+export default class HostAdapter extends ApplicationAdapter {
+
+ // =services
+
+ @service store;
+
+ // =methods
+
+ /**
+ * Append a host catalog URL ahead of the host path if `hostCatalogID` is
+ * passed via adapter options. Otherwise, generate the prefix as normal.
+ *
+ * TODO: generalize the interface to resource-prefixed URLs by accepting
+ * a modelName and an ID, rather than looking for a known key.
+ *
+ * @override
+ * @param {string} path
+ * @param {string} parentURL
+ * @param {string} modelName
+ * @param {string} id
+ * @param {object} snapshot
+ * @return {string} urlPrefix
+ */
+ urlPrefix(path, parentURL, modelName, id, snapshot) {
+ const hostCatalogID = snapshot?.adapterOptions?.hostCatalogID;
+ if (hostCatalogID) {
+ const hostCatalogAdapter = this.store.adapterFor('host-catalog');
+ return hostCatalogAdapter
+ ._buildPrefixedURL('host-catalog', hostCatalogID, snapshot);
+ } else {
+ return super.urlPrefix(...arguments);
+ }
+ }
+
+}
diff --git a/addons/api/addon/generated/models/host-set.js b/addons/api/addon/generated/models/host-set.js
new file mode 100644
index 000000000..5793cc4a5
--- /dev/null
+++ b/addons/api/addon/generated/models/host-set.js
@@ -0,0 +1,42 @@
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * HostSet is a collection of Hosts created and managed by a HostCatalog
+ */
+export default class GeneratedHostSetModel extends BaseModel {
+
+ // =attributes
+
+ @attr('string', {
+ description: 'The type of the resource, to help differentiate schemas'
+ }) type;
+
+ @attr('string', {
+ description: 'Optional name for identification purposes'
+ }) name;
+
+ @attr('string', {
+ description: 'Optional user-set description for identification purposes'
+ }) description;
+
+ @attr('date', {
+ description: 'The time this resource was created\nOutput only.',
+ readOnly: true
+ }) created_time;
+
+ @attr('date', {
+ description: 'The time this resource was last updated\nOutput only.',
+ readOnly: true
+ }) updated_time;
+
+ @attr('number', {
+ description: 'Current version number of this resource.',
+ })
+ version;
+
+ @attr('number', {
+ description: 'The total count of hosts in this host set\nOutput only.'
+ }) size;
+
+}
diff --git a/addons/api/addon/generated/models/host.js b/addons/api/addon/generated/models/host.js
new file mode 100644
index 000000000..0d9e0dd2d
--- /dev/null
+++ b/addons/api/addon/generated/models/host.js
@@ -0,0 +1,42 @@
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * Host contains all fields related to a Host resource
+ */
+export default class GeneratedHostModel extends BaseModel {
+
+ // =attributes
+
+ @attr('string', {
+ description: 'The type of the resource, to help differentiate schemas'
+ }) type;
+
+ @attr('string', {
+ description: 'Optional name for identification purposes'
+ }) name;
+
+ @attr('string', {
+ description: 'Optional user-set description for identification purposes'
+ }) description;
+
+ @attr('date', {
+ description: 'The time this resource was created\nOutput only.',
+ readOnly: true
+ }) created_time;
+
+ @attr('date', {
+ description: 'The time this resource was last updated\nOutput only.',
+ readOnly: true
+ }) updated_time;
+
+ @attr('number', {
+ description: 'Current version number of this resource.',
+ })
+ version;
+
+ @attr('string', {
+ description: 'The address (DNS or IP name) used to reach the host'
+ }) address;
+
+}
diff --git a/addons/api/addon/mixins/adapter-build-url.js b/addons/api/addon/mixins/adapter-build-url.js
index 264364d0d..cee278e05 100644
--- a/addons/api/addon/mixins/adapter-build-url.js
+++ b/addons/api/addon/mixins/adapter-build-url.js
@@ -46,6 +46,31 @@ export default Mixin.create({
return '';
},
+ /**
+ * Builds the (mostly full) URL with a prefix, but not the suffix.
+ * The `_buildURL` method adds a suffix.
+ * Do not call directly.
+ * @override
+ * @param {String} modelName
+ * @param {String} id
+ * @return {String} url
+ */
+ _buildPrefixedURL(modelName, id, snapshot) {
+ let path;
+ let url = [];
+ const host = get(this, 'host');
+ const prefix = this.urlPrefix(null, null, modelName, id, snapshot);
+ if (modelName) {
+ path = this.pathForType(modelName);
+ if (path) url.push(path);
+ }
+ if (id) url.push(encodeURIComponent(id));
+ if (prefix) url.unshift(prefix);
+ url = url.join('/');
+ if (!host && url && url.charAt(0) !== '/') url = '/' + url;
+ return `${url}`;
+ },
+
/**
* Overrides the default `_buildURL` with a nearly identical version.
* This method simply passes arguments into the `urlPrefix` method for
@@ -58,19 +83,8 @@ export default Mixin.create({
* @return {String} url
*/
_buildURL(modelName, id, snapshot) {
- let path;
- let url = [];
- const host = get(this, 'host');
- const prefix = this.urlPrefix(null, null, modelName, id, snapshot);
+ const url = this._buildPrefixedURL(modelName, id, snapshot);
const suffix = this.urlSuffix(modelName, id, snapshot);
- if (modelName) {
- path = this.pathForType(modelName);
- if (path) url.push(path);
- }
- if (id) url.push(encodeURIComponent(id));
- if (prefix) url.unshift(prefix);
- url = url.join('/');
- if (!host && url && url.charAt(0) !== '/') url = '/' + url;
return `${url}${suffix}`;
},
diff --git a/addons/api/addon/models/host-catalog.js b/addons/api/addon/models/host-catalog.js
index a0162bfeb..894ee9cf1 100644
--- a/addons/api/addon/models/host-catalog.js
+++ b/addons/api/addon/models/host-catalog.js
@@ -1,3 +1,3 @@
import GeneratedHostCatalogModel from '../generated/models/host-catalog';
-export default class HostCatalogModel extends GeneratedHostCatalogModel { }
+export default class HostCatalogModel extends GeneratedHostCatalogModel {}
diff --git a/addons/api/addon/models/host-set.js b/addons/api/addon/models/host-set.js
new file mode 100644
index 000000000..01a376f6b
--- /dev/null
+++ b/addons/api/addon/models/host-set.js
@@ -0,0 +1,3 @@
+import GeneratedHostSetModel from '../generated/models/host-set';
+
+export default class HostSetModel extends GeneratedHostSetModel {}
diff --git a/addons/api/addon/models/host.js b/addons/api/addon/models/host.js
new file mode 100644
index 000000000..451097080
--- /dev/null
+++ b/addons/api/addon/models/host.js
@@ -0,0 +1,3 @@
+import GeneratedHostModel from '../generated/models/host';
+
+export default class HostModel extends GeneratedHostModel {}
diff --git a/addons/api/app/adapters/host-set.js b/addons/api/app/adapters/host-set.js
new file mode 100644
index 000000000..958a53f64
--- /dev/null
+++ b/addons/api/app/adapters/host-set.js
@@ -0,0 +1 @@
+export { default } from 'api/adapters/host-set';
diff --git a/addons/api/app/adapters/host.js b/addons/api/app/adapters/host.js
new file mode 100644
index 000000000..46bc96d3c
--- /dev/null
+++ b/addons/api/app/adapters/host.js
@@ -0,0 +1 @@
+export { default } from 'api/adapters/host';
diff --git a/addons/api/app/models/host-set.js b/addons/api/app/models/host-set.js
new file mode 100644
index 000000000..6963bf5e3
--- /dev/null
+++ b/addons/api/app/models/host-set.js
@@ -0,0 +1 @@
+export { default } from 'api/models/host-set';
diff --git a/addons/api/app/models/host.js b/addons/api/app/models/host.js
new file mode 100644
index 000000000..ce1f67327
--- /dev/null
+++ b/addons/api/app/models/host.js
@@ -0,0 +1 @@
+export { default } from 'api/models/host';
diff --git a/addons/api/tests/unit/adapters/host-set-test.js b/addons/api/tests/unit/adapters/host-set-test.js
new file mode 100644
index 000000000..e47c7a7d6
--- /dev/null
+++ b/addons/api/tests/unit/adapters/host-set-test.js
@@ -0,0 +1,28 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Adapter | host set', function(hooks) {
+ setupTest(hooks);
+
+ test('it generates correct complete URLs', function (assert) {
+ assert.expect(2);
+ const scopeID = 'o_1';
+ const hostCatalogID = 'hc_098';
+ const method = 'my-custom-method';
+ const mockSnapshot = {
+ adapterOptions: {
+ scopeID,
+ method
+ }
+ };
+ const adapter = this.owner.lookup('adapter:host-set');
+ // Without hostCatalogID...
+ let url = adapter.buildURL('host-set', null, mockSnapshot, 'findAll');
+ assert.equal(url, '/v1/scopes/o_1/host-sets:my-custom-method');
+ // With hostCatalogID...
+ mockSnapshot.adapterOptions.hostCatalogID = hostCatalogID;
+ url = adapter.buildURL('host-set', null, mockSnapshot, 'findAll');
+ assert.equal(url, '/v1/scopes/o_1/host-catalogs/hc_098/host-sets:my-custom-method');
+ });
+
+});
diff --git a/addons/api/tests/unit/adapters/host-test.js b/addons/api/tests/unit/adapters/host-test.js
new file mode 100644
index 000000000..9e019284e
--- /dev/null
+++ b/addons/api/tests/unit/adapters/host-test.js
@@ -0,0 +1,28 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Adapter | host', function(hooks) {
+ setupTest(hooks);
+
+ test('it generates correct complete URLs', function (assert) {
+ assert.expect(2);
+ const scopeID = 'o_1';
+ const hostCatalogID = 'hc_098';
+ const method = 'my-custom-method';
+ const mockSnapshot = {
+ adapterOptions: {
+ scopeID,
+ method
+ }
+ };
+ const adapter = this.owner.lookup('adapter:host');
+ // Without hostCatalogID...
+ let url = adapter.buildURL('host', null, mockSnapshot, 'findAll');
+ assert.equal(url, '/v1/scopes/o_1/hosts:my-custom-method');
+ // With hostCatalogID...
+ mockSnapshot.adapterOptions.hostCatalogID = hostCatalogID;
+ url = adapter.buildURL('host', null, mockSnapshot, 'findAll');
+ assert.equal(url, '/v1/scopes/o_1/host-catalogs/hc_098/hosts:my-custom-method');
+ });
+
+});
diff --git a/addons/api/tests/unit/models/host-set-test.js b/addons/api/tests/unit/models/host-set-test.js
new file mode 100644
index 000000000..61e007f70
--- /dev/null
+++ b/addons/api/tests/unit/models/host-set-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Model | host set', function(hooks) {
+ setupTest(hooks);
+
+ // Replace this with your real tests.
+ test('it exists', function(assert) {
+ let store = this.owner.lookup('service:store');
+ let model = store.createRecord('host-set', {});
+ assert.ok(model);
+ });
+});
diff --git a/addons/api/tests/unit/models/host-test.js b/addons/api/tests/unit/models/host-test.js
new file mode 100644
index 000000000..d19d98fc3
--- /dev/null
+++ b/addons/api/tests/unit/models/host-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Model | host', function(hooks) {
+ setupTest(hooks);
+
+ // Replace this with your real tests.
+ test('it exists', function(assert) {
+ let store = this.owner.lookup('service:store');
+ let model = store.createRecord('host', {});
+ assert.ok(model);
+ });
+});
diff --git a/addons/rose/addon/components/rose/table.js b/addons/rose/addon/components/rose/table.js
index bd991b9d8..ad4115469 100644
--- a/addons/rose/addon/components/rose/table.js
+++ b/addons/rose/addon/components/rose/table.js
@@ -1,6 +1,10 @@
import Component from '@ember/component';
import layout from '../../templates/components/rose/table';
+/**
+ * A table component that support displaying rows of data as header, body, and footer.
+ * Supports setting a caption for a11y.
+ */
export default Component.extend({
layout,
tagName: '',
diff --git a/addons/rose/addon/components/rose/table.stories.mdx b/addons/rose/addon/components/rose/table.stories.mdx
index 0af8d7d0b..a720bd877 100644
--- a/addons/rose/addon/components/rose/table.stories.mdx
+++ b/addons/rose/addon/components/rose/table.stories.mdx
@@ -1,22 +1,20 @@
import { Meta, Story, Preview } from '@storybook/addon-docs/blocks';
import { hbs } from 'ember-cli-htmlbars';
-import { action } from '@storybook/addon-actions';
-import { text, boolean, select } from '@storybook/addon-knobs';
# Table
-A table component to display data in structure of rows and columns. It supports `header`, `body` and `footer` optional definitions. Each definition allows for a table row to be defined with table cells.
+A table component to display data in structure of rows and columns. It supports `header`, `body` and `footer` optional definitions. Each definition allows for a table `row` to be defined with either a `cell` or `headerCell` table element.
```htmlbars
- Address
- Host Set
- Name
- Description
+ Address
+ Host Set
+ Name
+ Description
@@ -41,10 +39,10 @@ A table component to display data in structure of rows and columns. It supports
- Address
- Host Set
- Name
- Description
+ Address
+ Host Set
+ Name
+ Description
diff --git a/addons/rose/addon/components/rose/table/body.js b/addons/rose/addon/components/rose/table/body.js
deleted file mode 100644
index 2702ed983..000000000
--- a/addons/rose/addon/components/rose/table/body.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/table/body';
-
-export default Component.extend({
- layout,
- tagName: '',
-});
diff --git a/addons/rose/addon/components/rose/table/cell.js b/addons/rose/addon/components/rose/table/cell.js
deleted file mode 100644
index 3943c8054..000000000
--- a/addons/rose/addon/components/rose/table/cell.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/table/cell';
-
-export default Component.extend({
- layout,
- tagName: '',
-});
diff --git a/addons/rose/addon/components/rose/table/footer.js b/addons/rose/addon/components/rose/table/footer.js
deleted file mode 100644
index ff0346354..000000000
--- a/addons/rose/addon/components/rose/table/footer.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/table/footer';
-
-export default Component.extend({
- layout,
- tagName: '',
-});
diff --git a/addons/rose/addon/components/rose/table/header.js b/addons/rose/addon/components/rose/table/header.js
deleted file mode 100644
index bcc2ff040..000000000
--- a/addons/rose/addon/components/rose/table/header.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../../templates/components/rose/table/header';
-
-export default Component.extend({
- layout,
- tagName: '',
-});
diff --git a/addons/rose/addon/components/rose/table/row.js b/addons/rose/addon/components/rose/table/row.js
index 4012b9afd..e94f0cf28 100644
--- a/addons/rose/addon/components/rose/table/row.js
+++ b/addons/rose/addon/components/rose/table/row.js
@@ -1,6 +1,10 @@
import Component from '@ember/component';
import layout from '../../../templates/components/rose/table/row';
+/**
+ * A table row component that uses tr table element and
+ * configures a table cell element.
+ */
export default Component.extend({
layout,
tagName: '',
diff --git a/addons/rose/addon/components/rose/table/section.js b/addons/rose/addon/components/rose/table/section.js
new file mode 100644
index 000000000..503ed969b
--- /dev/null
+++ b/addons/rose/addon/components/rose/table/section.js
@@ -0,0 +1,11 @@
+import Component from '@ember/component';
+import layout from '../../../templates/components/rose/table/section';
+
+/**
+ * A table section component that configures a row component.
+ * Section can be: thead, tbody, or tfoot table elements.
+ */
+export default Component.extend({
+ layout,
+ tagName: '',
+});
diff --git a/addons/rose/addon/templates/components/rose/table.hbs b/addons/rose/addon/templates/components/rose/table.hbs
index 580885405..d50ec970e 100644
--- a/addons/rose/addon/templates/components/rose/table.hbs
+++ b/addons/rose/addon/templates/components/rose/table.hbs
@@ -4,8 +4,14 @@
{{/if}}
{{yield (hash
- header=(component 'rose/table/header')
- body=(component 'rose/table/body')
- footer=(component 'rose/table/footer')
+ header=(component 'rose/table/section'
+ tagName='thead'
+ classNames='rose-table-header')
+ body=(component 'rose/table/section'
+ tagName='tbody'
+ classNames='rose-table-body')
+ footer=(component 'rose/table/section'
+ tagName='tfoot'
+ classNames='rose-table-foot')
)}}
diff --git a/addons/rose/addon/templates/components/rose/table/body.hbs b/addons/rose/addon/templates/components/rose/table/body.hbs
deleted file mode 100644
index f82c64d04..000000000
--- a/addons/rose/addon/templates/components/rose/table/body.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-
- {{yield (hash
- row=(component 'rose/table/row')
- )}}
-
diff --git a/addons/rose/addon/templates/components/rose/table/cell.hbs b/addons/rose/addon/templates/components/rose/table/cell.hbs
deleted file mode 100644
index 5cfc41c8d..000000000
--- a/addons/rose/addon/templates/components/rose/table/cell.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if @header}}
-
-{{else}}
- |
- {{yield}}
- |
-{{/if}}
diff --git a/addons/rose/addon/templates/components/rose/table/footer.hbs b/addons/rose/addon/templates/components/rose/table/footer.hbs
deleted file mode 100644
index 107b0b53f..000000000
--- a/addons/rose/addon/templates/components/rose/table/footer.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/addons/rose/addon/templates/components/rose/table/header.hbs b/addons/rose/addon/templates/components/rose/table/header.hbs
deleted file mode 100644
index 13344bc99..000000000
--- a/addons/rose/addon/templates/components/rose/table/header.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/addons/rose/addon/templates/components/rose/table/row.hbs b/addons/rose/addon/templates/components/rose/table/row.hbs
index aae991def..e5bad550e 100644
--- a/addons/rose/addon/templates/components/rose/table/row.hbs
+++ b/addons/rose/addon/templates/components/rose/table/row.hbs
@@ -1,5 +1,12 @@
-
+
{{yield (hash
- cell=(component 'rose/table/cell' header=@header footer=@footer)
+ cell=(component 'rose/anonymous'
+ tagName='td'
+ class='rose-table-cell'
+ )
+ headerCell=(component 'rose/anonymous'
+ tagName='th'
+ class='rose-table-header-cell'
+ )
)}}
diff --git a/addons/rose/addon/templates/components/rose/table/section.hbs b/addons/rose/addon/templates/components/rose/table/section.hbs
new file mode 100644
index 000000000..d39e97260
--- /dev/null
+++ b/addons/rose/addon/templates/components/rose/table/section.hbs
@@ -0,0 +1,3 @@
+{{yield (hash
+ row=(component 'rose/table/row')
+)}}
\ No newline at end of file
diff --git a/addons/rose/app/components/rose/table/body.js b/addons/rose/app/components/rose/table/body.js
deleted file mode 100644
index bf58d0690..000000000
--- a/addons/rose/app/components/rose/table/body.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/table/body';
diff --git a/addons/rose/app/components/rose/table/cell.js b/addons/rose/app/components/rose/table/cell.js
deleted file mode 100644
index 7e3b6e8b8..000000000
--- a/addons/rose/app/components/rose/table/cell.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/table/cell';
diff --git a/addons/rose/app/components/rose/table/footer.js b/addons/rose/app/components/rose/table/footer.js
deleted file mode 100644
index 8fedb5800..000000000
--- a/addons/rose/app/components/rose/table/footer.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/table/footer';
diff --git a/addons/rose/app/components/rose/table/header.js b/addons/rose/app/components/rose/table/header.js
deleted file mode 100644
index c0a585fe7..000000000
--- a/addons/rose/app/components/rose/table/header.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'rose/components/rose/table/header';
diff --git a/addons/rose/app/components/rose/table/section.js b/addons/rose/app/components/rose/table/section.js
new file mode 100644
index 000000000..18f14b39b
--- /dev/null
+++ b/addons/rose/app/components/rose/table/section.js
@@ -0,0 +1 @@
+export { default } from 'rose/components/rose/table/section';
diff --git a/addons/rose/tests/integration/components/rose/table/body-test.js b/addons/rose/tests/integration/components/rose/table/body-test.js
deleted file mode 100644
index e7c026883..000000000
--- a/addons/rose/tests/integration/components/rose/table/body-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, find } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | rose/table/body', function (hooks) {
- setupRenderingTest(hooks);
-
- test('it renders', async function (assert) {
- await render(hbs``);
- assert.ok(find('tbody'));
- assert.ok(find('.rose-table-body'));
- });
-
- test('it renders with attributes', async function (assert) {
- await render(hbs``);
- assert.ok(find('#body'));
- });
-
- test('it renders with row', async function (assert) {
- await render(hbs`
-
- `);
- assert.ok(find('tr'));
- });
-
- test('it renders with row cell', async function (assert) {
- await render(hbs`
-
-
-
- `);
- assert.ok(find('td'));
- assert.ok(find('.rose-table-body-cell'));
- });
-});
diff --git a/addons/rose/tests/integration/components/rose/table/cell-test.js b/addons/rose/tests/integration/components/rose/table/cell-test.js
deleted file mode 100644
index aeec60376..000000000
--- a/addons/rose/tests/integration/components/rose/table/cell-test.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, find } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | rose/table/cell', function (hooks) {
- setupRenderingTest(hooks);
-
- test('it renders', async function (assert) {
- await render(hbs``);
- assert.ok(find('td'));
- assert.ok(find('.rose-table-cell'));
- assert.ok(find('.rose-table-body-cell'));
- });
-
- test('it renders with attributes', async function (assert) {
- await render(hbs``);
- assert.ok(find('#cell'));
- });
-
- test('it renders with content', async function (assert) {
- await render(hbs`
- Cell content
- `);
- assert.equal(find('.rose-table-cell').textContent.trim(), 'Cell content');
- });
-
- test('it renders as header cell', async function (assert) {
- await render(hbs``);
- assert.ok(find('.rose-table-cell'));
- assert.ok(find('.rose-table-header-cell'));
- });
-
- test('it renders as footer cell', async function (assert) {
- await render(hbs``);
- assert.ok(find('.rose-table-cell'));
- assert.ok(find('.rose-table-footer-cell'));
- });
-});
diff --git a/addons/rose/tests/integration/components/rose/table/footer-test.js b/addons/rose/tests/integration/components/rose/table/footer-test.js
deleted file mode 100644
index 1e4cd8997..000000000
--- a/addons/rose/tests/integration/components/rose/table/footer-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, find } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | rose/table/footer', function (hooks) {
- setupRenderingTest(hooks);
-
- test('it renders', async function (assert) {
- await render(hbs``);
- assert.ok(find('tfoot'));
- assert.ok(find('.rose-table-footer'));
- });
-
- test('it renders with attributes', async function (assert) {
- await render(hbs``);
- assert.ok(find('#footer'));
- });
-
- test('it renders with row', async function (assert) {
- await render(hbs`
-
- `);
- assert.ok(find('tr'));
- });
-
- test('it renders with row cell', async function (assert) {
- await render(hbs`
-
-
-
- `);
- assert.ok(find('td'));
- assert.ok(find('.rose-table-cell'));
- });
-});
diff --git a/addons/rose/tests/integration/components/rose/table/header-test.js b/addons/rose/tests/integration/components/rose/table/header-test.js
deleted file mode 100644
index f6ae7c289..000000000
--- a/addons/rose/tests/integration/components/rose/table/header-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, find } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-
-module('Integration | Component | rose/table/header', function (hooks) {
- setupRenderingTest(hooks);
-
- test('it renders', async function (assert) {
- await render(hbs``);
- assert.ok(find('thead'));
- assert.ok(find('.rose-table-header'));
- });
-
- test('it renders with attributes', async function (assert) {
- await render(hbs``);
- assert.ok(find('#header'));
- });
-
- test('it renders with row', async function (assert) {
- await render(hbs`
-
- `);
- assert.ok(find('tr'));
- });
-
- test('it renders with row cell', async function (assert) {
- await render(hbs`
-
-
-
- `);
- assert.ok(find('th'));
- assert.ok(find('.rose-table-header-cell'));
- });
-});
diff --git a/addons/rose/tests/integration/components/rose/table/row-test.js b/addons/rose/tests/integration/components/rose/table/row-test.js
index efb3182d4..94c57cd08 100644
--- a/addons/rose/tests/integration/components/rose/table/row-test.js
+++ b/addons/rose/tests/integration/components/rose/table/row-test.js
@@ -17,10 +17,19 @@ module('Integration | Component | rose/table/row', function (hooks) {
assert.ok(find('#row'));
});
- test('it renders with cell', async function (assert) {
+ test('it renders a cell', async function (assert) {
await render(hbs`
`);
+ assert.ok(find('td'));
assert.ok(find('.rose-table-cell'));
});
+
+ test('it renders a header cell', async function (assert) {
+ await render(hbs`
+
+ `);
+ assert.ok(find('th'));
+ assert.ok(find('.rose-table-header-cell'));
+ });
});
diff --git a/addons/rose/tests/integration/components/rose/table/section-test.js b/addons/rose/tests/integration/components/rose/table/section-test.js
new file mode 100644
index 000000000..6a7a9c64e
--- /dev/null
+++ b/addons/rose/tests/integration/components/rose/table/section-test.js
@@ -0,0 +1,27 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render, find } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+module('Integration | Component | rose/table/section', function (hooks) {
+ setupRenderingTest(hooks);
+
+ test('it renders', async function (assert) {
+ await render(hbs``);
+ assert.ok(find('tag'));
+ assert.ok(find('.tag-class'));
+ });
+
+ test('it renders with attributes', async function (assert) {
+ await render(hbs``);
+ assert.ok(find('#section'));
+ });
+
+ test('it renders a row', async function (assert) {
+ await render(hbs`
+
+ `);
+ assert.ok(find('tr'));
+ assert.ok(find('.rose-table-row'));
+ });
+});
diff --git a/ui/core/app/index.html b/ui/core/app/index.html
index d23416610..21cb16f81 100644
--- a/ui/core/app/index.html
+++ b/ui/core/app/index.html
@@ -7,8 +7,6 @@
-
-
{{content-for "head"}}
diff --git a/ui/core/app/router.js b/ui/core/app/router.js
index b26d1d098..cf5cea5d6 100644
--- a/ui/core/app/router.js
+++ b/ui/core/app/router.js
@@ -36,6 +36,7 @@ Router.map(function () {
});
this.route('new');
});
+ this.route('auth-methods', function() {});
});
});
});
diff --git a/ui/core/app/routes/scopes/scope/auth-methods.js b/ui/core/app/routes/scopes/scope/auth-methods.js
new file mode 100644
index 000000000..112c40248
--- /dev/null
+++ b/ui/core/app/routes/scopes/scope/auth-methods.js
@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthMethodsRoute extends Route {
+ // =methods
+
+ /**
+ * Load all auth-methods under current scope
+ * @return {Promise[AuthMethodModel]}
+ */
+ async model() {
+ const { id: scopeID} = this.modelFor('scopes.scope');
+ return this.store.findAll('auth-method', { adapterOptions: { scopeID } });
+ }
+}
diff --git a/ui/core/app/routes/scopes/scope/auth-methods/index.js b/ui/core/app/routes/scopes/scope/auth-methods/index.js
new file mode 100644
index 000000000..56fa5fabf
--- /dev/null
+++ b/ui/core/app/routes/scopes/scope/auth-methods/index.js
@@ -0,0 +1,4 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthMethodsIndexRoute extends Route {
+}
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 f54947470..d25608633 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
@@ -1,4 +1,20 @@
import Route from '@ember/routing/route';
export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogRoute extends Route {
+
+ // =methods
+
+ /**
+ * Load a host catalog.
+ * @param {object} params
+ * @param {string} params.host_catalog_id
+ * @return {HostCatalogModel}
+ */
+ async model({ host_catalog_id }) {
+ const { id: scopeID } = this.modelFor('scopes.scope');
+ return this.store.findRecord('host-catalog', host_catalog_id, {
+ adapterOptions: { scopeID },
+ });
+ }
+
}
diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs
index 62f8be2de..37530455c 100644
--- a/ui/core/app/templates/scopes/scope.hbs
+++ b/ui/core/app/templates/scopes/scope.hbs
@@ -18,6 +18,9 @@
{{t "resources.roles"}}
+
+ {{t "resources.auth-methods"}}
+
{{outlet "sidebar"}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods.hbs b/ui/core/app/templates/scopes/scope/auth-methods.hbs
new file mode 100644
index 000000000..c24cd6895
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/auth-methods.hbs
@@ -0,0 +1 @@
+{{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
new file mode 100644
index 000000000..2d5456c58
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -0,0 +1,48 @@
+
+
+ {{t "resources.auth-methods"}}
+
+
+
+ {{#if @model}}
+
+
+
+
+ {{t 'form.label.name'}}
+ {{t 'form.label.type'}}
+ {{t 'form.label.id'}}
+
+
+
+
+ {{#each @model as |authMethod|}}
+
+
+ {{authMethod.name}}
+ {{authMethod.description}}
+
+
+
+ {{authMethod.type}}
+
+
+ {{authMethod.id}}
+
+ {{/each}}
+
+
+
+ {{else}}
+
+
+
+
+ {{t 'descriptions.auth-methods-welcome'}}
+
+
+
+
+ {{/if}}
+
+
\ No newline at end of file
diff --git a/ui/core/mirage/config.js b/ui/core/mirage/config.js
index 73342c6b0..4a949b05f 100644
--- a/ui/core/mirage/config.js
+++ b/ui/core/mirage/config.js
@@ -88,6 +88,22 @@ export default function() {
this.patch('/scopes/:scope_id/host-catalogs/:id');
this.del('/scopes/:scope_id/host-catalogs/:id');
+ // host
+
+ this.get('/scopes/:scope_id/host-catalogs/:host_catalog_id/hosts');
+ this.post('/scopes/:scope_id/host-catalogs/:host_catalog_id/hosts');
+ this.get('/scopes/:scope_id/host-catalogs/:host_catalog_id/hosts/:id');
+ this.patch('/scopes/:scope_id/host-catalogs/:host_catalog_id/hosts/:id');
+ this.del('/scopes/:scope_id/host-catalogs/:host_catalog_id/hosts/:id');
+
+ // host-set
+
+ this.get('/scopes/:scope_id/host-catalogs/:host_catalog_id/host-sets');
+ this.post('/scopes/:scope_id/host-catalogs/:host_catalog_id/host-sets');
+ this.get('/scopes/:scope_id/host-catalogs/:host_catalog_id/host-sets/:id');
+ this.patch('/scopes/:scope_id/host-catalogs/:host_catalog_id/host-sets/:id');
+ this.del('/scopes/:scope_id/host-catalogs/:host_catalog_id/host-sets/:id');
+
// Uncomment the following line and the Response import above
// Then change the response code to simulate error responses.
// this.get('/scopes/:scope_id/projects', () => new Response(505));
diff --git a/ui/core/mirage/factories/host-set.js b/ui/core/mirage/factories/host-set.js
new file mode 100644
index 000000000..2f12361c6
--- /dev/null
+++ b/ui/core/mirage/factories/host-set.js
@@ -0,0 +1,3 @@
+import factory from '../generated/factories/host-set';
+
+export default factory.extend();
diff --git a/ui/core/mirage/factories/host.js b/ui/core/mirage/factories/host.js
new file mode 100644
index 000000000..eb463f1f9
--- /dev/null
+++ b/ui/core/mirage/factories/host.js
@@ -0,0 +1,3 @@
+import factory from '../generated/factories/host';
+
+export default factory.extend();
diff --git a/ui/core/mirage/factories/scope.js b/ui/core/mirage/factories/scope.js
index 703e80ad4..d60486d15 100644
--- a/ui/core/mirage/factories/scope.js
+++ b/ui/core/mirage/factories/scope.js
@@ -14,7 +14,7 @@ export default factory.extend({
}, 'withChildren');
}
if (record.type === 'org') {
- server.createList('scope', 5, {
+ server.createList('scope', 3, {
type: 'project',
scope: { id: record.id, type: record.type }
});
diff --git a/ui/core/mirage/generated/factories/host-set.js b/ui/core/mirage/generated/factories/host-set.js
new file mode 100644
index 000000000..95636bda0
--- /dev/null
+++ b/ui/core/mirage/generated/factories/host-set.js
@@ -0,0 +1,17 @@
+import { Factory } from 'ember-cli-mirage';
+import { random, date } from 'faker';
+
+/**
+ * GeneratedHostSetModelFactory
+ */
+export default Factory.extend({
+
+ type: 'static',
+ name: () => random.words(),
+ description: () => random.words(),
+ created_time: () => date.recent(),
+ updated_time: () => date.recent(),
+ version: () => random.number(),
+ size: () => random.number(),
+
+});
diff --git a/ui/core/mirage/generated/factories/host.js b/ui/core/mirage/generated/factories/host.js
new file mode 100644
index 000000000..2d6925e82
--- /dev/null
+++ b/ui/core/mirage/generated/factories/host.js
@@ -0,0 +1,17 @@
+import { Factory } from 'ember-cli-mirage';
+import { random, date, internet } from 'faker';
+
+/**
+ * GeneratedHostModelFactory
+ */
+export default Factory.extend({
+
+ type: 'static',
+ name: () => random.words(),
+ description: () => random.words(),
+ created_time: () => date.recent(),
+ updated_time: () => date.recent(),
+ version: () => random.number(),
+ address: () => internet.ipv6(),
+
+});
diff --git a/ui/core/mirage/scenarios/default.js b/ui/core/mirage/scenarios/default.js
index 6f8e29775..2e830c4ce 100644
--- a/ui/core/mirage/scenarios/default.js
+++ b/ui/core/mirage/scenarios/default.js
@@ -25,9 +25,13 @@ export default function(server) {
// Other resources
- server.db.scopes.where({type: 'project'}).forEach(projectScope => {
- const scope = { id: projectScope.id, type: projectScope.type };
+ server.db.scopes.where({type: 'project'}).forEach(({ id, type }) => {
+ const scope = { id, type };
server.createList('host-catalog', 2, { scope });
+ // Hosts and host sets are supposed to be associated to a host catalog.
+ // For simplicity of mocks, we don't actually associate them here.
+ server.createList('host-set', 3, { scope });
+ server.createList('host', 10, { scope });
});
}
diff --git a/ui/core/tests/unit/routes/scopes/scope/auth-methods-test.js b/ui/core/tests/unit/routes/scopes/scope/auth-methods-test.js
new file mode 100644
index 000000000..e5b45abad
--- /dev/null
+++ b/ui/core/tests/unit/routes/scopes/scope/auth-methods-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | scopes/scope/auth-methods', function(hooks) {
+ setupTest(hooks);
+
+ test('it exists', function(assert) {
+ let route = this.owner.lookup('route:scopes/scope/auth-methods');
+ assert.ok(route);
+ });
+});
diff --git a/ui/core/tests/unit/routes/scopes/scope/auth-methods/index-test.js b/ui/core/tests/unit/routes/scopes/scope/auth-methods/index-test.js
new file mode 100644
index 000000000..eb85171ad
--- /dev/null
+++ b/ui/core/tests/unit/routes/scopes/scope/auth-methods/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | scopes/scope/auth-methods/index', function(hooks) {
+ setupTest(hooks);
+
+ test('it exists', function(assert) {
+ let route = this.owner.lookup('route:scopes/scope/auth-methods/index');
+ assert.ok(route);
+ });
+});
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 41082f65e..4c4c12b3d 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -36,6 +36,7 @@ resources:
project: Project
host-catalog: Host Catalog
host-catalogs: Host Catalogs
+ auth-methods: Auth Methods
titles:
iam: IAM
new: New
@@ -50,6 +51,7 @@ titles:
users-welcome: Welcome to Users
roles-welcome: Welcome to Roles
groups-welcome: Welcome to Groups
+ auth-methods-welcome: Welcome to Auth Methods
grants: Permissions
new-grant: New Grant
principals: Principals
@@ -61,6 +63,7 @@ descriptions:
users-welcome: Users are authorized to access Boundary.
roles-welcome: Roles are collections of capabilities that can be granted to user and/or groups.
groups-welcome: Groups are collections of users.
+ auth-methods-welcome: Auth methods are configurations to authenticate users.
states:
info: Info
success: Success
@@ -95,10 +98,3 @@ notify:
create-success: Created succesfully.
save-success: Saved succesfully.
delete-success: Deleted successfully.
-dev:
- default-org: Default Scope
- menu-item: Menu item
- button-menu-item: Button menu item
- section: Section
- title: Title
- item-name: Item Name