diff --git a/mail_history_mark_unread/README.rst b/mail_history_mark_unread/README.rst
index 0d4e900d0a..b38e071ea1 100644
--- a/mail_history_mark_unread/README.rst
+++ b/mail_history_mark_unread/README.rst
@@ -29,9 +29,13 @@ Mail History Mark as Unread
|badge1| |badge2| |badge3| |badge4| |badge5|
This module introduces a "Mark as Unread" button for messages in the
-History mailbox of the Discuss App. When done the message is restored
-back to the Inbox, just like if it were a new unread message, and
-disappears from the History mailbox.
+History mailbox and Search results of the Discuss App. When done the
+message is restored back to the Inbox, just like if it were a new unread
+message, and disappears from the History mailbox.
+
+The button is also available in the Search Messages panel (accessible
+via the search icon in Discuss), allowing users to mark any searched
+message as unread directly from the search results.
**Table of contents**
diff --git a/mail_history_mark_unread/__manifest__.py b/mail_history_mark_unread/__manifest__.py
index c1d433b9a8..1235cf989f 100644
--- a/mail_history_mark_unread/__manifest__.py
+++ b/mail_history_mark_unread/__manifest__.py
@@ -1,7 +1,8 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Mail History Mark as Unread",
- "summary": "Add 'Mark as Unread' action to messages in History mailbox",
+ "summary": """Add 'Mark as Unread' action to messages in History mailbox
+ and Search results""",
"version": "17.0.1.0.0",
"category": "Social Network",
"website": "https://github.com/OCA/social",
@@ -14,6 +15,7 @@
"mail_history_mark_unread/static/src/message_actions_patch.esm.js",
"mail_history_mark_unread/static/src/message_service_patch.esm.js",
"mail_history_mark_unread/static/src/mail_core_web_service_patch.esm.js",
+ "mail_history_mark_unread/static/src/message_card_list.xml",
],
},
}
diff --git a/mail_history_mark_unread/readme/DESCRIPTION.md b/mail_history_mark_unread/readme/DESCRIPTION.md
index 9811d3992d..7d7a72f78e 100644
--- a/mail_history_mark_unread/readme/DESCRIPTION.md
+++ b/mail_history_mark_unread/readme/DESCRIPTION.md
@@ -1,2 +1,4 @@
-This module introduces a "Mark as Unread" button for messages in the History mailbox of the Discuss App.
+This module introduces a "Mark as Unread" button for messages in the History mailbox and Search results of the Discuss App.
When done the message is restored back to the Inbox, just like if it were a new unread message, and disappears from the History mailbox.
+
+The button is also available in the Search Messages panel (accessible via the search icon in Discuss), allowing users to mark any searched message as unread directly from the search results.
diff --git a/mail_history_mark_unread/static/description/index.html b/mail_history_mark_unread/static/description/index.html
index 04a6984863..8aa45ff7a0 100644
--- a/mail_history_mark_unread/static/description/index.html
+++ b/mail_history_mark_unread/static/description/index.html
@@ -371,9 +371,12 @@ Mail History Mark as Unread
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
This module introduces a “Mark as Unread” button for messages in the
-History mailbox of the Discuss App. When done the message is restored
-back to the Inbox, just like if it were a new unread message, and
-disappears from the History mailbox.
+History mailbox and Search results of the Discuss App. When done the
+message is restored back to the Inbox, just like if it were a new unread
+message, and disappears from the History mailbox.
+The button is also available in the Search Messages panel (accessible
+via the search icon in Discuss), allowing users to mark any searched
+message as unread directly from the search results.
Table of contents
diff --git a/mail_history_mark_unread/static/src/message_actions_patch.esm.js b/mail_history_mark_unread/static/src/message_actions_patch.esm.js
index a585bb0d94..fd2c21ad7d 100644
--- a/mail_history_mark_unread/static/src/message_actions_patch.esm.js
+++ b/mail_history_mark_unread/static/src/message_actions_patch.esm.js
@@ -3,19 +3,35 @@
import {_t} from "@web/core/l10n/translation";
import {messageActionsRegistry} from "@mail/core/common/message_actions";
-// Add "Mark as Unread" action for messages in History mailbox
+// Add "Mark as Unread" action for messages in History mailbox and Search results
messageActionsRegistry.add("mark-as-unread-history", {
condition: (component) => {
- return (
- component.props.message?.isHistory &&
- component.store.user &&
- component.props.message.persistent
- );
+ const message = component.props.message;
+ if (!message?.persistent || !component.store.user) {
+ return false;
+ }
+ if (message.isHistory) {
+ return true;
+ }
+ if (component.env.messageCard && !message.isNeedaction) {
+ return true;
+ }
+ return false;
},
icon: "fa-eye-slash",
title: _t("Mark as Unread"),
- onClick: (component) => {
- component.messageService.setUndone(component.props.message);
+ onClick: async (component) => {
+ const message = component.props.message;
+ await component.messageService.setUndone(message);
+ // Remove from search results if in search mode
+ const messageSearch = component.props.messageSearch;
+ if (messageSearch?.messages) {
+ const index = messageSearch.messages.findIndex((m) => m.id === message.id);
+ if (index !== -1) {
+ messageSearch.messages.splice(index, 1);
+ messageSearch.count = Math.max(0, messageSearch.count - 1);
+ }
+ }
},
sequence: 15,
});
diff --git a/mail_history_mark_unread/static/src/message_card_list.xml b/mail_history_mark_unread/static/src/message_card_list.xml
new file mode 100644
index 0000000000..879d27fa72
--- /dev/null
+++ b/mail_history_mark_unread/static/src/message_card_list.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ props.mode === 'search'
+
+
+