Merge branch 'fix/56558-move-primary-button' into 'master'

fix(labels): Move the primary button out of breadcrumbs and into the project section

Closes #56558

See merge request gitlab-org/gitlab-ce!24516

app/views/groups/labels/index.html.haml

@@ -6,15 +6,10 @@
 - subscribed = params[:subscribed]
 - labels_or_filters = @labels.exists? || search.present? || subscribed.present?
 
-- if @labels.present? && can_admin_label
-  - content_for(:header_content) do
-    .nav-controls
-      = link_to _('New label'), new_group_label_path(@group), class: "btn btn-success"
-
 - if labels_or_filters
   #promote-label-modal
   %div{ class: container_class }
-    = render 'shared/labels/nav'
+    = render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label
 
     .labels-container.prepend-top-5
       - if @labels.any?

app/views/projects/labels/index.html.haml

@@ -5,15 +5,10 @@
 - subscribed = params[:subscribed]
 - labels_or_filters = @labels.exists? || @prioritized_labels.exists? || search.present? || subscribed.present?
 
-- if labels_or_filters && can_admin_label
-  - content_for(:header_content) do
-    .nav-controls
-      = link_to _('New label'), new_project_label_path(@project), class: "btn btn-success qa-label-create-new"
-
 - if labels_or_filters
   #promote-label-modal
   %div{ class: container_class }
-    = render 'shared/labels/nav'
+    = render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label
 
     .labels-container.prepend-top-10
       - if can_admin_label

app/views/shared/labels/_nav.html.haml

@@ -18,3 +18,7 @@
           %button.btn.btn-default{ type: "submit", "aria-label" => _('Submit search') }
             = icon("search")
     = render 'shared/labels/sort_dropdown'
+    - if labels_or_filters && can_admin_label && @project
+      = link_to _('New label'), new_project_label_path(@project), class: "btn btn-success qa-label-create-new"
+    - if labels_or_filters && can_admin_label && @group
+      = link_to _('New label'), new_group_label_path(@group), class: "btn btn-success qa-label-create-new"

changelogs/unreleased/fix-56558-move-primary-button.yml

+---
+title: Moved primary button for labels to follow the design patterns used on rest of the site
+merge_request:
+author: Martin Hobert
+type: fixed

qa/qa/page/label/index.rb

@@ -2,7 +2,7 @@ module QA
   module Page
     module Label
       class Index < Page::Base
-        view 'app/views/projects/labels/index.html.haml' do
+        view 'app/views/shared/labels/_nav.html.haml' do
           element :label_create_new
         end
 

spec/features/projects/labels/update_prioritization_spec.rb

@@ -125,7 +125,7 @@ describe 'Prioritize labels' do
         wait_for_requests
       end
 
-      page.within('.breadcrumbs-container') do
+      page.within('.top-area') do
         expect(page).to have_link('New label')
       end
     end