lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update notification table with only latest data (#16445) (#16469) 

When marking notifications read the results may be returned out of order
or be delayed.  This PR sends a sequence number to gitea so that the
browser can ensure that only the results of the latest notification
change are shown.

Signed-off-by: Andrew Thornton <art27@cantab.net>
release/v1.15
zeripath 2021-07-17 18:05:59 +01:00 committed by GitHub
parent 0f11c5f592
commit 7f6019e492
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/user/notification.go
View File

@ -50,6 +50,7 @@ func Notifications(c *context.Context) {
return return
} }
if c.QueryBool("div-only") { if c.QueryBool("div-only") {
c.Data["SequenceNumber"] = c.Query("sequence-number")
c.HTML(http.StatusOK, tplNotificationDiv) c.HTML(http.StatusOK, tplNotificationDiv)
return return
} }
@ -175,6 +176,7 @@ func NotificationStatusPost(c *context.Context) {
return return
} }
c.Data["Link"] = setting.AppURL + "notifications" c.Data["Link"] = setting.AppURL + "notifications"
c.Data["SequenceNumber"] = c.Req.PostFormValue("sequence-number")
c.HTML(http.StatusOK, tplNotificationDiv) c.HTML(http.StatusOK, tplNotificationDiv)
} }

2
templates/user/notification/notification_div.tmpl
View File

@ -1,4 +1,4 @@
<div class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}"> <div class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}" data-sequence-number="{{.SequenceNumber}}">
<div class="ui container"> <div class="ui container">
<h1 class="ui dividing header">{{.i18n.Tr "notification.notifications"}}</h1> <h1 class="ui dividing header">{{.i18n.Tr "notification.notifications"}}</h1>
<div class="ui top attached tabular menu"> <div class="ui top attached tabular menu">

16
web_src/js/features/notification.js
View File

@ -1,5 +1,7 @@
const {AppSubUrl, csrf, NotificationSettings} = window.config; const {AppSubUrl, csrf, NotificationSettings} = window.config;
let notificationSequenceNumber = 0;
export function initNotificationsTable() { export function initNotificationsTable() {
$('#notification_table .button').on('click', async function () { $('#notification_table .button').on('click', async function () {
const data = await updateNotification( const data = await updateNotification(
@ -10,8 +12,10 @@ export function initNotificationsTable() {
$(this).data('notification-id'), $(this).data('notification-id'),
); );
$('#notification_div').replaceWith(data); if ($(data).data('sequence-number') === notificationSequenceNumber) {
initNotificationsTable(); $('#notification_div').replaceWith(data);
initNotificationsTable();
}
await updateNotificationCount(); await updateNotificationCount();
return false; return false;
@ -139,10 +143,13 @@ async function updateNotificationTable() {
url: `${AppSubUrl}/notifications?${notificationDiv.data('params')}`, url: `${AppSubUrl}/notifications?${notificationDiv.data('params')}`,
data: { data: {
'div-only': true, 'div-only': true,
'sequence-number': ++notificationSequenceNumber,
} }
}); });
notificationDiv.replaceWith(data); if ($(data).data('sequence-number') === notificationSequenceNumber) {
initNotificationsTable(); notificationDiv.replaceWith(data);
initNotificationsTable();
}
} }
} }
@ -182,6 +189,7 @@ async function updateNotification(url, status, page, q, notificationID) {
page, page,
q, q,
noredirect: true, noredirect: true,
'sequence-number': ++notificationSequenceNumber,
}, },
}); });
} }