Commit d0226559 authored by Jose Vargas's avatar Jose Vargas

Use glFeatureFlag mixin

Also created follow up issue and TODO
comments for the data() function inside
the settings panel component
parent 7a1b718a
...@@ -3,6 +3,7 @@ import { GlSprintf, GlLink } from '@gitlab/ui'; ...@@ -3,6 +3,7 @@ import { GlSprintf, GlLink } from '@gitlab/ui';
import settingsMixin from 'ee_else_ce/pages/projects/shared/permissions/mixins/settings_pannel_mixin'; import settingsMixin from 'ee_else_ce/pages/projects/shared/permissions/mixins/settings_pannel_mixin';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import projectFeatureSetting from './project_feature_setting.vue'; import projectFeatureSetting from './project_feature_setting.vue';
import projectFeatureToggle from '~/vue_shared/components/toggle_button.vue'; import projectFeatureToggle from '~/vue_shared/components/toggle_button.vue';
import projectSettingRow from './project_setting_row.vue'; import projectSettingRow from './project_setting_row.vue';
...@@ -24,7 +25,7 @@ export default { ...@@ -24,7 +25,7 @@ export default {
GlSprintf, GlSprintf,
GlLink, GlLink,
}, },
mixins: [settingsMixin], mixins: [settingsMixin, glFeatureFlagsMixin()],
props: { props: {
currentSettings: { currentSettings: {
...@@ -116,6 +117,8 @@ export default { ...@@ -116,6 +117,8 @@ export default {
const defaults = { const defaults = {
visibilityOptions, visibilityOptions,
visibilityLevel: visibilityOptions.PUBLIC, visibilityLevel: visibilityOptions.PUBLIC,
// TODO: Change all of these to use the visibilityOptions constants
// https://gitlab.com/gitlab-org/gitlab/-/issues/214667
issuesAccessLevel: 20, issuesAccessLevel: 20,
repositoryAccessLevel: 20, repositoryAccessLevel: 20,
forkingAccessLevel: 20, forkingAccessLevel: 20,
...@@ -194,7 +197,7 @@ export default { ...@@ -194,7 +197,7 @@ export default {
}, },
metricsDashboardVisibilitySwitchingAvailable() { metricsDashboardVisibilitySwitchingAvailable() {
return gon.features?.metricsDashboardVisibilitySwitchingAvailable; return this.glFeatures.metricsDashboardVisibilitySwitchingAvailable;
}, },
}, },
......
...@@ -55,7 +55,12 @@ describe('Settings Panel', () => { ...@@ -55,7 +55,12 @@ describe('Settings Panel', () => {
currentSettings: { ...defaultProps.currentSettings, ...currentSettings }, currentSettings: { ...defaultProps.currentSettings, ...currentSettings },
}; };
return mountFn(settingsPanel, { propsData }); return mountFn(settingsPanel, {
propsData,
provide: {
glFeatures: { metricsDashboardVisibilitySwitchingAvailable: true },
},
});
}; };
const overrideCurrentSettings = (currentSettingsProps, extraProps = {}) => { const overrideCurrentSettings = (currentSettingsProps, extraProps = {}) => {
...@@ -66,9 +71,6 @@ describe('Settings Panel', () => { ...@@ -66,9 +71,6 @@ describe('Settings Panel', () => {
beforeEach(() => { beforeEach(() => {
wrapper = mountComponent(); wrapper = mountComponent();
gon.features = gon.features || {};
gon.features.metricsDashboardVisibilitySwitchingAvailable = 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