Commit 187a4495 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '321258-hide-threat-monitoring-policies-tab' into 'master'

Hide Policies tab when feature flag is enabled

See merge request gitlab-org/gitlab!68807
parents 84ff5886 a961ce0e
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import { GlIcon, GlLink, GlPopover, GlTabs, GlTab } from '@gitlab/ui'; import { GlIcon, GlLink, GlPopover, GlTabs, GlTab } from '@gitlab/ui';
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import Alerts from './alerts/alerts.vue'; import Alerts from './alerts/alerts.vue';
import NoEnvironmentEmptyState from './no_environment_empty_state.vue'; import NoEnvironmentEmptyState from './no_environment_empty_state.vue';
import PolicyList from './policy_list.vue'; import PolicyList from './policy_list.vue';
...@@ -22,6 +23,7 @@ export default { ...@@ -22,6 +23,7 @@ export default {
PolicyList, PolicyList,
NoEnvironmentEmptyState, NoEnvironmentEmptyState,
}, },
mixins: [glFeatureFlagMixin()],
inject: ['documentationPath'], inject: ['documentationPath'],
props: { props: {
defaultEnvironmentId: { defaultEnvironmentId: {
...@@ -46,6 +48,11 @@ export default { ...@@ -46,6 +48,11 @@ export default {
isSetUpMaybe: this.isValidEnvironmentId(this.defaultEnvironmentId), isSetUpMaybe: this.isValidEnvironmentId(this.defaultEnvironmentId),
}; };
}, },
computed: {
shouldShowPolicies() {
return !this.glFeatures.securityOrchestrationPoliciesConfiguration;
},
},
created() { created() {
if (this.isSetUpMaybe) { if (this.isSetUpMaybe) {
this.setCurrentEnvironmentId(this.defaultEnvironmentId); this.setCurrentEnvironmentId(this.defaultEnvironmentId);
...@@ -95,6 +102,7 @@ export default { ...@@ -95,6 +102,7 @@ export default {
<alerts /> <alerts />
</gl-tab> </gl-tab>
<gl-tab <gl-tab
v-if="shouldShowPolicies"
ref="policyTab" ref="policyTab"
:title="s__('ThreatMonitoring|Policies')" :title="s__('ThreatMonitoring|Policies')"
data-qa-selector="policies_tab" data-qa-selector="policies_tab"
......
...@@ -134,4 +134,14 @@ describe('ThreatMonitoringApp component', () => { ...@@ -134,4 +134,14 @@ describe('ThreatMonitoringApp component', () => {
expect(findAlertsView().exists()).toBe(true); expect(findAlertsView().exists()).toBe(true);
}); });
}); });
describe('with "securityOrchestrationPoliciesConfiguration" feature flag enabled', () => {
beforeEach(() => {
factory({ provide: { glFeatures: { securityOrchestrationPoliciesConfiguration: true } } });
});
it('does not render the Policies tab', () => {
expect(findPolicyTab().exists()).toBe(false);
});
});
}); });
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