From bec8b12bb52a57b54b66899b2650a5611d9bd561 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Thu, 1 Oct 2020 11:17:46 +0900
Subject: [PATCH] Fix mark as read in notifications to be saved immediately
(#14907)
* Fix mark as read in notifications to be saved immediately
* fix code style
---
app/javascript/mastodon/actions/markers.js | 8 ++++++--
app/javascript/mastodon/features/notifications/index.js | 2 ++
app/javascript/mastodon/features/ui/index.js | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/actions/markers.js b/app/javascript/mastodon/actions/markers.js
index 41a95503eb..c4b61effdd 100644
--- a/app/javascript/mastodon/actions/markers.js
+++ b/app/javascript/mastodon/actions/markers.js
@@ -100,8 +100,12 @@ export function submitMarkersSuccess({ home, notifications }) {
};
};
-export function submitMarkers() {
- return (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
+export function submitMarkers(params = {}) {
+ const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
+ if (params.immediate === true) {
+ debouncedSubmitMarkers.flush();
+ }
+ return result;
};
export const fetchMarkers = () => (dispatch, getState) => {
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index 41a45b2b6c..68afe593d2 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -12,6 +12,7 @@ import {
unmountNotifications,
markNotificationsAsRead,
} from '../../actions/notifications';
+import { submitMarkers } from '../../actions/markers';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import NotificationContainer from './containers/notification_container';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -162,6 +163,7 @@ class Notifications extends React.PureComponent {
handleMarkAsRead = () => {
this.props.dispatch(markNotificationsAsRead());
+ this.props.dispatch(submitMarkers({ immediate: true }));
};
render () {
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index d05133507f..b53e319d26 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -266,7 +266,7 @@ class UI extends React.PureComponent {
handleWindowFocus = () => {
this.props.dispatch(focusApp());
- this.props.dispatch(submitMarkers());
+ this.props.dispatch(submitMarkers({ immediate: true }));
}
handleWindowBlur = () => {
--
GitLab