diff --git a/addons/api/addon/generated/models/host-set.js b/addons/api/addon/generated/models/host-set.js index 44c0991d6..048badc73 100644 --- a/addons/api/addon/generated/models/host-set.js +++ b/addons/api/addon/generated/models/host-set.js @@ -50,4 +50,10 @@ export default class GeneratedHostSetModel extends BaseModel { readOnly: true, }) size; + + @attr({ + description: 'Plugin information for this resource', + readOnly: true, + }) + plugin; } diff --git a/addons/api/addon/models/host-set.js b/addons/api/addon/models/host-set.js index 66dd96d52..b453195d1 100644 --- a/addons/api/addon/models/host-set.js +++ b/addons/api/addon/models/host-set.js @@ -4,6 +4,58 @@ import { fragmentArray } from 'ember-data-model-fragments/attributes'; export default class HostSetModel extends GeneratedHostSetModel { // =attributes + /** + * Returns if the host-set is static or not. + * @type {boolean} + */ + get isStatic() { + return this.type === 'static'; + } + + /** + * Returns if the host-set is plugin or not. + * @type {boolean} + */ + get isPlugin() { + return this.type === 'plugin'; + } + + /** + * Returns if a host-set plugin is AWS or not + * @type {boolean} + */ + get isAWS() { + return this.compositeType === 'aws'; + } + + /** + * Return if a host-set plugin is Azure or not. + */ + get isAzure() { + return this.compositeType === 'azure'; + } + + /** + * If a host-set is a plugin return its name, + * otherwise returns the host-set type + * @type {string} + */ + get compositeType() { + return this.plugin ? this.plugin.name : this.type; + } + + /** + * Sets type, if type is different than static, set plugin name to type + */ + set compositeType(type) { + if (type === 'static') { + this.type = 'static'; + } else { + this.type = 'plugin'; + this.plugin = { name: type }; + } + } + /** * Host IDs are read-only under normal circumstances. But these can * be persisted via a dedicated call to `addHosts()`. diff --git a/addons/api/mirage/factories/host-set.js b/addons/api/mirage/factories/host-set.js index 3b88650b7..4bb6ad7bb 100644 --- a/addons/api/mirage/factories/host-set.js +++ b/addons/api/mirage/factories/host-set.js @@ -12,4 +12,12 @@ export default factory.extend({ 'remove-hosts', ], id: (i) => `host-set-id-${i}`, + type() { + return this.hostCatalog?.type || factory.attrs.type; + }, + plugin() { + if (this.type === 'plugin') { + return this.hostCatalog.plugin; + } + }, }); diff --git a/addons/api/tests/unit/models/host-set-test.js b/addons/api/tests/unit/models/host-set-test.js index f1cf1c110..33189d3d4 100644 --- a/addons/api/tests/unit/models/host-set-test.js +++ b/addons/api/tests/unit/models/host-set-test.js @@ -129,4 +129,84 @@ module('Unit | Model | host set', function (hooks) { const model = store.peekRecord('host-set', '123abc'); await model.removeHost('3'); }); + + test('it has isStatic and returns the expected values', async function (assert) { + assert.expect(3); + const store = this.owner.lookup('service:store'); + const modelA = store.createRecord('host-set', { type: 'static' }); + const modelB = store.createRecord('host-set', { type: 'plugin' }); + assert.equal(typeof modelA.isStatic, 'boolean'); + assert.true(modelA.isStatic); + assert.false(modelB.isStatic); + }); + + test('it has isPlugin and returns the expected values', async function (assert) { + assert.expect(3); + const store = this.owner.lookup('service:store'); + const modelPlugin = store.createRecord('host-set', { type: 'plugin' }); + const modelStatic = store.createRecord('host-set', { type: 'static' }); + assert.equal(typeof modelPlugin.isPlugin, 'boolean'); + assert.true(modelPlugin.isPlugin); + assert.false(modelStatic.isPlugin); + }); + + test('it has isAws and return the expected values', async function (assert) { + assert.expect(3); + const store = this.owner.lookup('service:store'); + const modelAws = store.createRecord('host-set', { + type: 'plugin', + plugin: { name: 'aws' }, + }); + const modelRandom = store.createRecord('host-set', { + plugin: { name: 'random' }, + }); + assert.equal(typeof modelAws.isAWS, 'boolean'); + assert.true(modelAws.isAWS); + assert.false(modelRandom.isAWS); + }); + + test('it has isAzure and return the expected values', async function (assert) { + assert.expect(3); + const store = this.owner.lookup('service:store'); + const modelAzure = store.createRecord('host-set', { + type: 'plugin', + plugin: { name: 'azure' }, + }); + const modelRandom = store.createRecord('host-set', { + plugin: { name: 'random' }, + }); + assert.equal(typeof modelAzure.isAzure, 'boolean'); + assert.true(modelAzure.isAzure); + assert.false(modelRandom.isAzure); + }); + + test('get compositeType return expected values', async function (assert) { + assert.expect(3); + const store = this.owner.lookup('service:store'); + const modelPlugin = store.createRecord('host-set', { + type: 'plugin', + plugin: { name: 'Test name' }, + }); + const modelStatic = store.createRecord('host-set', { + type: 'static', + }); + assert.equal(typeof modelPlugin.compositeType, 'string'); + assert.equal(modelPlugin.compositeType, 'Test name'); + assert.equal(modelStatic.compositeType, 'static'); + }); + + test('set compositeType sets expected values', async function (assert) { + assert.expect(3); + const store = this.owner.lookup('service:store'); + const modelPlugin = store.createRecord('host-set', { + compositeType: 'aws', + }); + const modelStatic = store.createRecord('host-set', { + compositeType: 'static', + }); + + assert.equal(modelPlugin.type, 'plugin'); + assert.equal(modelPlugin.plugin.name, 'aws'); + assert.equal(modelStatic.type, 'static'); + }); }); diff --git a/addons/rose/addon/components/rose/form/radio/card/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/card/index.stories.mdx index 360108563..a730607c7 100644 --- a/addons/rose/addon/components/rose/form/radio/card/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/card/index.stories.mdx @@ -21,7 +21,7 @@ Renders a form radiofield in a Wide format. ``` - {{ + {{ template: hbs` - {{ + {{ template: hbs` + +```htmlbars + + + + + +``` + + {{ + template: hbs` + + + + + + `, + context: { + name: text('name', 'mustagree'), + disabled: boolean('disabled', false), + selectedValue: text('selectedValue', 'disagree'), + firstFieldLabel: text('first label', 'Agree'), + firstFieldValue: text('first value', 'agree'), + firstFieldIcon: select( + 'firstFieldIcon', + { + 'none': null, + 'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16', + }, + null + ), + secondFieldIcon: select( + 'secondFieldIcon', + { + 'none': null, + 'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16', + }, + null + ), + thirdFieldIcon: select( + 'thirdFieldIcon', + { + 'none': null, + 'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16', + }, + null + ), + secondFieldLabel: text('second label', 'Maybe'), + secondFieldValue: text('second value', 'maybe'), + thirdFieldLabel: text('third label', 'Disagree'), + thirdFieldValue: text('third value', 'disagree'), + changed: action('changed') + } + }} + + +```htmlbars + + + + +``` + + {{ + template: hbs` + + + + + + `, + context: { + name: text('name', 'mustagree'), + disabled: boolean('disabled', false), + selectedValue: text('selectedValue', 'disagree'), + firstFieldLabel: text('first label', 'Agree'), + firstFieldValue: text('first value', 'agree'), + firstFieldIcon: select( + 'firstFieldIcon', + { + 'none': null, + 'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16', + }, + null + ), + secondFieldLabel: text('second label', 'Maybe'), + secondFieldValue: text('second value', 'maybe'), + thirdFieldLabel: text('third label', 'Disagree'), + thirdFieldValue: text('third value', 'disagree'), + changed: action('changed') + } + }} + 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 85364923a..5e8018b40 100644 --- a/addons/rose/addon/styles/rose/components/form/_radio-card.scss +++ b/addons/rose/addon/styles/rose/components/form/_radio-card.scss @@ -58,9 +58,10 @@ $radio-svg: ( } } position: relative; - display: flex; + display: inline-flex; align-items: center; justify-content: center; + margin: $size-m $size-xs $size-xl 0; .radio-card-overlay { position: absolute; @@ -81,8 +82,7 @@ $radio-svg: ( display: block; position: relative; text-align: left; - word-break: break-all; - border: $size-xxxxs solid var(--ui-gray-subtler-6); + border: $size-xxxxs solid var(--ui-gray-subtler-2); box-shadow: 0 $size-xxs $size-xxs rgba(var(--stark-components), var(--opacity-2)); border-radius: $size-xxs; diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index 3868852e4..b13cf374d 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -25,9 +25,21 @@

{{hostSet.description}}

- - {{t (concat 'resources.host-set.types.' hostSet.type)}} - + {{#if hostSet.isStatic}} + + {{t (concat 'resources.host-set.types.' hostSet.type)}} + + {{else}} + + {{hostSet.compositeType}} + + {{/if}}