convert transition API usages into Router calls

- Route#transitionTo
- Route#replaceWith
- Controller#transitionToRoute
- Controller#replaceWithRoute

Author: locks

Diff for: guides/release/models/pushing-records-into-the-store.md

@@ -140,6 +140,7 @@ import fetch from 'fetch';
 
 export default class ConfirmPaymentRoute extends Route {
   @service store;
+  @service router;
 
   @action
   confirm(data) {
@@ -150,7 +151,7 @@ export default class ConfirmPaymentRoute extends Route {
     .then(response => response.json())
     .then(digitalInventory => {
       this.store.push(digitalInventory);
-      this.transitionTo('thank-you');
+      this.router.transitionTo('thank-you');
     });
   }
 }

Diff for: guides/release/routing/asynchronous-routing.md

@@ -124,6 +124,8 @@ import Route from '@ember/routing/route';
 import { action } from '@ember/object';
 
 export default class GoodForNothingRoute extends Route {
+  // @service router;
+
   model() {
     return Promise.reject("FAIL");
   }
@@ -133,7 +135,7 @@ export default class GoodForNothingRoute extends Route {
     alert(reason); // "FAIL"
 
     // Can transition to another route here, e.g.
-    // this.transitionTo('index');
+    // this.router.transitionTo('index');
 
     // Uncomment the line below to bubble this error event:
     // return true;

Diff for: guides/release/routing/defining-your-routes.md

@@ -341,15 +341,16 @@ import { action } from '@ember/object';
 
 export default class SomeRouteRoute extends Route {
   @service store;
+  @service router;
   // …
   @action
   async visitUserProfile(id) {
     this.store.findRecord('user', id).then(function (user) {
       // Success callback
-      this.transitionTo('user.profile', user);
+      this.router.transitionTo('user.profile', user);
     }).catch(function () {
       // Error callback
-      this.transitionTo('not-found', 404);
+      this.router.transitionTo('not-found', 404);
     }
   }
 }
@@ -366,6 +367,4 @@ handlers](https://api.emberjs.com/ember/release/classes/Route).
 Once the routes are defined, how do we go about transitioning between them within our application? It depends on where the transition needs to take place:
 
 - From a template, use [`<LinkTo />`](https://api.emberjs.com/ember/release/classes/Ember.Templates.components/methods/LinkTo?anchor=LinkTo) as mentioned above
-- From a route, use the [`transitionTo()`](https://api.emberjs.com/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) method
-- From a controller, use the [`transitionToRoute()`](https://api.emberjs.com/ember/release/classes/Controller/methods/transitionToRoute?anchor=transitionToRoute) method
 - From anywhere else in your application, such as a component, inject the [Router Service](https://api.emberjs.com/ember/release/classes/RouterService) and use the [`transitionTo()`](https://api.emberjs.com/ember/release/classes/RouterService/methods/transitionTo?anchor=transitionTo) method

Diff for: guides/release/routing/loading-and-error-substates.md

@@ -232,6 +232,7 @@ import { action } from '@ember/object';
 
 export default class ArticlesOverviewRoute extends Route {
   @service store;
+  @service router;
 
   model(params) {
     return this.store.findAll('privileged-model');
@@ -240,7 +241,7 @@ export default class ArticlesOverviewRoute extends Route {
   @action
   error(error, transition) {
     if (error.status === '403') {
-      this.replaceWith('login');
+      this.router.replaceWith('login');
     } else {
       // Let the route above this handle the error.
       return true;

Diff for: guides/release/routing/preventing-and-retrying-transitions.md

@@ -75,13 +75,16 @@ they've logged in.
 
 ```javascript {data-filename=app/routes/some-authenticated.js}
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default class SomeAuthenticatedRoute extends Route {
+  @service router;
+
   beforeModel(transition) {
     if (!this.controllerFor('auth').userIsLoggedIn) {
       let loginController = this.controllerFor('login');
       loginController.previousTransition = transition;
-      this.transitionTo('login');
+      this.router.transitionTo('login');
     }
   }
 }
@@ -92,6 +95,8 @@ import Controller from '@ember/controller';
 import { action } from '@ember/object';
 
 export default class LoginController extends Controller {
+  @service router;
+
   @action
   login() {
     // Log the user in, then reattempt previous transition if it exists.
@@ -101,7 +106,7 @@ export default class LoginController extends Controller {
       previousTransition.retry();
     } else {
       // Default back to homepage
-      this.transitionToRoute('index');
+      this.router.transitionTo('index');
     }
   }
 }

Diff for: guides/release/routing/query-params.md

@@ -111,21 +111,20 @@ active query params for this to be true.
 
 ### transitionTo
 
-`Route#transitionTo` and `Controller#transitionToRoute`
-accept a final argument, which is an object with the key `queryParams`.
+`Router#transitionTo` accepts a final argument, which is an object with the key `queryParams`.
 
 ```javascript {data-filename=app/routes/some-route.js}
-this.transitionTo('post', object, { queryParams: { showDetails: true }});
-this.transitionTo('posts', { queryParams: { sort: 'title' }});
+this.router.transitionTo('post', object, { queryParams: { showDetails: true }});
+this.router.transitionTo('posts', { queryParams: { sort: 'title' }});
 
 // if you want to transition the query parameters without changing the route
-this.transitionTo({ queryParams: { direction: 'asc' }});
+this.router.transitionTo({ queryParams: { direction: 'asc' }});
 ```
 
 You can also add query params to URL transitions:
 
 ```javascript {data-filename=app/routes/some-route.js}
-this.transitionTo('/posts/1?sort=date&showDetails=true');
+this.router.transitionTo('/posts/1?sort=date&showDetails=true');
 ```
 
 ### Opting into a full transition

Diff for: guides/release/routing/redirection.md

@@ -33,10 +33,13 @@ Router.map(function() {
 
 ```javascript {data-filename=app/routes/index.js}
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default class IndexRoute extends Route {
+  @service router;
+
   beforeModel(/* transition */) {
-    this.transitionTo('posts'); // Implicitly aborts the on-going transition.
+    this.router.transitionTo('posts'); // Implicitly aborts the on-going transition.
   }
 }
 ```
@@ -66,11 +69,14 @@ Router.map(function() {
 
 ```javascript {data-filename=app/routes/posts.js}
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default class PostsRoute extends Route {
+  @service router;
+
   afterModel(model, transition) {
     if (model.get('length') === 1) {
-      this.transitionTo('post', model.get('firstObject'));
+      this.router.transitionTo('post', model.get('firstObject'));
     }
   }
 }
@@ -117,11 +123,14 @@ transition validated, and not cause the parent route's hooks to fire again:
 
 ```javascript {data-filename=app/routes/posts.js}
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default class PostsRoute extends Route {
+  @service router;
+
   redirect(model, transition) {
     if (model.get('length') === 1) {
-      this.transitionTo('posts.post', model.get('firstObject'));
+      this.router.transitionTo('posts.post', model.get('firstObject'));
     }
   }
 }