kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix pagination and duplicate requests in environments page 

This commit fixes two problems:

1. When a user clicked on another page, the app would fetch the new page
data but never update because the request and response parameters failed
to match the isEqual check. This was happening because the JSON response
omitted the `nested` attribute, so there was a comparison with a `null`
value.  We fix this by scrubbing undefined values before doing the
comparison.

2. There were duplicate requests made for the environments page because
the success handler of fetchPipelines() would cause the polling
component to make another XHR request.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58191
This commit is contained in:
Stan Hu 2019-02-26 14:40:13 -08:00
parent 3b05d4817b
commit 7765e6ec10
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/environments/mixins/environments_mixin.js
View File

@ -43,7 +43,11 @@ export default {
saveData(resp) {
this.isLoading = false;
if (_.isEqual(resp.config.params, this.requestData)) {
// Prevent the absence of the nested flag from causing mismatches
const response = _.omit(resp.config.params, _.isUndefined);
const request = _.omit(this.requestData, _.isUndefined);
if (_.isEqual(response, request)) {
this.store.storeAvailableCount(resp.data.available_count);
this.store.storeStoppedCount(resp.data.stopped_count);
this.store.storeEnvironments(resp.data.environments);
@ -64,10 +68,9 @@ export default {
// fetch new data
return this.service
.fetchEnvironments(this.requestData)
.then(response => this.successCallback(response))
.then(() => {
// restart polling
this.poll.restart({ data: this.requestData });
.then(response => {
this.successCallback(response);
this.poll.enable({ data: this.requestData, response });
})
.catch(() => {
this.errorCallback();

5
changelogs/unreleased/sh-wip-fix-duplicate-env-xhr.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix pagination and duplicate requests in environments page
merge_request: 25582
author:
type: fixed