luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Use the model hook and setupController hook instead of afterModel

Browse source 
This is a more idiomatic way to handle the QP resetting in the
application controller.
This commit is contained in:
Michael Lange 2018-08-13 16:18:06 -07:00
parent 104e5196a6
commit 8ca806f8f8
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ui/app/routes/application.js
View file

@ -46,14 +46,15 @@ export default Route.extend({
);
},
// setupController doesn't refire when the model hook refires as part of
// a query param change
afterModel(model, transition) {
const queryParam = transition.queryParams.region;
const controller = this.controllerFor('application');
// Model is being used as a way to transfer the provided region
// query param to update the controller state.
model(params) {
return params.region;
},
setupController(controller, model) {
const queryParam = model;
// The default region shouldn't show up as a query param since
// it's superfluous.
if (queryParam === this.get('system.defaultRegion.region')) {
next(() => {
controller.set('region', null);

2
ui/tests/acceptance/regions-test.js
View file

@ -137,7 +137,7 @@ test('switching regions to the default region, unsets the region query param', f
selectChoose('[data-test-region-switcher]', defaultRegion);
andThen(() => {
assert.equal(currentURL(), '/jobs', 'No region query param for the default region');
assert.notOk(currentURL().includes('region='), 'No region query param for the default region');
assert.equal(
window.localStorage.nomadActiveRegion,
defaultRegion,