diff options
4 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6 index e9ea6d91adb..d096f837285 100644 --- a/app/assets/javascripts/environments/components/environment.js.es6 +++ b/app/assets/javascripts/environments/components/environment.js.es6 @@ -86,7 +86,7 @@ module.exports = Vue.component('environment-component', { this.store.storeAvailableCount(response.body.available_count); this.store.storeStoppedCount(response.body.stopped_count); this.store.storeEnvironments(response.body.environments); - this.store.storePagination(response.headers); + this.store.setPagination(response.headers); }) .then(() => { this.isLoading = false; diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6 index e8b44aeb0bb..87822730be2 100644 --- a/app/assets/javascripts/environments/stores/environments_store.js.es6 +++ b/app/assets/javascripts/environments/stores/environments_store.js.es6 @@ -56,7 +56,7 @@ class EnvironmentsStore { return filteredEnvironments; } - storePagination(pagination = {}) { + setPagination(pagination = {}) { const normalizedHeaders = gl.utils.normalizeHeaders(pagination); const paginationInformation = { perPage: parseInt(normalizedHeaders['X-PER-PAGE'], 10), diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 index 9e816a285e4..39935b08dc0 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 @@ -35,8 +35,16 @@ require('../vue_shared/components/pipelines_table'); this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope, this.apiScope); }, methods: { - change(pagenum, apiScope) { - if (!apiScope) apiScope = 'all'; + + /** + * Changes the URL according to the pagination component. + * + * If no scope is provided, 'all' is assumed. + * + * @param {Number} pagenum + * @param {String} apiScope = 'all' + */ + change(pagenum, apiScope = 'all') { gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`); }, }, diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6 index 49c7dc4b25c..77e182b3830 100644 --- a/spec/javascripts/environments/environments_store_spec.js.es6 +++ b/spec/javascripts/environments/environments_store_spec.js.es6 @@ -51,7 +51,7 @@ const { environmentsList, serverData } = require('./mock_data'); previousPage: 2, }; - store.storePagination(pagination); + store.setPagination(pagination); expect(store.state.paginationInformation).toEqual(expectedResult); }); }); |