IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: upgrade transitionToRoute on Controller (#22647)

Browse Source 
Per https://deprecations.emberjs.com/v3.x/#toc_routing-transition-methods

We are upgrading all `this.transitionToRoute` calls on controllers to directly call the router service (`this.router.transitionTo`)
This commit is contained in:
Isaac Janzen
2023-07-18 14:53:23 -05:00
committed by GitHub
parent 011ba5b9f6
commit a2ea9c5417
25 changed files with 93 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
View File

@@ -7,8 +7,11 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
import { action, get } from "@ember/object";
import showModal from "discourse/lib/show-modal";
import { ajax } from "discourse/lib/ajax";
import { inject as service } from "@ember/service";
export default class AdminApiKeysNewController extends Controller {
@service router;
userModes = [
{ id: "all", name: I18n.t("admin.api.all_users") },
{ id: "single", name: I18n.t("admin.api.single_user") },
@@ -76,7 +79,7 @@ export default class AdminApiKeysNewController extends Controller {
@action
continue() {
this.transitionToRoute("adminApiKeys.show", this.model.id);
this.router.transitionTo("adminApiKeys.show", this.model.id);
}
@action

5
app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
View File

@@ -5,10 +5,13 @@ import { bufferedProperty } from "discourse/mixins/buffered-content";
import { isEmpty } from "@ember/utils";
import { popupAjaxError } from "discourse/lib/ajax-error";
import showModal from "discourse/lib/show-modal";
import { inject as service } from "@ember/service";
export default class AdminApiKeysShowController extends Controller.extend(
bufferedProperty("model")
) {
@service router;
@empty("model.id") isNew;
@action
@@ -53,7 +56,7 @@ export default class AdminApiKeysShowController extends Controller.extend(
deleteKey(key) {
key
.destroyRecord()
.then(() => this.transitionToRoute("adminApiKeys.index"))
.then(() => this.router.transitionTo("adminApiKeys.index"))
.catch(popupAjaxError);
}

4
app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
View File

@@ -206,7 +206,7 @@ export default class AdminBadgesShowController extends Controller.extend(
if (!adminBadges.includes(model)) {
adminBadges.pushObject(model);
}
this.transitionToRoute("adminBadges.show", model.get("id"));
this.router.transitionTo("adminBadges.show", model.get("id"));
} else {
this.commitBuffer();
this.savingStatus = I18n.t("saved");
@@ -237,7 +237,7 @@ export default class AdminBadgesShowController extends Controller.extend(
.destroy()
.then(() => {
adminBadges.removeObject(model);
this.transitionToRoute("adminBadges.index");
this.router.transitionTo("adminBadges.index");
})
.catch(() => {
this.dialog.alert(I18n.t("generic_error"));

5
app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
View File

@@ -1,13 +1,16 @@
import { sort } from "@ember/object/computed";
import Controller from "@ember/controller";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";
export default class AdminCustomizeEmailTemplatesController extends Controller {
@service router;
titleSorting = ["title"];
@sort("emailTemplates", "titleSorting") sortedTemplates;
@action
onSelectTemplate(template) {
this.transitionToRoute("adminCustomizeEmailTemplates.edit", template);
this.router.transitionTo("adminCustomizeEmailTemplates.edit", template);
}
}

5
app/assets/javascripts/admin/addon/controllers/admin-customize-form-templates-index.js
View File

@@ -1,10 +1,13 @@
import Controller from "@ember/controller";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";
export default class AdminCustomizeFormTemplatesIndex extends Controller {
@service router;
@action
newTemplate() {
this.transitionToRoute("adminCustomizeFormTemplates.new");
this.router.transitionTo("adminCustomizeFormTemplates.new");
}
@action

5
app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
View File

@@ -21,6 +21,7 @@ const THEME_UPLOAD_VAR = 2;
export default class AdminCustomizeThemesShowController extends Controller {
@service dialog;
@service router;
editRouteName = "adminCustomizeThemes.edit";
@@ -226,7 +227,7 @@ export default class AdminCustomizeThemesShowController extends Controller {
}
transitionToEditRoute() {
this.transitionToRoute(
this.router.transitionTo(
this.editRouteName,
this.get("model.id"),
"common",
@@ -383,7 +384,7 @@ export default class AdminCustomizeThemesShowController extends Controller {
model.setProperties({ recentlyInstalled: false });
model.destroyRecord().then(() => {
this.allThemes.removeObject(model);
this.transitionToRoute("adminCustomizeThemes");
this.router.transitionTo("adminCustomizeThemes");
});
},
});

7
app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
View File

@@ -6,8 +6,11 @@ import { isEmpty } from "@ember/utils";
import { debounce } from "discourse-common/utils/decorators";
import { observes } from "@ember-decorators/object";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";
export default class AdminSiteSettingsController extends Controller {
@service router;
filter = null;
@alias("model") allSiteSettings;
@@ -117,7 +120,7 @@ export default class AdminSiteSettingsController extends Controller {
if (isEmpty(this.filter) && !this.onlyOverridden) {
this.set("visibleSiteSettings", this.allSiteSettings);
if (this.categoryNameKey === "all_results") {
this.transitionToRoute("adminSiteSettings");
this.router.transitionTo("adminSiteSettings");
}
return;
}
@@ -138,7 +141,7 @@ export default class AdminSiteSettingsController extends Controller {
}
this.set("visibleSiteSettings", matchesGroupedByCategory);
this.transitionToRoute(
this.router.transitionTo(
"adminSiteSettingsCategory",
category || "all_results"
);

6
app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
View File

@@ -2,9 +2,13 @@ import { action } from "@ember/object";
import Controller from "@ember/controller";
import discourseComputed from "discourse-common/utils/decorators";
import discourseDebounce from "discourse-common/lib/debounce";
import { inject as service } from "@ember/service";
let lastSearch;
export default class AdminSiteTextIndexController extends Controller {
@service router;
@service siteSettings;
searching = false;
siteTexts = null;
preferred = false;
@@ -48,7 +52,7 @@ export default class AdminSiteTextIndexController extends Controller {
@action
edit(siteText) {
this.transitionToRoute("adminSiteText.edit", siteText.get("id"), {
this.router.transitionTo("adminSiteText.edit", siteText.get("id"), {
queryParams: {
locale: this.locale,
},

5
app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js
View File

@@ -9,6 +9,9 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
export default class AdminWebHooksEditController extends Controller {
@service dialog;
@service router;
@service siteSettings;
@controller adminWebHooks;
@alias("adminWebHooks.eventTypes") eventTypes;
@@ -94,7 +97,7 @@ export default class AdminWebHooksEditController extends Controller {
this.set("saved", true);
this.adminWebHooks.model.addObject(this.model);
this.transitionToRoute("adminWebHooks.show", this.model);
this.router.transitionTo("adminWebHooks.show", this.model);
} catch (e) {
popupAjaxError(e);
}

2
app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
View File

@@ -22,7 +22,7 @@ export default class AdminWebHooksShowController extends Controller {
try {
await this.model.destroyRecord();
this.adminWebHooks.model.removeObject(this.model);
this.transitionToRoute("adminWebHooks");
this.router.transitionTo("adminWebHooks");
} catch (e) {
popupAjaxError(e);
}