diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-01 16:15:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-01 16:15:24 +0000 |
| commit | 01a978593952456f8ff97cc3d415b3dfc5e421e8 (patch) | |
| tree | ba61e5397d12def53cf99438d501328d3113029a /app | |
| parent | 8608da87064f4423abd745435736ac3e65a58054 (diff) | |
| parent | cfa0c6592a882f0792240ba70b5ce8fff2b46130 (diff) | |
| download | gitlab-ce-01a978593952456f8ff97cc3d415b3dfc5e421e8.tar.gz | |
Merge branch '63590-pipeline-actions-cause-full-refresh' into 'master'
Resolve "Pipeline actions cause full refresh"
Closes #63590
See merge request gitlab-org/gitlab-ce!30190
Diffstat (limited to 'app')
3 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_table.vue index 03d332cd430..d3ba0c97f6b 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table.vue @@ -44,6 +44,11 @@ export default { cancelingPipeline: null, }; }, + watch: { + pipelines() { + this.cancelingPipeline = null; + }, + }, created() { eventHub.$on('openConfirmationModal', this.setModalData); }, diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue index e32e2f785bd..5275de3bc8b 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue @@ -241,7 +241,11 @@ export default { return this.cancelingPipeline === this.pipeline.id; }, }, - + watch: { + pipeline() { + this.isRetrying = false; + }, + }, methods: { handleCancelClick() { eventHub.$emit('openConfirmationModal', { diff --git a/app/assets/javascripts/pipelines/mixins/pipelines.js b/app/assets/javascripts/pipelines/mixins/pipelines.js index 3cc9d0a3a4e..a6243366375 100644 --- a/app/assets/javascripts/pipelines/mixins/pipelines.js +++ b/app/assets/javascripts/pipelines/mixins/pipelines.js @@ -107,8 +107,8 @@ export default { } // Stop polling this.poll.stop(); - // Update the table - return this.getPipelines().then(() => this.poll.restart()); + // Restarting the poll also makes an initial request + this.poll.restart(); }, fetchPipelines() { if (!this.isMakingRequest) { @@ -153,7 +153,7 @@ export default { postAction(endpoint) { this.service .postAction(endpoint) - .then(() => this.fetchPipelines()) + .then(() => this.updateTable()) .catch(() => Flash(__('An error occurred while making the request.'))); }, }, |