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: Fallback to bookmarkable_url if bookmark reminder notification has no topic info (#17883)

Browse Source 
This fix is for the experimental user menu. Some `bookmark_reminder` notifications may not be associated with a topic/post (e.g. bookmark reminder for a chat message) in which case the default notification renderer cannot figure out the `href` for those `bookmark_reminder` notifications. This commit teaches the `bookmark_reminder` notification type renderer to fallback to `bookmarkable_url` that's present in the notification data if the default notification renderer doesn't return a `href` for the notification.
This commit is contained in:
Osama Sayegh 2022-08-12 14:40:44 +03:00 committed by GitHub
parent b653b86806
commit b5a6015155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/app/lib/notification-items/bookmark-reminder.js
View File

@ -1,5 +1,6 @@
import NotificationItemBase from "discourse/lib/notification-items/base";
import I18n from "I18n";
import getUrl from "discourse-common/lib/get-url";
export default class extends NotificationItemBase {
get linkTitle() {
@ -14,4 +15,14 @@ export default class extends NotificationItemBase {
get description() {
return super.description || this.notification.data.title;
}
get linkHref() {
let linkHref = super.linkHref;
if (linkHref) {
return linkHref;
}
if (this.notification.data.bookmarkable_url) {
return getUrl(this.notification.data.bookmarkable_url);
}
}
}

38
app/assets/javascripts/discourse/tests/unit/lib/notification-items/bookmark-reminder-test.js
View File

@ -82,4 +82,42 @@ discourseModule("Unit | Notification Items | bookmark-reminder", function () {
"description falls back to the bookmark title if there's no fancy title"
);
});
test("linkHref", function (assert) {
let notification = getNotification();
let director = createRenderDirector(
notification,
"bookmark_reminder",
this.siteSettings
);
assert.strictEqual(
director.linkHref,
"/t/this-is-fancy-title/449/113",
"is a link to the topic that the bookmark belongs to"
);
notification = getNotification({
post_number: null,
topic_id: null,
fancy_title: null,
slug: null,
data: {
title: "bookmark from some plugin",
display_username: "osama",
bookmark_name: "",
bookmarkable_url: "/link/to/somewhere",
bookmarkable_id: 4324,
},
});
director = createRenderDirector(
notification,
"bookmark_reminder",
this.siteSettings
);
assert.strictEqual(
director.linkHref,
"/link/to/somewhere",
"falls back to bookmarkable_url"
);
});
});