diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue')
-rw-r--r-- | app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue index ec93980251b..1242493fb57 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue @@ -75,15 +75,6 @@ export default { validProjectKey() { return !this.enableJiraIssues || Boolean(this.projectKey) || !this.validated; }, - showJiraVulnerabilitiesOptions() { - return this.showJiraVulnerabilitiesIntegration; - }, - showUltimateUpgrade() { - return this.showJiraIssuesIntegration && !this.showJiraVulnerabilitiesIntegration; - }, - showPremiumUpgrade() { - return !this.showJiraIssuesIntegration; - }, }, created() { eventHub.$on('validateForm', this.validateForm); @@ -128,23 +119,30 @@ export default { }} </template> </gl-form-checkbox> - <jira-issue-creation-vulnerabilities - v-if="enableJiraIssues" - :project-key="projectKey" - :initial-is-enabled="initialEnableJiraVulnerabilities" - :initial-issue-type-id="initialVulnerabilitiesIssuetype" - :show-full-feature="showJiraVulnerabilitiesOptions" - data-testid="jira-for-vulnerabilities" - @request-get-issue-types="getJiraIssueTypes" - /> + <template v-if="enableJiraIssues"> + <jira-issue-creation-vulnerabilities + :project-key="projectKey" + :initial-is-enabled="initialEnableJiraVulnerabilities" + :initial-issue-type-id="initialVulnerabilitiesIssuetype" + :show-full-feature="showJiraVulnerabilitiesIntegration" + data-testid="jira-for-vulnerabilities" + @request-get-issue-types="getJiraIssueTypes" + /> + <jira-upgrade-cta + v-if="!showJiraVulnerabilitiesIntegration" + class="gl-mt-2 gl-ml-6" + data-testid="ultimate-upgrade-cta" + show-ultimate-message + :upgrade-plan-path="upgradePlanPath" + /> + </template> </template> <jira-upgrade-cta - v-if="showUltimateUpgrade || showPremiumUpgrade" + v-else class="gl-mt-2" - :class="{ 'gl-ml-6': showUltimateUpgrade }" + data-testid="premium-upgrade-cta" + show-premium-message :upgrade-plan-path="upgradePlanPath" - :show-ultimate-message="showUltimateUpgrade" - :show-premium-message="showPremiumUpgrade" /> </div> </gl-form-group> |