Commit fb8fca7c authored by Mark Florian's avatar Mark Florian

Fix component option order in feature_flags

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

Part of https://gitlab.com/gitlab-org/gitlab/-/issues/297216.
parent a1239653
......@@ -31,6 +31,13 @@ export default {
directives: {
GlTooltip: GlTooltipDirective,
},
inject: [
'projectName',
'featureFlagsHelpPagePath',
'unleashApiUrl',
'featureFlagsClientExampleHelpPagePath',
'featureFlagsClientLibrariesHelpPagePath',
],
props: {
instanceId: {
......@@ -55,13 +62,6 @@ export default {
required: true,
},
},
inject: [
'projectName',
'featureFlagsHelpPagePath',
'unleashApiUrl',
'featureFlagsClientExampleHelpPagePath',
'featureFlagsClientLibrariesHelpPagePath',
],
translations: {
cancelActionLabel: __('Close'),
modalTitle: s__('FeatureFlags|Configure feature flags'),
......
......@@ -31,6 +31,7 @@ export default {
GlButton,
GlSearchBoxByType,
},
inject: ['environmentsEndpoint'],
props: {
value: {
type: String,
......@@ -53,7 +54,6 @@ export default {
required: false,
},
},
inject: ['environmentsEndpoint'],
data() {
return {
environmentSearch: this.value,
......
......@@ -3,6 +3,7 @@ import { GlAlert, GlBadge, GlEmptyState, GlLink, GlLoadingIcon, GlTab } from '@g
export default {
components: { GlAlert, GlBadge, GlEmptyState, GlLink, GlLoadingIcon, GlTab },
inject: ['errorStateSvgPath', 'featureFlagsHelpPagePath'],
props: {
title: {
required: true,
......@@ -46,7 +47,6 @@ export default {
type: String,
},
},
inject: ['errorStateSvgPath', 'featureFlagsHelpPagePath'],
computed: {
itemCount() {
return this.count ?? 0;
......
......@@ -17,13 +17,13 @@ export default {
GlTooltip: GlTooltipDirective,
},
mixins: [glFeatureFlagMixin()],
inject: ['csrfToken'],
props: {
featureFlags: {
type: Array,
required: true,
},
},
inject: ['csrfToken'],
data() {
return {
deleteFeatureFlagUrl: null,
......
......@@ -46,6 +46,11 @@ export default {
GlTooltip: GlTooltipDirective,
},
mixins: [featureFlagsMixin()],
inject: {
featureFlagIssuesEndpoint: {
default: '',
},
},
props: {
active: {
type: Boolean,
......@@ -86,11 +91,6 @@ export default {
default: LEGACY_FLAG,
},
},
inject: {
featureFlagIssuesEndpoint: {
default: '',
},
},
translations: {
allEnvironmentsText: s__('FeatureFlags|* (All Environments)'),
......
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