github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-30 03:54:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: remove viewingActionType mixin (#30692)

Browse Source 
This removes the viewing action type mixin. It was previously setting a
property `userActionType` on the user controller but this property was
actually removed since https://github.com/discourse/discourse/pull/4771
(Mar 2017) and doesn't seem referenced anywhere else.

It also sets the same property on the user activity controller and this
is a 1-liner so I've opted to duplicate that across the routes that need
this.
This commit is contained in:
Kelv 2025-01-14 09:43:06 +08:00 committed by GitHub
parent fba1a483c1
commit f9af19bca9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/controllers/user-activity.js
View File

@ -1,3 +1,4 @@
import { tracked } from "@glimmer/tracking";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { service } from "@ember/service"; import { service } from "@ember/service";
import discourseComputed from "discourse/lib/decorators"; import discourseComputed from "discourse/lib/decorators";
@ -7,7 +8,7 @@ export default class UserActivityController extends Controller {
@service currentUser; @service currentUser;
@controller user; @controller user;
userActionType = null; @tracked userActionType = null;
@discourseComputed("currentUser.draft_count") @discourseComputed("currentUser.draft_count")
draftLabel(count) { draftLabel(count) {

6
app/assets/javascripts/discourse/app/mixins/viewing-action-type.js
View File

@ -1,6 +0,0 @@
export default {
viewingActionType(userActionType) {
this.controllerFor("user").set("userActionType", userActionType);
this.controllerFor("user-activity").set("userActionType", userActionType);
},
};

7
app/assets/javascripts/discourse/app/routes/user-activity-stream.js
View File

@ -1,10 +1,7 @@
import ViewingActionType from "discourse/mixins/viewing-action-type";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
export default class UserActivityStream extends DiscourseRoute.extend( export default class UserActivityStream extends DiscourseRoute {
ViewingActionType
) {
templateName = "user/stream"; templateName = "user/stream";
queryParams = { queryParams = {
@ -30,7 +27,7 @@ export default class UserActivityStream extends DiscourseRoute.extend(
setupController() { setupController() {
super.setupController(...arguments); super.setupController(...arguments);
this.viewingActionType(this.userActionType); this.controllerFor("user-activity").userActionType = this.userActionType;
} }
emptyState() { emptyState() {

7
app/assets/javascripts/discourse/app/routes/user-badges.js
View File

@ -1,11 +1,8 @@
import ViewingActionType from "discourse/mixins/viewing-action-type";
import UserBadge from "discourse/models/user-badge"; import UserBadge from "discourse/models/user-badge";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
export default class UserBadges extends DiscourseRoute.extend( export default class UserBadges extends DiscourseRoute {
ViewingActionType
) {
templateName = "user/badges"; templateName = "user/badges";
model() { model() {
@ -17,7 +14,7 @@ export default class UserBadges extends DiscourseRoute.extend(
setupController() { setupController() {
super.setupController(...arguments); super.setupController(...arguments);
this.viewingActionType(-1); this.controllerFor("user-activity").userActionType = -1;
} }
titleToken() { titleToken() {

7
app/assets/javascripts/discourse/app/routes/user-notifications.js
View File

@ -1,4 +1,3 @@
import ViewingActionType from "discourse/mixins/viewing-action-type";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
@ -9,9 +8,7 @@ export function setNotificationsLimit(newLimit) {
limit = newLimit; limit = newLimit;
} }
export default class UserNotifications extends DiscourseRoute.extend( export default class UserNotifications extends DiscourseRoute {
ViewingActionType
) {
controllerName = "user-notifications"; controllerName = "user-notifications";
queryParams = { filter: { refreshModel: true } }; queryParams = { filter: { refreshModel: true } };
@ -33,7 +30,7 @@ export default class UserNotifications extends DiscourseRoute.extend(
setupController(controller) { setupController(controller) {
super.setupController(...arguments); super.setupController(...arguments);
controller.set("user", this.modelFor("user")); controller.set("user", this.modelFor("user"));
this.viewingActionType(-1); this.controllerFor("user-activity").userActionType = -1;
} }
titleToken() { titleToken() {

5
app/assets/javascripts/discourse/app/routes/user-topic-list.js
View File

@ -1,5 +1,4 @@
import { setTopicList } from "discourse/lib/topic-list-tracker"; import { setTopicList } from "discourse/lib/topic-list-tracker";
import ViewingActionType from "discourse/mixins/viewing-action-type";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
export const QUERY_PARAMS = { export const QUERY_PARAMS = {
@ -7,9 +6,7 @@ export const QUERY_PARAMS = {
order: { replace: true, refreshModel: true }, order: { replace: true, refreshModel: true },
}; };
export default class UserTopicsListRoute extends DiscourseRoute.extend( export default class UserTopicsListRoute extends DiscourseRoute {
ViewingActionType
) {
templateName = "user-topics-list"; templateName = "user-topics-list";
controllerName = "user-topics-list"; controllerName = "user-topics-list";
queryParams = QUERY_PARAMS; queryParams = QUERY_PARAMS;