Skip to content
Snippets Groups Projects
Commit 3e02a5d8 authored by David Pisek's avatar David Pisek
Browse files

Remove jira_for_vulnerabilities feature flag - FE

* Removes it from components
* Removes it from specs
parent 45d1a4d0
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -8,7 +8,6 @@ import {
GlButton,
GlCard,
} from '@gitlab/ui';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import eventHub from '../event_hub';
 
export default {
Loading
Loading
@@ -24,7 +23,6 @@ export default {
JiraIssueCreationVulnerabilities: () =>
import('ee_component/integrations/edit/components/jira_issue_creation_vulnerabilities.vue'),
},
mixins: [glFeatureFlagsMixin()],
props: {
showJiraIssuesIntegration: {
type: Boolean,
Loading
Loading
@@ -84,11 +82,7 @@ export default {
return !this.enableJiraIssues || Boolean(this.projectKey) || !this.validated;
},
showJiraVulnerabilitiesOptions() {
return (
this.enableJiraIssues &&
this.showJiraVulnerabilitiesIntegration &&
this.glFeatures.jiraForVulnerabilities
);
return this.enableJiraIssues && this.showJiraVulnerabilitiesIntegration;
},
},
created() {
Loading
Loading
Loading
Loading
@@ -5,7 +5,6 @@ import { VULNERABILITY_MODAL_ID } from 'ee/vue_shared/security_reports/component
import { BV_SHOW_MODAL } from '~/lib/utils/constants';
import { visitUrl } from '~/lib/utils/url_utility';
import { s__ } from '~/locale';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
export const i18n = {
moreInfo: s__('SecurityReports|More info'),
Loading
Loading
@@ -24,7 +23,6 @@ export default {
directives: {
GlTooltip: GlTooltipDirective,
},
mixins: [glFeatureFlagsMixin()],
props: {
vulnerability: {
type: Object,
Loading
Loading
@@ -49,10 +47,7 @@ export default {
computed: {
...mapState('vulnerabilities', ['isCreatingIssue', 'isDismissingVulnerability']),
isJiraVulnerabilityIssuesEnabled() {
return (
this.glFeatures?.jiraForVulnerabilities &&
Boolean(this?.vulnerability?.create_jira_issue_url)
);
return Boolean(this?.vulnerability?.create_jira_issue_url);
},
createIssueButtonLabel() {
const { $options } = this;
Loading
Loading
Loading
Loading
@@ -11,7 +11,6 @@ import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import Poll from '~/lib/utils/poll';
import { s__, __ } from '~/locale';
import initUserPopovers from '~/user_popovers';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import HistoryEntry from './history_entry.vue';
import RelatedIssues from './related_issues.vue';
import RelatedJiraIssues from './related_jira_issues.vue';
Loading
Loading
@@ -28,7 +27,6 @@ export default {
GlIcon,
StatusDescription,
},
mixins: [glFeatureFlagMixin()],
inject: {
createJiraIssueUrl: {
default: '',
Loading
Loading
@@ -213,10 +211,7 @@ export default {
class="card-body"
/>
</div>
<related-jira-issues
v-if="glFeatures.jiraForVulnerabilities && createJiraIssueUrl"
class="gl-mt-6"
/>
<related-jira-issues v-if="createJiraIssueUrl" class="gl-mt-6" />
<related-issues
v-else
:endpoint="issueLinksEndpoint"
Loading
Loading
Loading
Loading
@@ -104,9 +104,6 @@ describe('Security Dashboard Action Buttons', () => {
vulnerability: mockDataVulnerabilities[8],
canCreateIssue: true,
},
provide: {
glFeatures: { jiraForVulnerabilities: true },
},
});
});
 
Loading
Loading
Loading
Loading
@@ -300,7 +300,6 @@ describe('Vulnerability Footer', () => {
{
provide: {
createJiraIssueUrl: 'http://foo',
glFeatures: { jiraForVulnerabilities: true },
},
},
);
Loading
Loading
Loading
Loading
@@ -113,7 +113,7 @@ describe('JiraIssuesFields', () => {
 
describe('Vulnerabilities creation', () => {
beforeEach(() => {
createComponent({ provide: { glFeatures: { jiraForVulnerabilities: true } } });
createComponent();
});
 
it.each([true, false])(
Loading
Loading
@@ -147,18 +147,6 @@ describe('JiraIssuesFields', () => {
 
expect(eventHubEmitSpy).toHaveBeenCalledWith('getJiraIssueTypes');
});
describe('with "jiraForVulnerabilities" feature flag disabled', () => {
beforeEach(async () => {
createComponent({
provide: { glFeatures: { jiraForVulnerabilities: false } },
});
});
it('does not show section', () => {
expect(findJiraForVulnerabilities().exists()).toBe(false);
});
});
});
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment