Commit 0867a9df authored by Mark Florian's avatar Mark Florian

Fix component option order in alerts_settings

This fixes `vue/order-in-components` violations in the
`{,ee/}app/assets/javascripts/alerts_settings` directories.

Part of https://gitlab.com/gitlab-org/gitlab/-/issues/297216.
parent a1239653
...@@ -40,6 +40,11 @@ export default { ...@@ -40,6 +40,11 @@ export default {
directives: { directives: {
GlTooltip, GlTooltip,
}, },
inject: {
gitlabAlertFields: {
default: gitlabFieldsMock,
},
},
props: { props: {
payloadFields: { payloadFields: {
type: Array, type: Array,
...@@ -57,11 +62,6 @@ export default { ...@@ -57,11 +62,6 @@ export default {
gitlabFields: this.gitlabAlertFields, gitlabFields: this.gitlabAlertFields,
}; };
}, },
inject: {
gitlabAlertFields: {
default: gitlabFieldsMock,
},
},
computed: { computed: {
mappingData() { mappingData() {
return this.gitlabFields.map((gitlabField) => { return this.gitlabFields.map((gitlabField) => {
......
...@@ -117,6 +117,7 @@ export default { ...@@ -117,6 +117,7 @@ export default {
directives: { directives: {
GlModal: GlModalDirective, GlModal: GlModalDirective,
}, },
mixins: [glFeatureFlagsMixin()],
inject: { inject: {
generic: { generic: {
default: {}, default: {},
...@@ -125,7 +126,6 @@ export default { ...@@ -125,7 +126,6 @@ export default {
default: {}, default: {},
}, },
}, },
mixins: [glFeatureFlagsMixin()],
props: { props: {
loading: { loading: {
type: Boolean, type: Boolean,
......
...@@ -35,6 +35,9 @@ export default (el) => { ...@@ -35,6 +35,9 @@ export default (el) => {
return new Vue({ return new Vue({
el, el,
components: {
AlertSettingsWrapper,
},
provide: { provide: {
prometheus: { prometheus: {
active: parseBoolean(prometheusActivated), active: parseBoolean(prometheusActivated),
...@@ -56,9 +59,6 @@ export default (el) => { ...@@ -56,9 +59,6 @@ export default (el) => {
multiIntegrations: parseBoolean(multiIntegrations), multiIntegrations: parseBoolean(multiIntegrations),
}, },
apolloProvider, apolloProvider,
components: {
AlertSettingsWrapper,
},
render(createElement) { render(createElement) {
return createElement('alert-settings-wrapper'); return createElement('alert-settings-wrapper');
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment