diff options
| author | Mario de la Ossa <mariodelaossa@gmail.com> | 2017-12-18 17:08:28 -0600 |
|---|---|---|
| committer | Mario de la Ossa <mariodelaossa@gmail.com> | 2017-12-21 10:43:08 -0600 |
| commit | e1f5c2b194fa8ee898446517f1802c6e28312b0b (patch) | |
| tree | 9be4c0a82667426bd013e4ca99241fc33c50947e | |
| parent | f7a9ced235be7ef13f90b561d23ffe602e11e9a3 (diff) | |
| download | gitlab-ce-e1f5c2b194fa8ee898446517f1802c6e28312b0b.tar.gz | |
Do not show Vue pagination if only one page
3 files changed, 28 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/table_pagination.vue b/app/assets/javascripts/vue_shared/components/table_pagination.vue index 710452bb3d3..33096b53cf8 100644 --- a/app/assets/javascripts/vue_shared/components/table_pagination.vue +++ b/app/assets/javascripts/vue_shared/components/table_pagination.vue @@ -122,11 +122,17 @@ export default { return items; }, + showPagination() { + return this.pageInfo.totalPages > 1; + }, }, }; </script> <template> - <div class="gl-pagination"> + <div + v-if="showPagination" + class="gl-pagination" + > <ul class="pagination clearfix"> <li v-for="item in getItems" diff --git a/changelogs/unreleased/33609-hide-pagination.yml b/changelogs/unreleased/33609-hide-pagination.yml new file mode 100644 index 00000000000..3586b091cb1 --- /dev/null +++ b/changelogs/unreleased/33609-hide-pagination.yml @@ -0,0 +1,5 @@ +--- +title: Disable Vue pagination when only one page of content is available +merge_request: 15999 +author: Mario de la Ossa +type: fixed diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js b/spec/javascripts/vue_shared/components/table_pagination_spec.js index b0b78e34e0f..1465ef5855f 100644 --- a/spec/javascripts/vue_shared/components/table_pagination_spec.js +++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js @@ -19,6 +19,22 @@ describe('Pagination component', () => { }); describe('render', () => { + it('should not render anything', () => { + component = mountComponet({ + pageInfo: { + nextPage: 1, + page: 1, + perPage: 20, + previousPage: null, + total: 15, + totalPages: 1, + }, + change: spy, + }); + + expect(component.$el.innerHTML).not.toBeDefined(); + }); + describe('prev button', () => { it('should be disabled and non clickable', () => { component = mountComponet({ |