Commit 096462db authored by Andrew Fontaine's avatar Andrew Fontaine Committed by Sarah Groff Hennigh-Palermo

Remove ci_key_autocomplete Feature Flag

This has been enabled by default for quite some time with no issues.
parent 0a8ccb54
...@@ -6,7 +6,6 @@ import { ...@@ -6,7 +6,6 @@ import {
GlFormCheckbox, GlFormCheckbox,
GlFormCombobox, GlFormCombobox,
GlFormGroup, GlFormGroup,
GlFormInput,
GlFormSelect, GlFormSelect,
GlFormTextarea, GlFormTextarea,
GlIcon, GlIcon,
...@@ -41,7 +40,6 @@ export default { ...@@ -41,7 +40,6 @@ export default {
GlFormCheckbox, GlFormCheckbox,
GlFormCombobox, GlFormCombobox,
GlFormGroup, GlFormGroup,
GlFormInput,
GlFormSelect, GlFormSelect,
GlFormTextarea, GlFormTextarea,
GlIcon, GlIcon,
...@@ -122,11 +120,6 @@ export default { ...@@ -122,11 +120,6 @@ export default {
return ''; return '';
}, },
tokenValidationState() { tokenValidationState() {
// If the feature flag is off, do not validate. Remove when flag is removed.
if (!this.glFeatures.ciKeyAutocomplete) {
return true;
}
const validator = this.$options.tokens?.[this.variable.key]?.validation; const validator = this.$options.tokens?.[this.variable.key]?.validation;
if (validator) { if (validator) {
...@@ -204,21 +197,12 @@ export default { ...@@ -204,21 +197,12 @@ export default {
> >
<form> <form>
<gl-form-combobox <gl-form-combobox
v-if="glFeatures.ciKeyAutocomplete"
v-model="key" v-model="key"
:token-list="$options.tokenList" :token-list="$options.tokenList"
:label-text="__('Key')" :label-text="__('Key')"
data-qa-selector="ci_variable_key_field" data-qa-selector="ci_variable_key_field"
/> />
<gl-form-group v-else :label="__('Key')" label-for="ci-variable-key">
<gl-form-input
id="ci-variable-key"
v-model="key"
data-qa-selector="ci_variable_key_field"
/>
</gl-form-group>
<gl-form-group <gl-form-group
:label="__('Value')" :label="__('Value')"
label-for="ci-variable-value" label-for="ci-variable-value"
......
...@@ -8,7 +8,6 @@ module Projects ...@@ -8,7 +8,6 @@ module Projects
before_action do before_action do
push_frontend_feature_flag(:new_variables_ui, @project, default_enabled: true) push_frontend_feature_flag(:new_variables_ui, @project, default_enabled: true)
push_frontend_feature_flag(:ajax_new_deploy_token, @project) push_frontend_feature_flag(:ajax_new_deploy_token, @project)
push_frontend_feature_flag(:ci_key_autocomplete, default_enabled: true)
end end
def show def show
......
---
name: ci_key_autocomplete
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29124
rollout_issue_url:
group: group::progressive delivery
type: development
default_enabled: true
import Vuex from 'vuex'; import Vuex from 'vuex';
import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; import { createLocalVue, shallowMount, mount } from '@vue/test-utils';
import { GlButton, GlFormCombobox } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { AWS_ACCESS_KEY_ID } from '~/ci_variable_list/constants'; import { AWS_ACCESS_KEY_ID } from '~/ci_variable_list/constants';
import CiVariableModal from '~/ci_variable_list/components/ci_variable_modal.vue'; import CiVariableModal from '~/ci_variable_list/components/ci_variable_modal.vue';
import createStore from '~/ci_variable_list/store'; import createStore from '~/ci_variable_list/store';
...@@ -18,7 +18,6 @@ describe('Ci variable modal', () => { ...@@ -18,7 +18,6 @@ describe('Ci variable modal', () => {
store = createStore(); store = createStore();
wrapper = method(CiVariableModal, { wrapper = method(CiVariableModal, {
attachToDocument: true, attachToDocument: true,
provide: { glFeatures: { ciKeyAutocomplete: true } },
stubs: { stubs: {
GlModal: ModalStub, GlModal: ModalStub,
}, },
...@@ -42,27 +41,6 @@ describe('Ci variable modal', () => { ...@@ -42,27 +41,6 @@ describe('Ci variable modal', () => {
wrapper.destroy(); wrapper.destroy();
}); });
describe('Feature flag', () => {
describe('when off', () => {
beforeEach(() => {
createComponent(shallowMount, { provide: { glFeatures: { ciKeyAutocomplete: false } } });
});
it('does not render the autocomplete dropdown', () => {
expect(wrapper.find(GlFormCombobox).exists()).toBe(false);
});
});
describe('when on', () => {
beforeEach(() => {
createComponent(shallowMount);
});
it('renders the autocomplete dropdown', () => {
expect(wrapper.find(GlFormCombobox).exists()).toBe(true);
});
});
});
describe('Basic interactions', () => { describe('Basic interactions', () => {
beforeEach(() => { beforeEach(() => {
createComponent(shallowMount); createComponent(shallowMount);
......
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