From f9c7d5a4bdf4876c466def9a48ceac714d34ea3d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 18 Jul 2019 19:29:37 +0200
Subject: [PATCH] DEV: removes application.currentPath deprecation (#7905)

See https://deprecations.emberjs.com/v3.x#toc_application-controller-router-properties for more context
---
 app/assets/javascripts/admin/controllers/admin.js.es6         | 4 ++--
 .../javascripts/discourse/controllers/group-activity.js.es6   | 2 +-
 .../javascripts/discourse/controllers/group-manage.js.es6     | 2 +-
 .../javascripts/discourse/controllers/group-messages.js.es6   | 2 +-
 .../javascripts/discourse/controllers/preferences.js.es6      | 2 +-
 .../javascripts/discourse/controllers/user-activity.js.es6    | 1 +
 app/assets/javascripts/discourse/controllers/user-card.js.es6 | 2 +-
 .../discourse/controllers/user-private-messages.js.es6        | 4 ++--
 app/assets/javascripts/discourse/controllers/user.js.es6      | 4 ++--
 app/assets/javascripts/discourse/templates/group.hbs          | 4 ++--
 app/assets/javascripts/discourse/templates/group/activity.hbs | 2 +-
 app/assets/javascripts/discourse/templates/group/manage.hbs   | 2 +-
 app/assets/javascripts/discourse/templates/group/messages.hbs | 2 +-
 app/assets/javascripts/discourse/templates/preferences.hbs    | 2 +-
 app/assets/javascripts/discourse/templates/user-card.hbs      | 4 ++--
 app/assets/javascripts/discourse/templates/user/activity.hbs  | 4 ++--
 .../javascripts/discourse/templates/user/notifications.hbs    | 2 +-
 17 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6
index 9823f0fa792..ace435d655a 100644
--- a/app/assets/javascripts/admin/controllers/admin.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
-  application: Ember.inject.controller(),
+  router: Ember.inject.service(),
 
   @computed("siteSettings.enable_group_directory")
   showGroups(enableGroupDirectory) {
@@ -13,7 +13,7 @@ export default Ember.Controller.extend({
     return this.currentUser.get("admin") && enableBadges;
   },
 
-  @computed("application.currentPath")
+  @computed("router.currentRouteName")
   adminContentsClassName(currentPath) {
     let cssClasses = currentPath
       .split(".")
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
index 86356eeaac5..26fa94835aa 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -1,4 +1,4 @@
 export default Ember.Controller.extend({
-  application: Ember.inject.controller(),
+  router: Ember.inject.service(),
   queryParams: ["category_id"]
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
index 93e17ca0fe2..795627c3cb1 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
@@ -1,7 +1,7 @@
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
-  application: Ember.inject.controller(),
+  router: Ember.inject.service(),
 
   @computed("model.automatic")
   tabs(automatic) {
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
index d4180e8b6b4..cda126a2e26 100644
--- a/app/assets/javascripts/discourse/controllers/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Controller.extend({
-  application: Ember.inject.controller()
+  router: Ember.inject.service()
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index d4180e8b6b4..cda126a2e26 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Controller.extend({
-  application: Ember.inject.controller()
+  router: Ember.inject.service()
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index e214e588264..d8e6f29dcae 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -2,6 +2,7 @@ import { exportUserArchive } from "discourse/lib/export-csv";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
+  router: Ember.inject.service(),
   user: Ember.inject.controller(),
   userActionType: null,
 
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index cf84b13232c..0f26ea5e596 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -6,7 +6,7 @@ import {
 
 export default Ember.Controller.extend({
   topic: Ember.inject.controller(),
-  application: Ember.inject.controller(),
+  router: Ember.inject.service(),
 
   actions: {
     togglePosts(user) {
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 62fc7a2a5cf..9a9cba115b7 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -2,14 +2,14 @@ import computed from "ember-addons/ember-computed-decorators";
 import Topic from "discourse/models/topic";
 
 export default Ember.Controller.extend({
-  application: Ember.inject.controller(),
+  router: Ember.inject.service(),
   userTopicsList: Ember.inject.controller("user-topics-list"),
   user: Ember.inject.controller(),
 
   pmView: false,
   viewingSelf: Ember.computed.alias("user.viewingSelf"),
   isGroup: Ember.computed.equal("pmView", "groups"),
-  currentPath: Ember.computed.alias("application.currentPath"),
+  currentPath: Ember.computed.alias("router.currentRouteName"),
   selected: Ember.computed.alias("userTopicsList.selected"),
   bulkSelectEnabled: Ember.computed.alias("userTopicsList.bulkSelectEnabled"),
   showToggleBulkSelect: true,
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 0051d0377e7..661be19aaf9 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -5,9 +5,9 @@ import optionalService from "discourse/lib/optional-service";
 
 export default Ember.Controller.extend(CanCheckEmails, {
   indexStream: false,
-  application: Ember.inject.controller(),
+  router: Ember.inject.service(),
   userNotifications: Ember.inject.controller("user-notifications"),
-  currentPath: Ember.computed.alias("application.currentPath"),
+  currentPath: Ember.computed.alias("router.currentRouteName"),
   adminTools: optionalService(),
 
   @computed("model.username")
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 5ac0a81101c..7e88c925e4c 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -56,10 +56,10 @@
 <div class="user-content-wrapper">
   <section class="user-primary-navigation">
     <div class="container">
-      {{group-navigation group=model currentPath=application.currentPath tabs=tabs}}
+      {{group-navigation group=model currentPath=router.currentRouteName tabs=tabs}}
     </div>
   </section>
 
         {{outlet}}
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index ba0eaadfed4..b6ca30345ed 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,5 +1,5 @@
   <section class="user-secondary-navigation">
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
+  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router.currentRouteName}}
     {{group-activity-filter filter="posts" categoryId=category_id}}
     {{group-activity-filter filter="topics" categoryId=category_id}}
     {{#if siteSettings.enable_mentions}}
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
index 583edecf3a8..ff43273d40a 100644
--- a/app/assets/javascripts/discourse/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -1,5 +1,5 @@
 <section class='user-secondary-navigation'>
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
+  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router.currentRouteName}}
     {{#each tabs as |tab|}}
       <li>
         {{#link-to tab.route model.name}}
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
index fa98699147f..b567f2d031c 100644
--- a/app/assets/javascripts/discourse/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -1,5 +1,5 @@
   <section class="user-secondary-navigation">
-  {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=application.currentPath}}
+  {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=router.currentRouteName}}
 
     <li>
       {{#link-to 'group.messages.inbox' model.name}}
diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs
index a7c88a5e02b..4a78a98f90d 100644
--- a/app/assets/javascripts/discourse/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences.hbs
@@ -1,5 +1,5 @@
 {{#d-section pageClass="user-preferences" class="user-secondary-navigation"}}
-  {{#mobile-nav class='preferences-nav' desktopClass='preferences-list action-list nav-stacked' currentPath=application.currentPath}}
+  {{#mobile-nav class='preferences-nav' desktopClass='preferences-list action-list nav-stacked' currentPath=router.currentRouteName}}
     <li class='nav-account'>
       {{#link-to 'preferences.account'}}
         {{i18n 'user.preferences_nav.account'}}
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index f88e2aa21eb..3c23451b399 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -3,14 +3,14 @@
 {{/if}}
 
 {{user-card-contents
-  currentPath=application.currentPath
+  currentPath=router.currentRouteName
   topic=topic.model
   showUser=(action "showUser")
   togglePosts=(action "togglePosts")
   createNewMessageViaParams=(route-action "createNewMessageViaParams")}}
 
 {{group-card-contents
-  currentPath=application.currentPath
+  currentPath=router.currentRouteName
   topic=topic.model
   showUser=(action "showUser")
   showGroup=(action "showGroup")
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 7dfbb42b0c8..2b1ea959a39 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -1,5 +1,5 @@
 {{#d-section pageClass="user-activity" class="user-secondary-navigation" scrollTop="false"}}
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
+  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router.currentRouteName}}
     <li>
       {{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
     </li>
@@ -26,7 +26,7 @@
                     connectorTagName='li'
                     args=(hash model=model)}}
   {{/mobile-nav}}
- 
+
 {{/d-section}}
 {{#if canDownloadPosts}}
     <section class='user-additional-controls'>
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index e6b2137205a..c968b42f9d2 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,5 +1,5 @@
 {{#d-section pageClass="user-notifications" class="user-secondary-navigation"}}
-  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=application.currentPath}}
+  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=router.currentRouteName}}
     <li>
       {{#link-to 'userNotifications.index'}}
         {{i18n 'user.filters.all'}}