diff --git a/app/assets/javascripts/merge_requests/list/index.js b/app/assets/javascripts/merge_requests/list/index.js index 1d8f3b60693027db78377c2592697a6f63780b73..ed9c6c598718325b0c76ceecdf10873459eb086f 100644 --- a/app/assets/javascripts/merge_requests/list/index.js +++ b/app/assets/javascripts/merge_requests/list/index.js @@ -32,7 +32,6 @@ export async function mountMergeRequestListsApp({ newMergeRequestPath, showExportButton, issuableType, - issuableCount, email, exportCsvPath, rssUrl, @@ -71,7 +70,6 @@ export async function mountMergeRequestListsApp({ newMergeRequestPath, showExportButton: parseBoolean(showExportButton), issuableType, - issuableCount: Number(issuableCount), email, exportCsvPath, rssUrl, diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index e5baef96802be511a33b15a9fb287b18d0a44238..fe9d0484c98daddf69073cdd13658c3cb71cd8aa 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -262,7 +262,6 @@ def common_merge_request_list_data(current_user) is_signed_in: current_user.present?.to_s, show_export_button: "true", issuable_type: :merge_request, - issuable_count: issuables_count_for_state(:merge_request, params[:state]), email: current_user.present? ? current_user.notification_email_or_default : nil, rss_url: url_for(safe_params.merge(rss_url_options)), emails_help_page_path: help_page_path('development/emails.md', anchor: 'email-namespace'), diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 0df0451bf5c3d666301e7c1dcabe6bf7cbdb589b..56a2075d2dc9f14d478a8c0699f2b6f65cc57696 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -1,24 +1,25 @@ -- @can_bulk_update = can?(current_user, :admin_merge_request, @group) && @group.licensed_feature_available?(:group_bulk_edit) && issuables_count_for_state(:merge_requests, :all) > 0 - +- has_bulk_update_permission = can?(current_user, :admin_merge_request, @group) && @group.licensed_feature_available?(:group_bulk_edit) - page_title _("Merge requests") - add_page_specific_style 'page_bundles/issuable_list' - if Feature.enabled?(:vue_merge_request_list, @group) .js-merge-request-list-root{ data: group_merge_requests_list_data(@group, current_user) } - - if @can_bulk_update + - if has_bulk_update_permission = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :merge_requests - else + - can_bulk_update = has_bulk_update_permission && issuables_count_for_state(:merge_requests, :all) > 0 + .top-area = render 'shared/issuable/nav', type: :merge_requests, display_count: !@search_timeout_occurred - if current_user .nav-controls - - if @can_bulk_update + - if can_bulk_update = render_if_exists 'projects/merge_requests/bulk_update_button' = render 'shared/new_project_item_vue_select' = render 'shared/issuable/search_bar', type: :merge_requests - - if @can_bulk_update + - if can_bulk_update = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :merge_requests - if @search_timeout_occurred diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 6d408862f9beed1926b9412402f624e8e6a527b5..26dbbc25ca16e9060c1b8718c8a389795c628153 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -342,7 +342,6 @@ new_merge_request_path: project_new_merge_request_path(project), show_export_button: 'true', issuable_type: :merge_request, - issuable_count: 5, email: current_user.notification_email_or_default, export_csv_path: '/csv-url', rss_url: '/rss-url', @@ -455,7 +454,6 @@ is_public_visibility_restricted: 'false', is_signed_in: 'true', issuable_type: :merge_request, - issuable_count: 5, email: current_user.notification_email_or_default, rss_url: "/rss-url", releases_endpoint: group_releases_path(group, format: :json),