diff --git a/ui/app/routes/application.js b/ui/app/routes/application.js index c4eea77f0..93bb577dd 100644 --- a/ui/app/routes/application.js +++ b/ui/app/routes/application.js @@ -2,11 +2,18 @@ import { inject as service } from '@ember/service'; import Route from '@ember/routing/route'; import { next } from '@ember/runloop'; import { AbortError } from 'ember-data/adapters/errors'; +import RSVP from 'rsvp'; export default Route.extend({ config: service(), system: service(), + queryParams: { + region: { + refreshModel: true, + }, + }, + resetController(controller, isExiting) { if (isExiting) { controller.set('error', null); @@ -14,7 +21,7 @@ export default Route.extend({ }, beforeModel() { - return this.get('system.regions'); + return RSVP.all([this.get('system.regions'), this.get('system.namespaces')]); }, syncToController(controller) { diff --git a/ui/app/routes/jobs.js b/ui/app/routes/jobs.js index 759027c21..20cca8d58 100644 --- a/ui/app/routes/jobs.js +++ b/ui/app/routes/jobs.js @@ -15,10 +15,6 @@ export default Route.extend(WithForbiddenState, { }, ], - beforeModel() { - return this.get('system.namespaces'); - }, - model() { return this.get('store') .findAll('job', { reload: true })