diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-15 20:46:21 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-16 00:05:36 +0300 |
| commit | 1e46be1592acf0d9a20979dd9ad306a4e8563f46 (patch) | |
| tree | 753cf0588fa6660a9fd0b2890ffcf90d27fbded7 /app | |
| parent | 656111607e75eb438b2f18b2bf546f3fd6986915 (diff) | |
Merge branch 'tree_item_limit' into 'master'
Truncate tree to max 1,000 items and display notice to users
Closes #39746
See merge request gitlab-org/gitlab-ce!15333
(cherry picked from commit 69953fae36560773a06bbc426747e3dac6aa1ae1)
03b1bcbb Truncate tree to max 1,000 items and display notice to users
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 7 | ||||
| -rw-r--r-- | app/helpers/tree_helper.rb | 15 | ||||
| -rw-r--r-- | app/views/projects/tree/_truncated_notice_tree_row.html.haml | 7 |
3 files changed, 25 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 50f0ef4414a..65b334662c2 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -125,7 +125,7 @@ color: $white-normal; } - &:hover { + &:hover:not(.tree-truncated-warning) { td { background-color: $row-hover; border-top: 1px solid $row-hover-border; @@ -198,6 +198,11 @@ } } + .tree-truncated-warning { + color: $orange-600; + background-color: $orange-100; + } + .tree-time-ago { min-width: 135px; color: $gl-text-color-secondary; diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index c4ea0f5ac53..0e106e2c85d 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -1,14 +1,23 @@ module TreeHelper + FILE_LIMIT = 1_000 + # Sorts a repository's tree so that folders are before files and renders # their corresponding partials # - # contents - A Grit::Tree object for the current tree + # tree - A `Tree` object for the current tree def render_tree(tree) # Sort submodules and folders together by name ahead of files folders, files, submodules = tree.trees, tree.blobs, tree.submodules - tree = "" + tree = '' items = (folders + submodules).sort_by(&:name) + files - tree << render(partial: "projects/tree/tree_row", collection: items) if items.present? + + if items.size > FILE_LIMIT + tree << render(partial: 'projects/tree/truncated_notice_tree_row', + locals: { limit: FILE_LIMIT, total: items.size }) + items = items.take(FILE_LIMIT) + end + + tree << render(partial: 'projects/tree/tree_row', collection: items) if items.present? tree.html_safe end diff --git a/app/views/projects/tree/_truncated_notice_tree_row.html.haml b/app/views/projects/tree/_truncated_notice_tree_row.html.haml new file mode 100644 index 00000000000..693b641888b --- /dev/null +++ b/app/views/projects/tree/_truncated_notice_tree_row.html.haml @@ -0,0 +1,7 @@ +%tr.tree-truncated-warning + %td{ colspan: '3' } + = icon('exclamation-triangle fw') + %span + Too many items to show. To preserve performance only + %strong #{number_with_delimiter(limit)} of #{number_with_delimiter(total)} + items are displayed. |