Move issueTrackerConflictWarning to backend

Remove attributes passed to frontend for this

app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue

@@ -47,21 +47,11 @@ export default {
       required: false,
       default: null,
     },
-    gitlabIssuesEnabled: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
     upgradePlanPath: {
       type: String,
       required: false,
       default: '',
     },
-    editProjectPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
     isValidated: {
       type: Boolean,
       required: false,
@@ -91,9 +81,6 @@ export default {
     projectKeyLabel: s__('JiraService|Jira project key'),
     projectKeyPlaceholder: s__('JiraService|For example, AB'),
     requiredFieldFeedback: __('This field is required.'),
-    issueTrackerConflictWarning: s__(
-      'JiraService|Displaying Jira issues while leaving GitLab issues also enabled might be confusing. Consider %{linkStart}disabling GitLab issues%{linkEnd} if they won’t otherwise be used.',
-    ),
   },
 };
 </script>
@@ -135,14 +122,6 @@ export default {
           />
         </gl-form-group>
 
-        <p v-if="gitlabIssuesEnabled" data-testid="conflict-warning-text">
-          <gl-sprintf :message="$options.i18n.issueTrackerConflictWarning">
-            <template #link="{ content }">
-              <gl-link :href="editProjectPath" target="_blank">{{ content }}</gl-link>
-            </template>
-          </gl-sprintf>
-        </p>
-
         <jira-issue-creation-vulnerabilities
           :project-key="projectKey"
           :initial-is-enabled="initialEnableJiraVulnerabilities"

app/assets/javascripts/integrations/edit/index.js

@@ -22,7 +22,6 @@ function parseDatasetToProps(data) {
     commentDetail,
     projectKey,
     upgradePlanPath,
-    editProjectPath,
     learnMorePath,
     triggerEvents,
     sections,
@@ -52,7 +51,6 @@ function parseDatasetToProps(data) {
     showJiraVulnerabilitiesIntegration,
     enableJiraIssues,
     enableJiraVulnerabilities,
-    gitlabIssuesEnabled,
   } = parseBooleanInData(booleanAttributes);
 
   return {
@@ -81,9 +79,7 @@ function parseDatasetToProps(data) {
       initialEnableJiraVulnerabilities: enableJiraVulnerabilities,
       initialVulnerabilitiesIssuetype: vulnerabilitiesIssuetype,
       initialProjectKey: projectKey,
-      gitlabIssuesEnabled,
       upgradePlanPath,
-      editProjectPath,
     },
     learnMorePath,
     triggerEvents: JSON.parse(triggerEvents),

app/models/integrations/jira.rb

@@ -143,7 +143,7 @@ module Integrations
     end
 
     def help
-      jira_doc_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('integration/jira/index.html') }
+      jira_doc_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_url('integration/jira/index.html') }
       s_("JiraService|You must configure Jira before enabling this integration. %{jira_doc_link_start}Learn more.%{link_end}") % { jira_doc_link_start: jira_doc_link_start, link_end: '</a>'.html_safe }
     end
 
@@ -160,8 +160,6 @@ module Integrations
     end
 
     def sections
-      jira_issues_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('integration/jira/issues.html') }
-
       sections = [
         {
           type: SECTION_TYPE_CONNECTION,
@@ -177,10 +175,19 @@ module Integrations
 
       # Jira issues is currently only configurable on the project level.
       if project_level?
+        jira_issues_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_url('integration/jira/issues.html') }
+        description = s_('JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues. %{jira_issues_link_start}Learn more.%{link_end}') % { jira_issues_link_start: jira_issues_link_start, link_end: '</a>'.html_safe }
+
+        if project&.issues_enabled?
+          gitlab_issues_link_start = '<a href="%{url}">'.html_safe % { url: edit_project_path(project, anchor: 'js-shared-permissions') }
+          description += '<br><br>'.html_safe
+          description += s_("JiraService|Displaying Jira issues while leaving GitLab issues also enabled might be confusing. Consider %{gitlab_issues_link_start}disabling GitLab issues%{link_end} if they won't otherwise be used.") % { gitlab_issues_link_start: gitlab_issues_link_start, link_end: '</a>'.html_safe }
+        end
+
         sections.push({
           type: SECTION_TYPE_JIRA_ISSUES,
           title: _('Issues'),
-          description: s_('JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues. %{jira_issues_link_start}Learn more.%{link_end}') % { jira_issues_link_start: jira_issues_link_start, link_end: '</a>'.html_safe }
+          description: description
         })
       end
 

ee/app/helpers/ee/integrations_helper.rb

@@ -21,9 +21,7 @@ module EE
           enable_jira_vulnerabilities: integration.jira_vulnerabilities_integration_enabled?.to_s,
           project_key: integration.project_key,
           vulnerabilities_issuetype: integration.vulnerabilities_issuetype,
-          gitlab_issues_enabled: @project&.issues_enabled?.to_s,
-          upgrade_plan_path: @project && ::Gitlab::CurrentSettings.should_check_namespace_plan? ? upgrade_plan_path(@project.group) : nil,
-          edit_project_path: @project ? edit_project_path(@project, anchor: 'js-shared-permissions') : nil
+          upgrade_plan_path: @project && ::Gitlab::CurrentSettings.should_check_namespace_plan? ? upgrade_plan_path(@project.group) : nil
         )
       end