+
![Avatar]()
@@ -36,32 +36,19 @@
-
-
-
+
-
+
+
+
diff --git a/addons/mail/static/src/js/tours/mail.js b/addons/mail/static/src/js/tours/mail.js
index f2eb7168350..b2f007f930a 100644
--- a/addons/mail/static/src/js/tours/mail.js
+++ b/addons/mail/static/src/js/tours/mail.js
@@ -41,7 +41,11 @@ tour.register('mail_tour', {
content: _t("Post your message on the thread"),
position: "top",
}, {
- trigger: '.o_Discuss_thread .o_Message_commandStar',
+ trigger: '.o_Discuss_thread .o_Message',
+ content: _t("Click on your message"),
+ position: "top",
+}, {
+ trigger: '.o_Discuss_thread .o_MessageActionList_actionStar',
content: Markup(_t("Messages can be starred to remind you to check back later.")),
position: "bottom",
}, {
diff --git a/addons/mail/static/src/models/discuss/discuss.js b/addons/mail/static/src/models/discuss/discuss.js
index ab657e45ff6..a6e010a3f60 100644
--- a/addons/mail/static/src/models/discuss/discuss.js
+++ b/addons/mail/static/src/models/discuss/discuss.js
@@ -205,6 +205,11 @@ function factory(dependencies) {
* @param {mail.message} message
*/
replyToMessage(message) {
+ // When already replying to this message, just stop replying to it.
+ if (this.replyingToMessage === message) {
+ this.clearReplyingToMessage();
+ return;
+ }
this.update({ replyingToMessage: link(message) });
// avoid to reply to a note by a message and vice-versa.
// subject to change later by allowing subtype choice.
diff --git a/addons/mail/static/src/models/message/message.js b/addons/mail/static/src/models/message/message.js
index 47d5c518a09..ef1793aa204 100644
--- a/addons/mail/static/src/models/message/message.js
+++ b/addons/mail/static/src/models/message/message.js
@@ -1,11 +1,13 @@
/** @odoo-module **/
import { registerNewModel } from '@mail/model/model_core';
-import { attr, many2many, many2one, one2many } from '@mail/model/model_field';
-import { clear, insert, insertAndReplace, replace, unlinkAll } from '@mail/model/model_field_command';
+import { attr, many2many, many2one, one2many, one2one } from '@mail/model/model_field';
+import { clear, create, insert, insertAndReplace, replace, unlinkAll } from '@mail/model/model_field_command';
import emojis from '@mail/js/emojis';
import { addLink, htmlToTextContentInline, parseAndTransform, timeFromNow } from '@mail/js/utils';
+import { session } from '@web/session';
+
import { str_to_datetime } from 'web.time';
function factory(dependencies) {
@@ -250,6 +252,26 @@ function factory(dependencies) {
}));
}
+ /**
+ * Updates the message's content.
+ *
+ * @param {Object} param0
+ * @param {string} param0.body the new body of the message
+ */
+ async updateContent({ body }) {
+ const messageData = await this.env.services.rpc({
+ route: '/mail/message/update_content',
+ params: {
+ body,
+ message_id: this.id,
+ },
+ });
+ if (!this.messaging) {
+ return;
+ }
+ this.messaging.models['mail.message'].insert(messageData);
+ }
+
//----------------------------------------------------------------------
// Private
//----------------------------------------------------------------------
@@ -261,6 +283,29 @@ function factory(dependencies) {
return `${this.modelName}_${data.id}`;
}
+ /**
+ * @returns {boolean}
+ */
+ _computeCanBeDeleted() {
+ if (!session.is_admin && !this.isCurrentUserOrGuestAuthor) {
+ return false;
+ }
+ if (!this.originThread) {
+ return false;
+ }
+ if (this.originThread.model === 'mail.channel') {
+ return this.message_type === 'comment';
+ }
+ return this.is_note;
+ }
+
+ /**
+ * @returns {boolean}
+ */
+ _computeCanStarBeToggled() {
+ return !this.isTemporary && !this.isTransient;
+ }
+
/**
* @returns {string}
*/
@@ -284,11 +329,15 @@ function factory(dependencies) {
* @private
* @returns {boolean}
*/
- _computeIsCurrentPartnerAuthor() {
+ _computeIsCurrentUserOrGuestAuthor() {
return !!(
this.author &&
this.messaging.currentPartner &&
this.messaging.currentPartner === this.author
+ ) || !!(
+ this.guestAuthor &&
+ this.messaging.currentGuest &&
+ this.messaging.currentGuest === this.guestAuthor
);
}
@@ -442,6 +491,12 @@ function factory(dependencies) {
}
Message.fields = {
+ actionList: one2one('mail.message_action_list', {
+ default: create(),
+ inverse: 'message',
+ isCausal: true,
+ readonly: true,
+ }),
attachments: many2many('mail.attachment', {
inverse: 'messages',
}),
@@ -457,6 +512,18 @@ function factory(dependencies) {
body: attr({
default: "",
}),
+ /**
+ * Whether this message can be deleted.
+ */
+ canBeDeleted: attr({
+ compute: '_computeCanBeDeleted',
+ }),
+ /**
+ * Whether this message can be starred/unstarred.
+ */
+ canStarBeToggled: attr({
+ compute: '_computeCanStarBeToggled',
+ }),
/**
* Determines the date of the message as a moment object.
*/
@@ -477,8 +544,8 @@ function factory(dependencies) {
id: attr({
required: true,
}),
- isCurrentPartnerAuthor: attr({
- compute: '_computeIsCurrentPartnerAuthor',
+ isCurrentUserOrGuestAuthor: attr({
+ compute: '_computeIsCurrentUserOrGuestAuthor',
default: false,
}),
/**
diff --git a/addons/mail/static/src/models/message_action_list/message_action_list.js b/addons/mail/static/src/models/message_action_list/message_action_list.js
new file mode 100644
index 00000000000..37ff7c82297
--- /dev/null
+++ b/addons/mail/static/src/models/message_action_list/message_action_list.js
@@ -0,0 +1,108 @@
+/** @odoo-module **/
+
+import { registerNewModel } from '@mail/model/model_core';
+import { attr, one2one } from '@mail/model/model_field';
+import { markEventHandled } from '@mail/utils/utils';
+
+function factory(dependencies) {
+
+ class MessageActionList extends dependencies['mail.model'] {
+
+ /**
+ * @override
+ */
+ _created() {
+ // bind handlers so they can be used in templates
+ this.onClick = this.onClick.bind(this);
+ this.onClickReplyTo = this.onClickReplyTo.bind(this);
+ this.onClickConfirmDelete = this.onClickConfirmDelete.bind(this);
+ this.onClickDelete = this.onClickDelete.bind(this);
+ this.onClickMarkAsRead = this.onClickMarkAsRead.bind(this);
+ this.onClickToggleStar = this.onClickToggleStar.bind(this);
+ this.onDeleteConfirmDialogClosed = this.onDeleteConfirmDialogClosed.bind(this);
+ }
+
+ //----------------------------------------------------------------------
+ // Private
+ //----------------------------------------------------------------------
+
+ /**
+ * @private
+ * @param {MouseEvent} ev
+ */
+ onClick(ev) {
+ markEventHandled(ev, 'MessageActionList.Click');
+ }
+
+ /**
+ * @private
+ * @param {MouseEvent} ev
+ */
+ onClickConfirmDelete(ev) {
+ this.message.updateContent({ body: '' });
+ }
+
+ /**
+ * @private
+ * @param {MouseEvent} ev
+ */
+ onClickDelete(ev) {
+ this.update({ showDeleteConfirm: true });
+ }
+
+ /**
+ * @private
+ * @param {MouseEvent} ev
+ */
+ onClickMarkAsRead(ev) {
+ this.message.markAsRead();
+ }
+
+ /**
+ * Opens the reply composer for this message (or closes it if it was
+ * already opened).
+ *
+ * @private
+ * @param {MouseEvent} ev
+ */
+ onClickReplyTo(ev) {
+ markEventHandled(ev, 'MessageActionList.replyTo');
+ this.message.replyTo();
+ }
+
+ /**
+ * @private
+ * @param {MouseEvent} ev
+ */
+ onClickToggleStar(ev) {
+ this.message.toggleStar();
+ }
+
+ /**
+ * @private
+ * @param {CustomEvent} ev
+ */
+ onDeleteConfirmDialogClosed(ev) {
+ this.update({ showDeleteConfirm: false })
+ }
+
+ }
+
+ MessageActionList.fields = {
+ message: one2one('mail.message', {
+ inverse: 'actionList'
+ }),
+ /**
+ * Whether to show the message delete-confirm dialog
+ */
+ showDeleteConfirm: attr({
+ default: false,
+ }),
+ };
+
+ MessageActionList.modelName = 'mail.message_action_list';
+
+ return MessageActionList;
+}
+
+registerNewModel('mail.message_action_list', factory);
diff --git a/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js b/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js
index eaccf4f03da..d39601cac1c 100644
--- a/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js
+++ b/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js
@@ -89,6 +89,8 @@ function factory(dependencies) {
return this._handleNotificationChannelRenamed(message.payload);
case 'mail.channel_update':
return this._handleNotificationChannelUpdate(message.payload);
+ case 'mail.message_update':
+ return this.messaging.models['mail.message'].insert(message.payload);
case 'res.users_settings_changed':
return this._handleNotificationResUsersSettings(message.payload);
}
+
-
+
@@ -119,75 +106,54 @@
-
-
diff --git a/addons/mail/static/src/components/message/tests/message_tests.js b/addons/mail/static/src/components/message/tests/message_tests.js
index b0d01146165..7c4d70d55f7 100644
--- a/addons/mail/static/src/components/message/tests/message_tests.js
+++ b/addons/mail/static/src/components/message/tests/message_tests.js
@@ -103,10 +103,11 @@ QUnit.test('basic rendering', async function (assert) {
1,
"message should display date"
);
+ await afterNextRender(() => messageEl.click());
assert.strictEqual(
- messageEl.querySelectorAll(`:scope .o_Message_commands`).length,
+ messageEl.querySelectorAll(`:scope .o_MessageActionList`).length,
1,
- "message should display list of commands"
+ "message should display list of actions"
);
assert.strictEqual(
messageEl.querySelectorAll(`:scope .o_Message_content`).length,
diff --git a/addons/mail/static/src/components/message_action_list/message_action_list.js b/addons/mail/static/src/components/message_action_list/message_action_list.js
new file mode 100644
index 00000000000..7679c6b15f8
--- /dev/null
+++ b/addons/mail/static/src/components/message_action_list/message_action_list.js
@@ -0,0 +1,26 @@
+/** @odoo-module */
+import { registerMessagingComponent } from '@mail/utils/messaging_component';
+
+const { Component } = owl;
+
+export class MessageActionList extends Component {
+
+ /**
+ * @returns {mail.message}
+ */
+ get actionList() {
+ return this.messaging && this.messaging.models['mail.message_action_list'].get(this.props.actionListLocalId);
+ }
+
+}
+
+Object.assign(MessageActionList, {
+ props: {
+ actionListLocalId: String,
+ hasMarkAsReadIcon: Boolean,
+ hasReplyIcon: Boolean,
+ },
+ template: "mail.MessageActionList",
+});
+
+registerMessagingComponent(MessageActionList);
diff --git a/addons/mail/static/src/components/message_action_list/message_action_list.scss b/addons/mail/static/src/components/message_action_list/message_action_list.scss
new file mode 100644
index 00000000000..002fe0aa4e9
--- /dev/null
+++ b/addons/mail/static/src/components/message_action_list/message_action_list.scss
@@ -0,0 +1,22 @@
+.o_MessageActionList {
+ @include o-position-absolute($top: - map-get($spacers, 3), $right: map-get($spacers, 2));
+ background-color: $white;
+ border: $border-width solid $border-color;
+ border-radius: $o-mail-rounded-rectangle-border-radius-sm;
+
+ &:hover {
+ box-shadow: 0 4px .5rem -.5rem black;
+ }
+}
+
+.o_MessageActionList_action {
+ cursor: pointer;
+
+ &:hover {
+ background-color: mix($border-color, $white);
+ }
+}
+
+.o_MessageActionList_actionStar.o_MessageActionList_actionStar_active {
+ color: gold;
+}
diff --git a/addons/mail/static/src/components/message_action_list/message_action_list.xml b/addons/mail/static/src/components/message_action_list/message_action_list.xml
new file mode 100644
index 00000000000..a18fc877ed0
--- /dev/null
+++ b/addons/mail/static/src/components/message_action_list/message_action_list.xml
@@ -0,0 +1,16 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
-
-
+
-
+
+
+
+
+
+
+
+ -
+
-
+ + ++
+ + + ++ + +
+
Subject:
-
-
-
- - --
- - - -- - -
-
Subject:
+
+
+
+
+
+