Skip to content

Commit 970975c

Browse files
authored
[UI] - Colocated components in addons (#31413)
* core: run colocated components codemod * kmip: run colocated components codemod * replication: run colocated components codemod * core: remove manual setting of templates with setComponentTemplate * run prettier
1 parent 0d7882c commit 970975c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+17
-44
lines changed

ui/lib/core/addon/components/edit-form.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ import AdapterError from '@ember-data/adapter/error';
77
import { service } from '@ember/service';
88
import Component from '@ember/component';
99
import { task } from 'ember-concurrency';
10-
import layout from '../templates/components/edit-form';
1110
import { next } from '@ember/runloop';
1211
import { waitFor } from '@ember/test-waiters';
1312

1413
export default Component.extend({
15-
layout,
1614
flashMessages: service(),
1715

1816
// internal validations
1917
invalidFormAlert: '',
18+
2019
modelValidations: null,
20+
2121
// public API
2222
model: null,
23+
2324
successMessage: 'Saved!',
2425
deleteSuccessMessage: 'Deleted!',
2526
deleteButtonText: 'Delete',

ui/lib/core/addon/components/message-error.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55

66
import Component from '@glimmer/component';
7-
import layout from '../templates/components/message-error';
8-
import { setComponentTemplate } from '@ember/component';
97

108
/**
119
* @module MessageError
@@ -20,7 +18,7 @@ import { setComponentTemplate } from '@ember/component';
2018
* @param {string} [errorMessage=null] - An Error string to display.
2119
*/
2220

23-
class MessageError extends Component {
21+
export default class MessageError extends Component {
2422
get displayErrors() {
2523
const { errorMessage, errors, model } = this.args;
2624
if (errorMessage) {
@@ -47,4 +45,3 @@ class MessageError extends Component {
4745
return null;
4846
}
4947
}
50-
export default setComponentTemplate(layout, MessageError);

ui/lib/core/addon/components/read-more.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55

66
import Component from '@glimmer/component';
7-
import layout from '../templates/components/read-more';
8-
import { setComponentTemplate } from '@ember/component';
97
import { action } from '@ember/object';
108
import { tracked } from '@glimmer/tracking';
119

@@ -25,7 +23,7 @@ import { tracked } from '@glimmer/tracking';
2523
* </div>
2624
*/
2725

28-
class ReadMoreComponent extends Component {
26+
export default class ReadMoreComponent extends Component {
2927
@action
3028
calculateOverflow(e) {
3129
const spanText = e.querySelector('.description-block');
@@ -45,5 +43,3 @@ class ReadMoreComponent extends Component {
4543
this.isOpen = !this.isOpen;
4644
}
4745
}
48-
49-
export default setComponentTemplate(layout, ReadMoreComponent);

ui/lib/core/addon/components/readonly-form-field.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
*/
1616

1717
import Component from '@glimmer/component';
18-
import { setComponentTemplate } from '@ember/component';
1918
import { capitalize, dasherize } from '@ember/string';
2019
import { humanize } from 'vault/helpers/humanize';
21-
import layout from '../templates/components/readonly-form-field';
2220

23-
class ReadonlyFormField extends Component {
21+
export default class ReadonlyFormField extends Component {
2422
get labelString() {
2523
if (!this.args.attr) {
2624
return '';
@@ -36,5 +34,3 @@ class ReadonlyFormField extends Component {
3634
return '';
3735
}
3836
}
39-
40-
export default setComponentTemplate(layout, ReadonlyFormField);

ui/lib/core/addon/components/replication-action-demote.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
*/
55

66
import Actions from 'core/components/replication-actions-single';
7-
import layout from '../templates/components/replication-action-demote';
87

98
export default Actions.extend({
10-
layout,
119
tagName: '',
1210
});

0 commit comments

Comments
 (0)