From 321b14d40c8a6fbdac583e2767e2c260f9f25c70 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 30 Nov 2022 16:49:23 +0100 Subject: [PATCH] DEV: Remove unused `render()` calls (#19224) `Route#render` and `Route#renderTemplate` have been deprecated and are removed in Ember 4.x (see: https://deprecations.emberjs.com/v3.x#toc_route-render-template) The templates of modified routes in this PR are already automatically inserted into `{{outlet}}`s. --- .../admin/addon/routes/admin-logs-screened-emails.js | 4 ---- .../admin/addon/routes/admin-logs-screened-ip-addresses.js | 6 ------ .../admin/addon/routes/admin-logs-screened-urls.js | 4 ---- .../admin/addon/routes/admin-logs-staff-action-logs.js | 7 ------- app/assets/javascripts/admin/addon/routes/admin-user.js | 4 ---- .../javascripts/admin/addon/routes/admin-web-hooks-show.js | 4 ---- .../discourse/app/routes/build-admin-user-posts-route.js | 2 +- app/assets/javascripts/discourse/app/routes/user-badges.js | 2 +- .../javascripts/discourse/app/routes/user-notifications.js | 4 ---- 9 files changed, 2 insertions(+), 35 deletions(-) diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js index 1778b561c7..30b51ece15 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js @@ -1,10 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; export default DiscourseRoute.extend({ - renderTemplate() { - this.render("admin/templates/logs/screened-emails", { into: "adminLogs" }); - }, - setupController() { return this.controllerFor("adminLogsScreenedEmails").show(); }, diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js index ef88635518..6c0eb97c72 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js @@ -1,12 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; export default DiscourseRoute.extend({ - renderTemplate() { - this.render("admin/templates/logs/screened-ip-addresses", { - into: "adminLogs", - }); - }, - setupController() { return this.controllerFor("adminLogsScreenedIpAddresses").show(); }, diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js index 230cf85ceb..a32e9034eb 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js @@ -1,10 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; export default DiscourseRoute.extend({ - renderTemplate() { - this.render("admin/templates/logs/screened-urls", { into: "adminLogs" }); - }, - setupController() { return this.controllerFor("adminLogsScreenedUrls").show(); }, diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js index c00f1e135c..96ab615379 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js @@ -34,13 +34,6 @@ export default DiscourseRoute.extend({ return this._super(value, urlKey, defaultValueType); }, - // TODO: make this automatic using an `{{outlet}}` - renderTemplate() { - this.render("admin/templates/logs/staff-action-logs", { - into: "adminLogs", - }); - }, - actions: { onFiltersChange(filters) { if (filters && Object.keys(filters) === 0) { diff --git a/app/assets/javascripts/admin/addon/routes/admin-user.js b/app/assets/javascripts/admin/addon/routes/admin-user.js index d9627ba571..b0dbd34741 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-user.js +++ b/app/assets/javascripts/admin/addon/routes/admin-user.js @@ -14,10 +14,6 @@ export default DiscourseRoute.extend({ return AdminUser.find(get(params, "user_id")); }, - renderTemplate() { - this.render({ into: "admin" }); - }, - afterModel(adminUser) { return adminUser.loadDetails().then(function () { adminUser.setOriginalTrustLevel(); diff --git a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js index 6d7c64f955..d76be7f5df 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js @@ -23,8 +23,4 @@ export default DiscourseRoute.extend({ model.set("group_ids", model.get("group_ids")); controller.setProperties({ model, saved: false }); }, - - renderTemplate() { - this.render("admin/templates/web-hooks-show", { into: "adminApi" }); - }, }); diff --git a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js index 1045f31022..ab2756565b 100644 --- a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js +++ b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js @@ -33,7 +33,7 @@ export default function (filter) { }, renderTemplate() { - this.render("user/posts", { into: "user" }); + this.render("user/posts"); }, }); } diff --git a/app/assets/javascripts/discourse/app/routes/user-badges.js b/app/assets/javascripts/discourse/app/routes/user-badges.js index b88a8bbbaa..6feb940c50 100644 --- a/app/assets/javascripts/discourse/app/routes/user-badges.js +++ b/app/assets/javascripts/discourse/app/routes/user-badges.js @@ -17,7 +17,7 @@ export default DiscourseRoute.extend(ViewingActionType, { }, renderTemplate() { - this.render("user/badges", { into: "user" }); + this.render("user/badges"); }, @action diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications.js b/app/assets/javascripts/discourse/app/routes/user-notifications.js index 01ed463a75..aeb118579c 100644 --- a/app/assets/javascripts/discourse/app/routes/user-notifications.js +++ b/app/assets/javascripts/discourse/app/routes/user-notifications.js @@ -6,10 +6,6 @@ export default DiscourseRoute.extend(ViewingActionType, { controllerName: "user-notifications", queryParams: { filter: { refreshModel: true } }, - renderTemplate() { - this.render("user/notifications"); - }, - @action didTransition() { this.controllerFor("user-notifications")._showFooter();