Merge branch '296833_consider_context_path_in_jira_issue_entity' into 'master'

Consider context path in Jira issue links

See merge request gitlab-org/gitlab!51797

ee/app/serializers/integrations/jira/issue_entity.rb

@@ -58,7 +58,7 @@ module Integrations
       end
 
       expose :web_url do |jira_issue|
-        "#{jira_issue.client.options[:site]}browse/#{jira_issue.key}"
+        "#{base_web_url(jira_issue)}/browse/#{jira_issue.key}"
       end
 
       expose :references do |jira_issue|
@@ -78,11 +78,20 @@ module Integrations
         # accountId is only available on Jira Cloud.
         # https://community.atlassian.com/t5/Jira-Questions/How-to-find-account-id-on-jira-on-premise/qaq-p/1168652
         if jira_issue.reporter.try(:accountId)
-          "#{jira_issue.client.options[:site]}people/#{jira_issue.reporter.accountId}"
+          "#{base_web_url(jira_issue)}/people/#{jira_issue.reporter.accountId}"
         else
-          "#{jira_issue.client.options[:site]}secure/ViewProfile.jspa?name=#{jira_issue.reporter.name}"
+          "#{base_web_url(jira_issue)}/secure/ViewProfile.jspa?name=#{jira_issue.reporter.name}"
         end
       end
+
+      def base_web_url(jira_issue)
+        site_url = jira_issue.client.options[:site].delete_suffix('/')
+        context_path = jira_issue.client.options[:context_path].to_s.delete_prefix('/')
+
+        return site_url if context_path.empty?
+
+        [site_url, context_path].join('/')
+      end
     end
   end
 end

ee/changelogs/unreleased/296833_consider_context_path_in_jira_issue_entity.yml

+---
+title: Fix Jira issue list links when Jira runs on a subpath
+merge_request: 51797
+author:
+type: fixed

ee/spec/graphql/resolvers/external_issue_resolver_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Resolvers::ExternalIssueResolver do
         labels: [],
         reporter: double(displayName: 'User', accountId: '10000'),
         assignee: nil,
-        client: double(options: { site: nil })
+        client: double(options: { site: 'http://jira.com/' })
       )
     end
 
@@ -37,10 +37,10 @@ RSpec.describe Resolvers::ExternalIssueResolver do
         'labels' => [],
         'author' => {
           'name' => 'User',
-          'web_url' => 'people/10000'
+          'web_url' => 'http://jira.com/people/10000'
         },
         'assignees' => [],
-        'web_url' => 'browse/GV-1',
+        'web_url' => 'http://jira.com/browse/GV-1',
         'references' => {
           'relative' => 'GV-1'
         },

ee/spec/serializers/integrations/jira/issue_entity_spec.rb

@@ -23,11 +23,13 @@ RSpec.describe Integrations::Jira::IssueEntity do
       assignee: double('displayName' => 'assignee'),
       project: double(key: 'GL'),
       key: 'GL-5',
-      client: double(options: { site: 'http://jira.com/' }),
+      client: jira_client,
       status: double(name: 'To Do')
     )
   end
 
+  let(:jira_client) { double(options: { site: 'http://jira.com/' }) }
+
   subject { described_class.new(jira_issue, project: project).as_json }
 
   it 'returns the Jira issues attributes' do
@@ -63,6 +65,15 @@ RSpec.describe Integrations::Jira::IssueEntity do
     it 'returns the Jira Server profile URL' do
       expect(subject[:author]).to include(web_url: 'http://jira.com/secure/ViewProfile.jspa?name=reporter@reporter.com')
     end
+
+    context 'and context_path' do
+      let(:jira_client) { double(options: { site: 'http://jira.com/', context_path: '/jira-sub-path' }) }
+
+      it 'returns URLs including context path' do
+        expect(subject[:author]).to include(web_url: 'http://jira.com/jira-sub-path/secure/ViewProfile.jspa?name=reporter@reporter.com')
+        expect(subject[:web_url]).to eq('http://jira.com/jira-sub-path/browse/GL-5')
+      end
+    end
   end
 
   context 'with Jira Cloud configuration' do