Fixed the issue tracker in the project sidebarnew-project-sidebar-issues-link

Closes #36694

5 files changed, 43 insertions, 20 deletions

diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index 31984c5d7ed..4bffc9ce37a 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -25,7 +25,7 @@ class IssueTrackerService < Service
   end
 
   def issue_tracker_path
-    project_url
+    issues_url
   end
 
   def new_issue_path
diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml
index 0ef81375c3a..0161848a7ae 100644
--- a/app/views/layouts/nav/_new_project_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_project_sidebar.html.haml
@@ -80,7 +80,7 @@
 
       - if project_nav_tab? :issues
         = nav_link(controller: @project.issues_enabled? ? [:issues, :labels, :milestones, :boards] : :issues) do
-          = link_to project_issues_path(@project), title: 'Issues', class: 'shortcuts-issues' do
+          = link_to @project.issues_tracker.issue_tracker_path, title: 'Issues', class: 'shortcuts-issues' do
             .nav-icon-container
               = custom_icon('issues')
             %span.nav-item-name
@@ -88,26 +88,27 @@
             - if @project.issues_enabled?
               %span.badge.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
 
-          %ul.sidebar-sub-level-items
-            = nav_link(controller: :issues) do
-              = link_to project_issues_path(@project), title: 'Issues' do
-                %span
-                  List
+          - if @project.default_issues_tracker?
+            %ul.sidebar-sub-level-items
+              = nav_link(controller: :issues) do
+                = link_to project_issues_path(@project), title: 'Issues' do
+                  %span
+                    List
 
-            = nav_link(controller: :boards) do
-              = link_to project_boards_path(@project), title: 'Board' do
-                %span
-                  Board
+              = nav_link(controller: :boards) do
+                = link_to project_boards_path(@project), title: 'Board' do
+                  %span
+                    Board
 
-            = nav_link(controller: :labels) do
-              = link_to project_labels_path(@project), title: 'Labels' do
-                %span
-                  Labels
+              = nav_link(controller: :labels) do
+                = link_to project_labels_path(@project), title: 'Labels' do
+                  %span
+                    Labels
 
-            = nav_link(controller: :milestones) do
-              = link_to project_milestones_path(@project), title: 'Milestones' do
-                %span
-                  Milestones
+              = nav_link(controller: :milestones) do
+                = link_to project_milestones_path(@project), title: 'Milestones' do
+                  %span
+                    Milestones
 
       - if project_nav_tab? :merge_requests
         = nav_link(controller: @project.issues_enabled? ? :merge_requests : [:merge_requests, :labels, :milestones]) do
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 924cd2e9681..78fd4421c98 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -24,7 +24,7 @@
 
     - if project_nav_tab? :issues
       = nav_link(controller: @project.issues_enabled? ? [:issues, :labels, :milestones, :boards] : :issues) do
-        = link_to project_issues_path(@project), title: 'Issues', class: 'shortcuts-issues' do
+        = link_to @project.issues_tracker.issue_tracker_path, title: 'Issues', class: 'shortcuts-issues' do
           %span
             Issues
             - if @project.issues_enabled?
diff --git a/changelogs/unreleased/new-project-sidebar-issues-link.yml b/changelogs/unreleased/new-project-sidebar-issues-link.yml
new file mode 100644
index 00000000000..9ffcf63c00e
--- /dev/null
+++ b/changelogs/unreleased/new-project-sidebar-issues-link.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed issue tracker link in sidebar
+merge_request:
+author:
+type: fixed
diff --git a/spec/features/projects/services/jira_service_spec.rb b/spec/features/projects/services/jira_service_spec.rb
index 65e3a487d4b..eedd495144b 100644
--- a/spec/features/projects/services/jira_service_spec.rb
+++ b/spec/features/projects/services/jira_service_spec.rb
@@ -38,6 +38,23 @@ feature 'Setup Jira service', :js do
         expect(page).to have_content('JIRA activated.')
         expect(current_path).to eq(project_settings_integrations_path(project))
       end
+
+      it 'updates project sidebar with Jira issues link' do
+        click_link('JIRA')
+        fill_form
+        click_button('Test settings and save changes')
+        wait_for_requests
+
+        allow_any_instance_of(ApplicationHelper).to receive(:show_new_nav?).and_return(true)
+
+        visit project_path(project)
+
+        within '.nav-sidebar' do
+          expect(find('a', text: 'Issues')[:href]).to include(url)
+          expect(page).not_to have_link 'Labels'
+          expect(page).not_to have_link 'Milestones'
+        end
+      end
     end
 
     context 'when Jira connection test fails' do