Discource-C
/
discourse-data-explorer
mirror of https://github.com/discourse/discourse-data-explorer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Resolve transitionTo deprecation (#268)

This commit is contained in:
David Taylor 2023-12-01 16:02:52 +00:00 committed by GitHub
parent e067df0b43
commit a6341627d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/javascripts/discourse/controllers/admin-plugins-explorer.js
View File

@ -16,6 +16,7 @@ export default class PluginsExplorerController extends Controller {
@service("router") router; @service("router") router;
@service dialog; @service dialog;
@service appEvents; @service appEvents;
@service router;
@tracked sortByProperty = "last_run_at"; @tracked sortByProperty = "last_run_at";
@tracked sortDescending = true; @tracked sortDescending = true;

7
assets/javascripts/discourse/routes/group-reports-index.js
View File

@ -1,7 +1,10 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
import { inject as service } from "@ember/service";
export default class GroupReportsIndexRoute extends DiscourseRoute { export default class GroupReportsIndexRoute extends DiscourseRoute {
@service router;
model() { model() {
const group = this.modelFor("group"); const group = this.modelFor("group");
return ajax(`/g/${group.name}/reports`) return ajax(`/g/${group.name}/reports`)
@ -11,7 +14,7 @@ export default class GroupReportsIndexRoute extends DiscourseRoute {
group, group,
}; };
}) })
.catch(() => this.transitionTo("group.members", group)); .catch(() => this.router.transitionTo("group.members", group));
} }
afterModel(model) { afterModel(model) {
@ -19,7 +22,7 @@ export default class GroupReportsIndexRoute extends DiscourseRoute {
!model.group.get("is_group_user") && !model.group.get("is_group_user") &&
!(this.currentUser && this.currentUser.admin) !(this.currentUser && this.currentUser.admin)
) { ) {
this.transitionTo("group.members", model.group); this.router.transitionTo("group.members", model.group);
} }
} }

5
assets/javascripts/discourse/routes/group-reports-show.js
View File

@ -1,7 +1,10 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
import { inject as service } from "@ember/service";
export default class GroupReportsShowRoute extends DiscourseRoute { export default class GroupReportsShowRoute extends DiscourseRoute {
@service router;
model(params) { model(params) {
const group = this.modelFor("group"); const group = this.modelFor("group");
return ajax(`/g/${group.name}/reports/${params.query_id}`) return ajax(`/g/${group.name}/reports/${params.query_id}`)
@ -24,7 +27,7 @@ export default class GroupReportsShowRoute extends DiscourseRoute {
}; };
}) })
.catch(() => { .catch(() => {
this.transitionTo("group.members", group); this.router.transitionTo("group.members", group);
}); });
} }