diff options
| author | shampton <shampton@gitlab.com> | 2019-06-28 15:36:56 -0700 |
|---|---|---|
| committer | shampton <shampton@gitlab.com> | 2019-06-28 15:36:56 -0700 |
| commit | cfa0c6592a882f0792240ba70b5ce8fff2b46130 (patch) | |
| tree | 3e3e02e2e9f7be8609b66fe518dacb1faea2f5f2 /app/assets/javascripts/pipelines/components | |
| parent | 1cd8fb49f9b9150faf50767edbdfb564fde8576b (diff) | |
| download | gitlab-ce-cfa0c6592a882f0792240ba70b5ce8fff2b46130.tar.gz | |
Fix pipelines table update after action63590-pipeline-actions-cause-full-refresh
The pipelines table was showing the loading icon
after the user cancelled or retried a pipeline.
This fixes that so the pipeline updates without
removing the table from the DOM.
Diffstat (limited to 'app/assets/javascripts/pipelines/components')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_table.vue | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_table_row.vue | 6 |
2 files changed, 10 insertions, 1 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', { |