Merge branch 'main' into feature-add-type-badges-host-set

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;
+    }
+  },
 });

addons/api/mirage/generated/factories/host-set.js

@@ -5,20 +5,11 @@ import { random, date, datatype } from 'faker';
  * GeneratedHostSetModelFactory
  */
 export default Factory.extend({
-  type: () => random.arrayElement(['static', 'plugin']),
+  type: 'static',
   name: () => random.words(),
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
   version: () => datatype.number(),
   size: () => datatype.number(),
-  plugin: function (i) {
-    if (this.type == 'plugin') {
-      return {
-        id: `pl_${datatype.hexaDecimal(5)}`,
-        name: i % 2 ? 'aws' : 'azure',
-        description: random.words(),
-      };
-    }
-  },
 });

addons/rose/addon/components/rose/form/radio/card/index.stories.mdx

@@ -21,7 +21,7 @@ Renders a form radiofield in a Wide format.
 ```
 
 <Preview>
-  <Story name="Basic Wide" height="10rem">{{
+  <Story name="Wide" height="10rem">{{
     template: hbs`
       <Rose::Form::Radio::Card
         @label={{label}}
@@ -64,7 +64,7 @@ Renders a form radiofield in a tile format.
 ```
 
 <Preview>
-  <Story name="Basic tile" height="10rem">{{
+  <Story name="Tile" height="10rem">{{
     template: hbs`
       <Rose::Form::Radio::Card
         @label={{label}}

addons/rose/addon/components/rose/form/radio/group/index.hbs

@@ -1,3 +1,4 @@
 {{yield (hash
   radio=(component 'rose/form/radio/radio' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed inline=@inline)
-)}}
+  card=(component 'rose/form/radio/card' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed layout=@layout)
+)}}

addons/rose/addon/components/rose/form/radio/group/index.stories.mdx

@@ -81,3 +81,173 @@ Renders a form radiofield group.
   }
   }}</Story>
 </Preview>
+
+```htmlbars
+<Rose::Form::Radio::Group
+  @disabled={{false}}
+  @name={{name}}
+  @selectedValue="disagree"
+  @changed={{fn}}
+  @inline={{false}}
+  as |radioGroup|
+>
+  <radioGroup.Card
+    @label="Agree"
+    @value="agree"
+    @layout='tile'
+       @helperText="dwsd"
+  />
+  <radioGroup.Card
+    @label="disagree"
+    @value="disagree"
+    @layout='tile'
+       @helperText="dwsd"
+  />
+  <radioGroup.Card
+    @label="maybe"
+    @value="maybe"
+    @layout='tile'
+    @helperText="dwsd"
+  />
+</Rose::Form::Radio::Group>
+```
+<Preview>
+  <Story name="Card:  Tile" height="10rem">{{
+  template: hbs`
+    <Rose::Form::Radio::Group
+      @disabled={{disabled}}
+      @name={{name}}
+      @selectedValue={{selectedValue}}
+      @changed={{changed}}
+      as |radioGroup|
+    >
+      <radioGroup.card
+        @label={{firstFieldLabel}}
+        @value={{firstFieldValue}}
+        @icon={{firstFieldIcon}}
+        @layout='tile'
+      />
+      <radioGroup.card
+        @label={{secondFieldLabel}}
+        @value={{secondFieldValue}}
+        @icon={{secondFieldIcon}}
+        @layout="tile"
+      />
+      <radioGroup.card
+        @label={{thirdFieldLabel}}
+        @value={{thirdFieldValue}}
+        @icon={{thirdFieldIcon}}
+        @layout="tile"
+      />
+    </Rose::Form::Radio::Group>
+  `,
+  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')
+  }
+  }}</Story>
+</Preview>
+
+```htmlbars
+<Rose::Form::Radio::Group
+  @disabled={{false}}
+  @name={{name}}
+  @selectedValue="disagree"
+  @changed={{fn}}
+  @inline={{false}}
+  as |radioGroup|
+>
+  <radioGroup.Card
+    @label="Agree"
+    @value="agree"
+    @layout='wide'
+  />
+  <radioGroup.Card
+    @label="disagree"
+    @value="disagree"
+    @layout='wide'
+  />
+</Rose::Form::Radio::Group>
+```
+<Preview>
+  <Story name="Card:  Wide" height="10rem">{{
+  template: hbs`
+    <Rose::Form::Radio::Group
+      @disabled={{disabled}}
+      @name={{name}}
+      @selectedValue={{selectedValue}}
+      @changed={{changed}}
+      as |radioGroup|
+    >
+      <radioGroup.card
+        @label={{firstFieldLabel}}
+        @value={{firstFieldValue}}
+        @icon={{firstFieldIcon}}
+        @layout="wide"
+      />
+      <radioGroup.card
+        @label={{secondFieldLabel}}
+        @value={{secondFieldValue}}
+        @layout="wide"
+      />
+      <radioGroup.card
+        @label={{thirdFieldLabel}}
+        @value={{thirdFieldValue}}
+        @layout="wide"
+      />
+    </Rose::Form::Radio::Group>
+  `,
+  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')
+  }
+  }}</Story>
+</Preview>

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;