Commit 013360a9 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Remove feature flag on FE side

parent 14bc07ca
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
import { GlButton, GlTabs, GlTab } from '@gitlab/ui'; import { GlButton, GlTabs, GlTab } from '@gitlab/ui';
import AlertsSettingsForm from './alerts_form.vue'; import AlertsSettingsForm from './alerts_form.vue';
import PagerDutySettingsForm from './pagerduty_form.vue'; import PagerDutySettingsForm from './pagerduty_form.vue';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { INTEGRATION_TABS_CONFIG, I18N_INTEGRATION_TABS } from '../constants'; import { INTEGRATION_TABS_CONFIG, I18N_INTEGRATION_TABS } from '../constants';
export default { export default {
...@@ -13,17 +12,8 @@ export default { ...@@ -13,17 +12,8 @@ export default {
AlertsSettingsForm, AlertsSettingsForm,
PagerDutySettingsForm, PagerDutySettingsForm,
}, },
mixins: [glFeatureFlagMixin()],
tabs: INTEGRATION_TABS_CONFIG, tabs: INTEGRATION_TABS_CONFIG,
i18n: I18N_INTEGRATION_TABS, i18n: I18N_INTEGRATION_TABS,
methods: {
isFeatureFlagEnabled(tab) {
if (tab.featureFlag) {
return this.glFeatures[tab.featureFlag];
}
return true;
},
},
}; };
</script> </script>
...@@ -49,7 +39,7 @@ export default { ...@@ -49,7 +39,7 @@ export default {
<gl-tabs> <gl-tabs>
<gl-tab <gl-tab
v-for="(tab, index) in $options.tabs" v-for="(tab, index) in $options.tabs"
v-if="tab.active && isFeatureFlagEnabled(tab)" v-if="tab.active"
:key="`${tab.title}_${index}`" :key="`${tab.title}_${index}`"
:title="tab.title" :title="tab.title"
> >
......
...@@ -11,7 +11,6 @@ export const INTEGRATION_TABS_CONFIG = [ ...@@ -11,7 +11,6 @@ export const INTEGRATION_TABS_CONFIG = [
title: s__('IncidentSettings|PagerDuty integration'), title: s__('IncidentSettings|PagerDuty integration'),
component: 'PagerDutySettingsForm', component: 'PagerDutySettingsForm',
active: true, active: true,
featureFlag: 'pagerdutyWebhook',
}, },
{ {
title: s__('IncidentSettings|Grafana integration'), title: s__('IncidentSettings|Grafana integration'),
......
...@@ -6,9 +6,7 @@ describe('IncidentsSettingTabs', () => { ...@@ -6,9 +6,7 @@ describe('IncidentsSettingTabs', () => {
let wrapper; let wrapper;
beforeEach(() => { beforeEach(() => {
wrapper = shallowMount(IncidentsSettingTabs, { wrapper = shallowMount(IncidentsSettingTabs);
provide: { glFeatures: { pagerdutyWebhook: true } },
});
}); });
afterEach(() => { afterEach(() => {
......
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