diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js index 8dc3005cd80..220e8114db8 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js @@ -1,10 +1,15 @@ import Route from "@ember/routing/route"; +import { inject as service } from "@ember/service"; export default class AdminCustomizeColorsShowRoute extends Route { + @service router; + model(params) { const all = this.modelFor("adminCustomize.colors"); const model = all.findBy("id", parseInt(params.scheme_id, 10)); - return model ? model : this.replaceWith("adminCustomize.colors.index"); + return model + ? model + : this.router.replaceWith("adminCustomize.colors.index"); } serialize(model) { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js index 36863b65ec3..dbdff426fde 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js @@ -1,7 +1,10 @@ import Route from "@ember/routing/route"; +import { inject as service } from "@ember/service"; export default class AdminCustomizeEmailStyleIndexRoute extends Route { + @service router; + beforeModel() { - this.replaceWith("adminCustomizeEmailStyle.edit", "html"); + this.router.replaceWith("adminCustomizeEmailStyle.edit", "html"); } } diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js index cdc700da9a5..c40a55c9253 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js @@ -16,7 +16,7 @@ export default class AdminCustomizeThemesEditRoute extends Route { target: params.target, field_name: params.field_name, } - : this.replaceWith("adminCustomizeThemes.index"); + : this.router.replaceWith("adminCustomizeThemes.index"); } serialize(wrapper) { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js index 1481ca32cc2..93194ac3e00 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js @@ -7,6 +7,7 @@ import { scrollTop } from "discourse/mixins/scroll-top"; export default class AdminCustomizeThemesShowRoute extends Route { @service dialog; + @service router; serialize(model) { return { theme_id: model.get("id") }; @@ -15,7 +16,7 @@ export default class AdminCustomizeThemesShowRoute extends Route { model(params) { const all = this.modelFor("adminCustomizeThemes"); const model = all.findBy("id", parseInt(params.theme_id, 10)); - return model ? model : this.replaceWith("adminCustomizeThemes.index"); + return model || this.router.replaceWith("adminCustomizeThemes.index"); } setupController(controller, model) { diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js index 5f266784bd4..ebd4c28513d 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js @@ -3,10 +3,13 @@ chosen a category. It will redirect to the first category. **/ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default class AdminSiteSettingsIndexRoute extends DiscourseRoute { + @service router; + beforeModel() { - this.replaceWith( + this.router.replaceWith( "adminSiteSettingsCategory", this.controllerFor("adminSiteSettings").get("visibleSiteSettings")[0] .nameKey diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js index 4f9f0dc7026..7eedaef9326 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js @@ -1,8 +1,11 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default class AdminWatchedWordsIndexRoute extends DiscourseRoute { + @service router; + beforeModel() { - this.replaceWith( + this.router.replaceWith( "adminWatchedWords.action", this.modelFor("adminWatchedWords")[0].nameKey ); diff --git a/app/assets/javascripts/discourse/app/routes/associate-account.js b/app/assets/javascripts/discourse/app/routes/associate-account.js index f00ea57de21..12463093910 100644 --- a/app/assets/javascripts/discourse/app/routes/associate-account.js +++ b/app/assets/javascripts/discourse/app/routes/associate-account.js @@ -4,15 +4,18 @@ import { next } from "@ember/runloop"; import { popupAjaxError } from "discourse/lib/ajax-error"; import showModal from "discourse/lib/show-modal"; import cookie from "discourse/lib/cookie"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + beforeModel(transition) { if (!this.currentUser) { cookie("destination_url", transition.intent.url); - return this.replaceWith("login"); + return this.router.replaceWith("login"); } const params = this.paramsFor("associate-account"); - this.replaceWith(`preferences.account`, this.currentUser).then(() => + this.router.replaceWith(`preferences.account`, this.currentUser).then(() => next(() => ajax(`/associate/${encodeURIComponent(params.token)}.json`) .then((model) => showModal("associate-account-confirm", { model })) diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js index 0cee1a6a0c3..e67e17b775e 100644 --- a/app/assets/javascripts/discourse/app/routes/build-category-route.js +++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js @@ -23,6 +23,7 @@ export default (filterArg, params) => { return DiscourseRoute.extend({ queryParams, composer: service(), + router: service(), model(modelParams) { const category = Category.findBySlugPathWithID( @@ -50,7 +51,7 @@ export default (filterArg, params) => { afterModel(model, transition) { if (!model) { - this.replaceWith("/404"); + this.router.replaceWith("/404"); return; } @@ -64,7 +65,7 @@ export default (filterArg, params) => { ) { // TODO: avoid throwing away preload data by redirecting on the server PreloadStore.getAndRemove("topic_list"); - return this.replaceWith( + return this.router.replaceWith( "discovery.categoryNone", modelParams.category_slug_path_with_id ); diff --git a/app/assets/javascripts/discourse/app/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js index da07704a23c..92b1d994a09 100644 --- a/app/assets/javascripts/discourse/app/routes/discourse.js +++ b/app/assets/javascripts/discourse/app/routes/discourse.js @@ -4,8 +4,10 @@ import Route from "@ember/routing/route"; import { once } from "@ember/runloop"; import { seenUser } from "discourse/lib/user-presence"; import { getOwner } from "discourse-common/lib/get-owner"; +import { inject as service } from "@ember/service"; const DiscourseRoute = Route.extend({ + router: service(), showFooter: false, willTransition() { @@ -49,7 +51,7 @@ const DiscourseRoute = Route.extend({ redirectIfLoginRequired() { const app = this.controllerFor("application"); if (app.get("loginRequired")) { - this.replaceWith("login"); + this.router.replaceWith("login"); } }, diff --git a/app/assets/javascripts/discourse/app/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js index 0434c228178..f31d0a88051 100644 --- a/app/assets/javascripts/discourse/app/routes/discovery.js +++ b/app/assets/javascripts/discourse/app/routes/discovery.js @@ -8,8 +8,10 @@ import User from "discourse/models/user"; import { setTopicList } from "discourse/lib/topic-list-tracker"; import { action } from "@ember/object"; import { resetCachedTopicList } from "discourse/lib/cached-topic-list"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend(OpenComposer, { + router: service(), queryParams: { filter: { refreshModel: true }, }, @@ -29,14 +31,14 @@ export default DiscourseRoute.extend(OpenComposer, { User.currentProp("user_option.should_be_redirected_to_top", false); const period = User.currentProp("user_option.redirected_to_top.period") || "all"; - this.replaceWith("discovery.top", { + this.router.replaceWith("discovery.top", { queryParams: { period, }, }); } else if (url && (matches = url.match(/top\/(.*)$/))) { if (this.site.periods.includes(matches[1])) { - this.replaceWith("discovery.top", { + this.router.replaceWith("discovery.top", { queryParams: { period: matches[1], }, diff --git a/app/assets/javascripts/discourse/app/routes/edit-category-index.js b/app/assets/javascripts/discourse/app/routes/edit-category-index.js index 17d20e52dfd..1dd31f31332 100644 --- a/app/assets/javascripts/discourse/app/routes/edit-category-index.js +++ b/app/assets/javascripts/discourse/app/routes/edit-category-index.js @@ -1,8 +1,11 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + afterModel() { const params = this.paramsFor("editCategory"); - this.replaceWith(`/c/${params.slug}/edit/general`); + this.router.replaceWith(`/c/${params.slug}/edit/general`); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/edit-category.js b/app/assets/javascripts/discourse/app/routes/edit-category.js index a3c43dbff59..e675dad45b5 100644 --- a/app/assets/javascripts/discourse/app/routes/edit-category.js +++ b/app/assets/javascripts/discourse/app/routes/edit-category.js @@ -1,8 +1,11 @@ import Category from "discourse/models/category"; import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + model(params) { return Category.reloadCategoryWithPermissions( params, @@ -13,7 +16,7 @@ export default DiscourseRoute.extend({ afterModel(model) { if (!model.can_edit) { - this.replaceWith("/404"); + this.router.replaceWith("/404"); return; } }, diff --git a/app/assets/javascripts/discourse/app/routes/forgot-password.js b/app/assets/javascripts/discourse/app/routes/forgot-password.js index f07d8b0e120..cd7f4b8b0fa 100644 --- a/app/assets/javascripts/discourse/app/routes/forgot-password.js +++ b/app/assets/javascripts/discourse/app/routes/forgot-password.js @@ -1,12 +1,15 @@ import DiscourseRoute from "discourse/routes/discourse"; import { defaultHomepage } from "discourse/lib/utilities"; import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; export default class ForgotPasswordRoute extends DiscourseRoute { + @service router; + async beforeModel() { const { loginRequired } = this.controllerFor("application"); - const e = await this.replaceWith( + const e = await this.router.replaceWith( loginRequired ? "login" : `discovery.${defaultHomepage()}` ); diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-membership.js b/app/assets/javascripts/discourse/app/routes/group-manage-membership.js index b448f867567..2eeadd9234d 100644 --- a/app/assets/javascripts/discourse/app/routes/group-manage-membership.js +++ b/app/assets/javascripts/discourse/app/routes/group-manage-membership.js @@ -1,7 +1,9 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), showFooter: true, titleToken() { @@ -10,7 +12,7 @@ export default DiscourseRoute.extend({ afterModel(group) { if (group.get("automatic")) { - this.replaceWith("group.manage.interaction", group); + this.router.replaceWith("group.manage.interaction", group); } }, }); diff --git a/app/assets/javascripts/discourse/app/routes/login.js b/app/assets/javascripts/discourse/app/routes/login.js index a8c4788e562..be8e2f40793 100644 --- a/app/assets/javascripts/discourse/app/routes/login.js +++ b/app/assets/javascripts/discourse/app/routes/login.js @@ -6,6 +6,7 @@ import StaticPage from "discourse/models/static-page"; export default class LoginRoute extends DiscourseRoute { @service siteSettings; + @service router; // `login-page` because `login` controller is the one for // the login modal @@ -13,7 +14,7 @@ export default class LoginRoute extends DiscourseRoute { beforeModel() { if (!this.siteSettings.login_required) { - this.replaceWith(`/${defaultHomepage()}`).then((e) => { + this.router.replaceWith(`/${defaultHomepage()}`).then((e) => { next(() => e.send("showLogin")); }); } diff --git a/app/assets/javascripts/discourse/app/routes/new-category.js b/app/assets/javascripts/discourse/app/routes/new-category.js index f9244c28dce..a7e38d5a1b5 100644 --- a/app/assets/javascripts/discourse/app/routes/new-category.js +++ b/app/assets/javascripts/discourse/app/routes/new-category.js @@ -2,6 +2,7 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; import { Promise } from "rsvp"; import { SEARCH_PRIORITIES } from "discourse/lib/constants"; +import { inject as service } from "@ember/service"; let _newCategoryColor = "0088CC"; let _newCategoryTextColor = "FFFFFF"; @@ -12,12 +13,13 @@ export function setNewCategoryDefaultColors(backgroundColor, textColor) { } export default DiscourseRoute.extend({ + router: service(), controllerName: "edit-category-tabs", templateName: "edit-category-tabs", beforeModel() { if (!this.currentUser) { - this.replaceWith("/404"); + this.router.replaceWith("/404"); return; } if (!this.currentUser.admin) { @@ -25,7 +27,7 @@ export default DiscourseRoute.extend({ !this.currentUser.moderator || this.siteSettings.moderators_manage_categories_and_groups === false ) { - this.replaceWith("/404"); + this.router.replaceWith("/404"); } } }, diff --git a/app/assets/javascripts/discourse/app/routes/new-message.js b/app/assets/javascripts/discourse/app/routes/new-message.js index c9794ce116f..4138de3de27 100644 --- a/app/assets/javascripts/discourse/app/routes/new-message.js +++ b/app/assets/javascripts/discourse/app/routes/new-message.js @@ -7,6 +7,7 @@ import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ dialog: service(), + router: service(), beforeModel(transition) { const params = transition.to.queryParams; @@ -14,7 +15,7 @@ export default DiscourseRoute.extend({ const groupName = params.groupname || params.group_name; if (this.currentUser) { - this.replaceWith("discovery.latest").then((e) => { + this.router.replaceWith("/latest").then((e) => { if (params.username) { e.send("createNewMessageViaParams", { recipients: params.username, @@ -49,7 +50,7 @@ export default DiscourseRoute.extend({ }); } else { cookie("destination_url", window.location.href); - this.replaceWith("login"); + this.router.replaceWith("login"); } }, }); diff --git a/app/assets/javascripts/discourse/app/routes/new-topic.js b/app/assets/javascripts/discourse/app/routes/new-topic.js index f66848f90b9..ece89726743 100644 --- a/app/assets/javascripts/discourse/app/routes/new-topic.js +++ b/app/assets/javascripts/discourse/app/routes/new-topic.js @@ -2,8 +2,11 @@ import Category from "discourse/models/category"; import DiscourseRoute from "discourse/routes/discourse"; import cookie from "discourse/lib/cookie"; import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + beforeModel(transition) { if (this.currentUser) { let category, categoryId; @@ -34,10 +37,9 @@ export default DiscourseRoute.extend({ } if (category) { - let route = "discovery.category"; - let params = { category, id: category.id }; - - this.replaceWith(route, params).then((e) => { + // Using URL-based transition to avoid bug with dynamic segments and refreshModel query params + // https://github.com/emberjs/ember.js/issues/16992 + this.router.replaceWith(`/c/${category.id}`).then((e) => { if (this.controllerFor("navigation/category").canCreateTopic) { this._sendTransition(e, transition, categoryId); } @@ -47,7 +49,7 @@ export default DiscourseRoute.extend({ transition.abort(); this.send("createNewTopicViaParams"); } else { - this.replaceWith("discovery.latest").then((e) => { + this.router.replaceWith("discovery.latest").then((e) => { if (this.controllerFor("navigation/default").canCreateTopic) { this._sendTransition(e, transition); } @@ -57,7 +59,7 @@ export default DiscourseRoute.extend({ } else { // User is not logged in cookie("destination_url", window.location.href); - this.replaceWith("login"); + this.router.replaceWith("login"); } }, diff --git a/app/assets/javascripts/discourse/app/routes/restricted-user.js b/app/assets/javascripts/discourse/app/routes/restricted-user.js index fabdfe89488..fad283be5a0 100644 --- a/app/assets/javascripts/discourse/app/routes/restricted-user.js +++ b/app/assets/javascripts/discourse/app/routes/restricted-user.js @@ -1,10 +1,13 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; // A base route that allows us to redirect when access is restricted export default DiscourseRoute.extend({ + router: service(), + afterModel() { if (!this.modelFor("user").get("can_edit")) { - this.replaceWith("userActivity"); + this.router.replaceWith("userActivity"); } }, }); diff --git a/app/assets/javascripts/discourse/app/routes/signup.js b/app/assets/javascripts/discourse/app/routes/signup.js index bf9f6d57d89..d285d9eb9cc 100644 --- a/app/assets/javascripts/discourse/app/routes/signup.js +++ b/app/assets/javascripts/discourse/app/routes/signup.js @@ -1,18 +1,21 @@ import DiscourseRoute from "discourse/routes/discourse"; import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; export default class SignupRoute extends DiscourseRoute { + @service router; + beforeModel() { const { canSignUp } = this.controllerFor("application"); if (this.siteSettings.login_required) { - this.replaceWith("login").then((e) => { + this.router.replaceWith("login").then((e) => { if (canSignUp) { next(() => e.send("showCreateAccount")); } }); } else { - this.replaceWith("discovery.latest").then((e) => { + this.router.replaceWith("discovery.latest").then((e) => { if (canSignUp) { next(() => e.send("showCreateAccount")); } diff --git a/app/assets/javascripts/discourse/app/routes/tag-show.js b/app/assets/javascripts/discourse/app/routes/tag-show.js index 5286b0ad178..9c0b873ee74 100644 --- a/app/assets/javascripts/discourse/app/routes/tag-show.js +++ b/app/assets/javascripts/discourse/app/routes/tag-show.js @@ -25,6 +25,7 @@ const ALL = "all"; export default DiscourseRoute.extend(FilterModeMixin, { composer: service(), + router: service(), navMode: "latest", queryParams, @@ -99,7 +100,7 @@ export default DiscourseRoute.extend(FilterModeMixin, { ) { // TODO: avoid throwing away preload data by redirecting on the server PreloadStore.getAndRemove("topic_list"); - return this.replaceWith( + return this.router.replaceWith( "tags.showCategoryNone", params.category_slug_path_with_id, tagId diff --git a/app/assets/javascripts/discourse/app/routes/user-activity.js b/app/assets/javascripts/discourse/app/routes/user-activity.js index f6bd36c49c3..805585320ce 100644 --- a/app/assets/javascripts/discourse/app/routes/user-activity.js +++ b/app/assets/javascripts/discourse/app/routes/user-activity.js @@ -1,11 +1,14 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + model() { let user = this.modelFor("user"); if (user.get("profile_hidden")) { - return this.replaceWith("user.profile-hidden"); + return this.router.replaceWith("user.profile-hidden"); } return user; diff --git a/app/assets/javascripts/discourse/app/routes/user-index.js b/app/assets/javascripts/discourse/app/routes/user-index.js index 00db564fb9f..70bdc652c58 100644 --- a/app/assets/javascripts/discourse/app/routes/user-index.js +++ b/app/assets/javascripts/discourse/app/routes/user-index.js @@ -15,7 +15,7 @@ export default DiscourseRoute.extend({ // transition into a user's activity works. This makes the back button work on mobile // where there is no user card as well as desktop where there is. if (this.site.mobileView) { - this.replaceWith(destination); + this.router.replaceWith(destination); } else { this.router.transitionTo(destination); } diff --git a/app/assets/javascripts/discourse/app/routes/user-invited-index.js b/app/assets/javascripts/discourse/app/routes/user-invited-index.js index 9859a43270f..aabec5c4bf6 100644 --- a/app/assets/javascripts/discourse/app/routes/user-invited-index.js +++ b/app/assets/javascripts/discourse/app/routes/user-invited-index.js @@ -1,7 +1,10 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + beforeModel() { - this.replaceWith("userInvited.show", "pending"); + this.router.replaceWith("userInvited.show", "pending"); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user-invited-show.js b/app/assets/javascripts/discourse/app/routes/user-invited-show.js index bfa5ce2136d..a327b8749b1 100644 --- a/app/assets/javascripts/discourse/app/routes/user-invited-show.js +++ b/app/assets/javascripts/discourse/app/routes/user-invited-show.js @@ -2,8 +2,11 @@ import DiscourseRoute from "discourse/routes/discourse"; import Invite from "discourse/models/invite"; import { action } from "@ember/object"; import I18n from "I18n"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + model(params) { this.inviteFilter = params.filter; return Invite.findInvitedBy(this.modelFor("user"), params.filter); @@ -11,7 +14,7 @@ export default DiscourseRoute.extend({ afterModel(model) { if (!model.can_see_invite_details) { - this.replaceWith("userInvited.show", "redeemed"); + this.router.replaceWith("userInvited.show", "redeemed"); } this.controllerFor("user.invited").setProperties({ invitesCount: model.counts, diff --git a/app/assets/javascripts/discourse/app/routes/user-summary.js b/app/assets/javascripts/discourse/app/routes/user-summary.js index 7f06eabd8c9..4890bc9154e 100644 --- a/app/assets/javascripts/discourse/app/routes/user-summary.js +++ b/app/assets/javascripts/discourse/app/routes/user-summary.js @@ -1,13 +1,15 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), showFooter: true, model() { const user = this.modelFor("user"); if (user.get("profile_hidden")) { - return this.replaceWith("user.profile-hidden"); + return this.router.replaceWith("user.profile-hidden"); } return user.summary(); diff --git a/app/assets/javascripts/discourse/app/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js index cf9072e1b8c..ea86f5425e8 100644 --- a/app/assets/javascripts/discourse/app/routes/user.js +++ b/app/assets/javascripts/discourse/app/routes/user.js @@ -2,11 +2,14 @@ import DiscourseRoute from "discourse/routes/discourse"; import User from "discourse/models/user"; import { action } from "@ember/object"; import { bind } from "discourse-common/utils/decorators"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + beforeModel() { if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) { - this.replaceWith("discovery"); + this.router.replaceWith("discovery"); } }, @@ -31,7 +34,7 @@ export default DiscourseRoute.extend({ .findDetails() .then(() => user.findStaffInfo()) .then(() => user.trackStatus()) - .catch(() => this.replaceWith("/404")); + .catch(() => this.router.replaceWith("/404")); }, serialize(model) { diff --git a/app/assets/javascripts/discourse/app/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js index 442f2b3b555..14b214d4334 100644 --- a/app/assets/javascripts/discourse/app/routes/users.js +++ b/app/assets/javascripts/discourse/app/routes/users.js @@ -4,8 +4,10 @@ import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { Promise } from "rsvp"; import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), queryParams: { period: { refreshModel: true }, order: { refreshModel: true }, @@ -35,7 +37,7 @@ export default DiscourseRoute.extend({ beforeModel() { if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) { - this.replaceWith("discovery"); + this.router.replaceWith("discovery"); } }, diff --git a/app/assets/javascripts/wizard/addon/routes/wizard-index.js b/app/assets/javascripts/wizard/addon/routes/wizard-index.js index d6305f86193..49e3633305b 100644 --- a/app/assets/javascripts/wizard/addon/routes/wizard-index.js +++ b/app/assets/javascripts/wizard/addon/routes/wizard-index.js @@ -1,8 +1,11 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default DiscourseRoute.extend({ + router: service(), + beforeModel() { const appModel = this.modelFor("wizard"); - this.replaceWith("wizard.step", appModel.start); + this.router.replaceWith("wizard.step", appModel.start); }, }); diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-browse-archived.js b/plugins/chat/assets/javascripts/discourse/routes/chat-browse-archived.js index 7fc075e2cee..15e563da5f6 100644 --- a/plugins/chat/assets/javascripts/discourse/routes/chat-browse-archived.js +++ b/plugins/chat/assets/javascripts/discourse/routes/chat-browse-archived.js @@ -1,9 +1,13 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default class ChatBrowseIndexRoute extends DiscourseRoute { + @service router; + @service siteSettings; + afterModel() { if (!this.siteSettings.chat_allow_archiving_channels) { - this.replaceWith("chat.browse"); + this.router.replaceWith("chat.browse"); } } } diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js b/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js index 7cec808e2cc..1eeab604515 100644 --- a/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js +++ b/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js @@ -18,6 +18,6 @@ export default class ChatBrowseIndexRoute extends DiscourseRoute { } afterModel() { - this.replaceWith("chat.browse.open"); + this.router.replaceWith("chat.browse.open"); } } diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-about.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-about.js index a92d5e882f0..9bb3d7b81b0 100644 --- a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-about.js +++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-about.js @@ -1,9 +1,12 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default class ChatChannelInfoAboutRoute extends DiscourseRoute { + @service router; + afterModel(model) { if (model.isDirectMessageChannel) { - this.replaceWith("chat.channel.info.index"); + this.router.replaceWith("chat.channel.info.index"); } } } diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-index.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-index.js index c7bfd1c0905..03258bae148 100644 --- a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-index.js +++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-index.js @@ -1,15 +1,18 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default class ChatChannelInfoIndexRoute extends DiscourseRoute { + @service router; + afterModel(model) { if (model.isDirectMessageChannel) { if (model.isOpen && model.membershipsCount >= 1) { - this.replaceWith("chat.channel.info.members"); + this.router.replaceWith("chat.channel.info.members"); } else { - this.replaceWith("chat.channel.info.settings"); + this.router.replaceWith("chat.channel.info.settings"); } } else { - this.replaceWith("chat.channel.info.about"); + this.router.replaceWith("chat.channel.info.about"); } } } diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-members.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-members.js index d3fba6f97de..6260e3f1a65 100644 --- a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-members.js +++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-members.js @@ -1,13 +1,16 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default class ChatChannelInfoMembersRoute extends DiscourseRoute { + @service router; + afterModel(model) { if (!model.isOpen) { - return this.replaceWith("chat.channel.info.settings"); + return this.router.replaceWith("chat.channel.info.settings"); } if (model.membershipsCount < 1) { - return this.replaceWith("chat.channel.info"); + return this.router.replaceWith("chat.channel.info"); } } } diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-settings.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-settings.js index 61635238534..8468b04492d 100644 --- a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-settings.js +++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info-settings.js @@ -1,9 +1,13 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; export default class ChatChannelInfoSettingsRoute extends DiscourseRoute { + @service router; + @service currentUser; + afterModel(model) { if (!this.currentUser?.staff && !model.currentUserMembership?.following) { - this.replaceWith("chat.channel.info"); + this.router.replaceWith("chat.channel.info"); } } } diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-message.js b/plugins/chat/assets/javascripts/discourse/routes/chat-message.js index 4b7aaee0d1a..85455e0a04f 100644 --- a/plugins/chat/assets/javascripts/discourse/routes/chat-message.js +++ b/plugins/chat/assets/javascripts/discourse/routes/chat-message.js @@ -17,7 +17,7 @@ export default class ChatMessageRoute extends DiscourseRoute { params.messageId ); }) - .catch(() => this.replaceWith("/404")); + .catch(() => this.router.replaceWith("/404")); } beforeModel() {