diff --git a/addons/rose/.eslintrc.js b/addons/rose/.eslintrc.js index 85a190092..b705ae52d 100644 --- a/addons/rose/.eslintrc.js +++ b/addons/rose/.eslintrc.js @@ -21,7 +21,8 @@ module.exports = { browser: true }, rules: { - 'ember/no-jquery': 'error' + 'ember/no-jquery': 'error', + 'ember/no-new-mixins': 0 }, overrides: [ // node files diff --git a/addons/rose/addon/components/rose/form.stories.mdx b/addons/rose/addon/components/rose/form.stories.mdx index c777f21c1..e31e0d1b2 100644 --- a/addons/rose/addon/components/rose/form.stories.mdx +++ b/addons/rose/addon/components/rose/form.stories.mdx @@ -41,23 +41,19 @@ and actions. @@ -97,23 +93,19 @@ and actions. diff --git a/addons/rose/addon/components/rose/form/checkbox.js b/addons/rose/addon/components/rose/form/checkbox.js index 5b94c0a1d..ad6ad3f38 100644 --- a/addons/rose/addon/components/rose/form/checkbox.js +++ b/addons/rose/addon/components/rose/form/checkbox.js @@ -1,21 +1,11 @@ import Component from '@ember/component'; import layout from '../../../templates/components/rose/form/checkbox'; +import ComponentAutoId from '../../../mixins/component-auto-id'; /** * A simple HTML `` element. - * - * @example - * */ -export default Component.extend({ +export default Component.extend(ComponentAutoId, { layout, - tagName: '', }); diff --git a/addons/rose/addon/components/rose/form/checkbox.stories.mdx b/addons/rose/addon/components/rose/form/checkbox.stories.mdx index 3a47e9f8c..2dcf0bb14 100644 --- a/addons/rose/addon/components/rose/form/checkbox.stories.mdx +++ b/addons/rose/addon/components/rose/form/checkbox.stories.mdx @@ -11,7 +11,6 @@ Renders a form input checkbox. ```htmlbars {{ template: hbs` ` element. - * - * @example - * */ -export default Component.extend({ +export default Component.extend(ComponentAutoId, { layout, tagName: '', }); diff --git a/addons/rose/addon/components/rose/form/radio/group.js b/addons/rose/addon/components/rose/form/radio/group.js index a9508a084..80bba183e 100644 --- a/addons/rose/addon/components/rose/form/radio/group.js +++ b/addons/rose/addon/components/rose/form/radio/group.js @@ -3,29 +3,8 @@ import layout from '../../../../templates/components/rose/form/radio/group'; /** * A `` element. - * - * @example - * - * - * - * - * */ - export default Component.extend({ layout, - tagName: '', }); diff --git a/addons/rose/addon/components/rose/form/radio/group.stories.mdx b/addons/rose/addon/components/rose/form/radio/group.stories.mdx index ef99aa922..ebdb50560 100644 --- a/addons/rose/addon/components/rose/form/radio/group.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group.stories.mdx @@ -16,17 +16,14 @@ Renders a form radiofield group. as |radioGroup| > @@ -42,17 +39,14 @@ Renders a form radiofield group. as |radioGroup| > diff --git a/addons/rose/addon/components/rose/form/radio/radio.js b/addons/rose/addon/components/rose/form/radio/radio.js index f32a6835e..196e47951 100644 --- a/addons/rose/addon/components/rose/form/radio/radio.js +++ b/addons/rose/addon/components/rose/form/radio/radio.js @@ -1,22 +1,13 @@ import Component from '@ember/component'; import layout from '../../../../templates/components/rose/form/radio/radio'; +import ComponentAutoId from '../../../../mixins/component-auto-id'; /** * A `` element. * `value` and `selectedValue` must be equal to select * radiofield. - * - * @example - * */ -export default Component.extend({ +export default Component.extend(ComponentAutoId, { layout, tagName: '', }); diff --git a/addons/rose/addon/components/rose/form/radio/radio.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio.stories.mdx index 79f2704d9..91d256e9a 100644 --- a/addons/rose/addon/components/rose/form/radio/radio.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio.stories.mdx @@ -10,7 +10,6 @@ Renders a form radiofield. ```htmlbars {{ template: hbs` `, context: { - id: text('id', 'radio-1'), label: text('text', 'Radiofield'), error: boolean('error', false), value: text('value', 'value and selectedValue must match to select radiofield'), diff --git a/addons/rose/addon/components/rose/form/select.js b/addons/rose/addon/components/rose/form/select.js index f1c7dd36f..c71537542 100644 --- a/addons/rose/addon/components/rose/form/select.js +++ b/addons/rose/addon/components/rose/form/select.js @@ -1,11 +1,11 @@ import Component from '@ember/component'; import layout from '../../../templates/components/rose/form/select'; +import ComponentAutoId from '../../../mixins/component-auto-id'; /** * A ` -