From 50a35143c926965aba356cd512ff8ba42ad9d5ff Mon Sep 17 00:00:00 2001 From: Phil Renaud Date: Wed, 17 May 2023 16:36:15 -0400 Subject: [PATCH] [ui, deployments] Fix a bug where watchers on a parent (periodic) job would continue on a child route (#17214) * Treated same-route as sub-route and didnt cancel watchers * Changelog --- .changelog/17214.txt | 3 +++ ui/app/mixins/with-watchers.js | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .changelog/17214.txt diff --git a/.changelog/17214.txt b/.changelog/17214.txt new file mode 100644 index 000000000..2f2e15d77 --- /dev/null +++ b/.changelog/17214.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: fixes an issue where the allocations table on child (periodic, parameterized) job pages wouldn't update when accessed via their parent +``` diff --git a/ui/app/mixins/with-watchers.js b/ui/app/mixins/with-watchers.js index bc5dc0909..b3af0fabe 100644 --- a/ui/app/mixins/with-watchers.js +++ b/ui/app/mixins/with-watchers.js @@ -41,13 +41,16 @@ export default Mixin.create(WithVisibilityDetection, { actions: { willTransition(transition) { // Don't cancel watchers if transitioning into a sub-route + // Make sure, if it starts with the route name, that it's not the same route if ( !transition.intent.name || - !transition.intent.name.startsWith(this.routeName) + !( + transition.intent.name.startsWith(this.routeName) && + this.routeName !== transition.intent.name + ) ) { this.cancelAllWatchers(); } - // Bubble the action up to the application route return true; },