1 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
index a61bfbe25f3..b743364ff43 100644
--- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
@@ -25,6 +25,7 @@ export default () => {
     data() {
       return {
         mediator,
+        requestFinishedFor: null,
       };
     },
     created() {
@@ -35,12 +36,17 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.mediator.service.postAction(action)
+        // Click was made, reset this variable
+        this.requestFinishedFor = null;
+
+        this.mediator.service
+          .postAction(action)
           .then(() => {
             this.mediator.refreshPipeline();
-            eventHub.$emit('graphActionFinished', action);
+            this.requestFinishedFor = action;
           })
           .catch(() => {
+            this.requestFinishedFor = action;
             Flash(__('An error occurred while making the request.'));
             eventHub.$emit('graphActionFinished', action);
           });
@@ -51,6 +57,7 @@ export default () => {
         props: {
           isLoading: this.mediator.state.isLoading,
           pipeline: this.mediator.store.state.pipeline,
+          requestFinishedFor: this.requestFinishedFor,
         },
       });
     },
@@ -75,7 +82,8 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.mediator.service.postAction(action.path)
+        this.mediator.service
+          .postAction(action.path)
           .then(() => this.mediator.refreshPipeline())
           .catch(() => Flash(__('An error occurred while making the request.')));
       },