fix: redirect routes when closing modals (#1280)

screwdriver-cd · Dec 5, 2024 · bdd6687 · bdd6687
1 parent 32b0e3a
commit bdd6687
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/app/components/pipeline/modal/confirm-action/component.js b/app/components/pipeline/modal/confirm-action/component.js
@@ -115,11 +115,22 @@ export default class PipelineModalConfirmActionComponent extends Component {
       .fetchFromApi('post', '/events', data)
       .then(event => {
         this.args.closeModal();
-        this.router.transitionTo('v2.pipeline.events.show', {
-          event,
-          reloadEventRail: true,
-          id: event.id
-        });
+
+        if (this.router.currentRouteName === 'v2.pipeline.events.show') {
+          this.router.transitionTo('v2.pipeline.events.show', {
+            event,
+            reloadEventRail: true,
+            id: event.id
+          });
+        } else if (this.router.currentRouteName === 'v2.pipeline.pulls.show') {
+          this.router.transitionTo('v2.pipeline.pulls.show', {
+            event,
+            reloadEventRail: true,
+            id: event.prNum,
+            pull_request_number: event.prNum,
+            sha: event.sha
+          });
+        }
       })
       .catch(err => {
         this.wasActionSuccessful = false;

diff --git a/app/components/pipeline/modal/start-event/component.js b/app/components/pipeline/modal/start-event/component.js
@@ -70,11 +70,22 @@ export default class PipelineModalStartEventComponent extends Component {
       .fetchFromApi('post', '/events', data)
       .then(event => {
         this.args.closeModal();
-        this.router.transitionTo('v2.pipeline.events.show', {
-          event,
-          reloadEventRail: true,
-          id: event.id
-        });
+
+        if (this.router.currentRouteName === 'v2.pipeline.events.show') {
+          this.router.transitionTo('v2.pipeline.events.show', {
+            event,
+            reloadEventRail: true,
+            id: event.id
+          });
+        } else if (this.router.currentRouteName === 'v2.pipeline.pulls.show') {
+          this.router.transitionTo('v2.pipeline.pulls.show', {
+            event,
+            reloadEventRail: true,
+            id: event.prNum,
+            pull_request_number: event.prNum,
+            sha: event.sha
+          });
+        }
       })
       .catch(err => {
         this.wasActionSuccessful = false;