diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-10-06 20:07:05 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-10-06 20:07:05 +0300 |
commit | 4299df0439d01f190aa7e27a2d49344844596e6a (patch) | |
tree | 42aff84257ce44f3f2b52fa75db9dc0ffaf2e604 | |
parent | fb70fadaca6d2ce30730e9a6c995ad8e4f0526e3 (diff) | |
parent | ee2c13d78d2289c87218068c0231f1386d7da2eb (diff) |
Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master'
Add 1000 plus counters for jobs page
See merge request gitlab-org/gitlab-ce!14507
-rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 | ||||
-rw-r--r-- | app/helpers/numbers_helper.rb | 11 | ||||
-rw-r--r-- | app/views/projects/jobs/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/builds/_tabs.html.haml | 8 | ||||
-rw-r--r-- | changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/jobs-sort-by-id.yml | 5 |
6 files changed, 27 insertions, 6 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 96abdac91b6..1b985ea9763 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -11,7 +11,7 @@ class Projects::JobsController < Projects::ApplicationController def index @scope = params[:scope] @all_builds = project.builds.relevant - @builds = @all_builds.order('created_at DESC') + @builds = @all_builds.order('ci_builds.id DESC') @builds = case @scope when 'pending' diff --git a/app/helpers/numbers_helper.rb b/app/helpers/numbers_helper.rb new file mode 100644 index 00000000000..45bd3606076 --- /dev/null +++ b/app/helpers/numbers_helper.rb @@ -0,0 +1,11 @@ +module NumbersHelper + def limited_counter_with_delimiter(resource, **options) + limit = options.fetch(:limit, 1000).to_i + count = resource.limit(limit + 1).count(:all) + if count > limit + number_with_delimiter(count - 1, options) + '+' + else + number_with_delimiter(count, options) + end + end +end diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml index 4a238b99b58..9963cc93633 100644 --- a/app/views/projects/jobs/index.html.haml +++ b/app/views/projects/jobs/index.html.haml @@ -8,7 +8,7 @@ .nav-controls - if can?(current_user, :update_build, @project) - - if @all_builds.running_or_pending.any? + - if @all_builds.running_or_pending.limit(1).any? = link_to 'Cancel running', cancel_all_project_jobs_path(@project), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post diff --git a/app/views/shared/builds/_tabs.html.haml b/app/views/shared/builds/_tabs.html.haml index 3baa956b910..639f28cc210 100644 --- a/app/views/shared/builds/_tabs.html.haml +++ b/app/views/shared/builds/_tabs.html.haml @@ -3,22 +3,22 @@ = link_to build_path_proc.call(nil) do All %span.badge.js-totalbuilds-count - = number_with_delimiter(all_builds.count(:id)) + = limited_counter_with_delimiter(all_builds) %li{ class: active_when(scope == 'pending') }> = link_to build_path_proc.call('pending') do Pending %span.badge - = number_with_delimiter(all_builds.pending.count(:id)) + = limited_counter_with_delimiter(all_builds.pending) %li{ class: active_when(scope == 'running') }> = link_to build_path_proc.call('running') do Running %span.badge - = number_with_delimiter(all_builds.running.count(:id)) + = limited_counter_with_delimiter(all_builds.running) %li{ class: active_when(scope == 'finished') }> = link_to build_path_proc.call('finished') do Finished %span.badge - = number_with_delimiter(all_builds.finished.count(:id)) + = limited_counter_with_delimiter(all_builds.finished) diff --git a/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml b/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml new file mode 100644 index 00000000000..5f5a61406da --- /dev/null +++ b/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml @@ -0,0 +1,5 @@ +--- +title: Add 1000+ counters to job page +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/jobs-sort-by-id.yml b/changelogs/unreleased/jobs-sort-by-id.yml new file mode 100644 index 00000000000..ec2c3a17b74 --- /dev/null +++ b/changelogs/unreleased/jobs-sort-by-id.yml @@ -0,0 +1,5 @@ +--- +title: Sort JobsController by id, not created_at +merge_request: +author: +type: fixed |