FEATURE: User Notifications Links Page (#26609)
This commit is contained in:
parent
cead0cf684
commit
334a2f216f
|
@ -4,8 +4,9 @@ import I18n from "discourse-i18n";
|
||||||
|
|
||||||
export default class extends NotificationTypeBase {
|
export default class extends NotificationTypeBase {
|
||||||
get linkHref() {
|
get linkHref() {
|
||||||
// Linking here for now until we have a proper new page for "linked" in the profile
|
return userPath(
|
||||||
return userPath(`${this.currentUser.username}/notifications`);
|
`${this.currentUser.username}/notifications/links?acting_username=${this.notification.data.username}`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
get description() {
|
get description() {
|
||||||
|
|
|
@ -19,6 +19,7 @@ const UserActionTypes = {
|
||||||
edits: 11,
|
edits: 11,
|
||||||
messages_sent: 12,
|
messages_sent: 12,
|
||||||
messages_received: 13,
|
messages_received: 13,
|
||||||
|
links: 17,
|
||||||
};
|
};
|
||||||
const InvertedActionTypes = {};
|
const InvertedActionTypes = {};
|
||||||
|
|
||||||
|
|
|
@ -140,6 +140,7 @@ export default function () {
|
||||||
this.route("likesReceived", { path: "likes-received" });
|
this.route("likesReceived", { path: "likes-received" });
|
||||||
this.route("mentions");
|
this.route("mentions");
|
||||||
this.route("edits");
|
this.route("edits");
|
||||||
|
this.route("links");
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
import UserAction from "discourse/models/user-action";
|
||||||
|
import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
|
||||||
|
import I18n from "discourse-i18n";
|
||||||
|
|
||||||
|
export default UserActivityStreamRoute.extend({
|
||||||
|
userActionType: UserAction.TYPES["links"],
|
||||||
|
|
||||||
|
titleToken() {
|
||||||
|
return I18n.t("user_action_groups.17");
|
||||||
|
},
|
||||||
|
});
|
|
@ -53,6 +53,15 @@
|
||||||
<span>{{i18n "user_action_groups.11"}}</span>
|
<span>{{i18n "user_action_groups.11"}}</span>
|
||||||
</DNavigationItem>
|
</DNavigationItem>
|
||||||
|
|
||||||
|
<DNavigationItem
|
||||||
|
@route="userNotifications.links"
|
||||||
|
@ariaCurrentContext="subNav"
|
||||||
|
class="user-nav__notifications-links"
|
||||||
|
>
|
||||||
|
{{d-icon "link"}}
|
||||||
|
<span>{{i18n "user_action_groups.17"}}</span>
|
||||||
|
</DNavigationItem>
|
||||||
|
|
||||||
<PluginOutlet
|
<PluginOutlet
|
||||||
@name="user-notifications-bottom"
|
@name="user-notifications-bottom"
|
||||||
@connectorTagName="li"
|
@connectorTagName="li"
|
||||||
|
|
|
@ -43,7 +43,7 @@ module("Unit | Notification Types | linked-consolidated", function (hooks) {
|
||||||
);
|
);
|
||||||
assert.strictEqual(
|
assert.strictEqual(
|
||||||
director.linkHref,
|
director.linkHref,
|
||||||
"/u/eviltrout/notifications",
|
"/u/eviltrout/notifications/links?acting_username=liker439",
|
||||||
"links to the notifications page of the user"
|
"links to the notifications page of the user"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
|
@ -22,6 +22,7 @@ class UserAction < ActiveRecord::Base
|
||||||
GOT_PRIVATE_MESSAGE = 13
|
GOT_PRIVATE_MESSAGE = 13
|
||||||
SOLVED = 15
|
SOLVED = 15
|
||||||
ASSIGNED = 16
|
ASSIGNED = 16
|
||||||
|
LINKED = 17
|
||||||
|
|
||||||
ORDER =
|
ORDER =
|
||||||
Hash[
|
Hash[
|
||||||
|
@ -38,6 +39,7 @@ class UserAction < ActiveRecord::Base
|
||||||
EDIT,
|
EDIT,
|
||||||
SOLVED,
|
SOLVED,
|
||||||
ASSIGNED,
|
ASSIGNED,
|
||||||
|
LINKED,
|
||||||
].each_with_index.to_a.flatten
|
].each_with_index.to_a.flatten
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -60,6 +62,7 @@ class UserAction < ActiveRecord::Base
|
||||||
got_private_message: 13,
|
got_private_message: 13,
|
||||||
solved: 15,
|
solved: 15,
|
||||||
assigned: 16,
|
assigned: 16,
|
||||||
|
linked: 17,
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -104,6 +104,8 @@ class UserActionManager
|
||||||
UserAction::MENTION
|
UserAction::MENTION
|
||||||
when Notification.types[:edited]
|
when Notification.types[:edited]
|
||||||
UserAction::EDIT
|
UserAction::EDIT
|
||||||
|
when Notification.types[:linked]
|
||||||
|
UserAction::LINKED
|
||||||
end
|
end
|
||||||
|
|
||||||
# skip any invalid items, eg failed to save post and so on
|
# skip any invalid items, eg failed to save post and so on
|
||||||
|
|
|
@ -1049,6 +1049,7 @@ en:
|
||||||
"13": "Inbox"
|
"13": "Inbox"
|
||||||
"14": "Pending"
|
"14": "Pending"
|
||||||
"15": "Drafts"
|
"15": "Drafts"
|
||||||
|
"17": "Links"
|
||||||
|
|
||||||
categories:
|
categories:
|
||||||
categories_label: "categories"
|
categories_label: "categories"
|
||||||
|
|
Loading…
Reference in New Issue