From 4d41afd0ef34080baee14c8dea7b83d3b5d97a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Wed, 15 Jun 2022 16:38:59 +0000 Subject: [PATCH] [IMP] mail: rename PartnerImStatusIcon to PersonaImStatusIcon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that it potentially contains guests, the previous name is no longer correct. Part of task-2883466 closes odoo/odoo#93731 Signed-off-by: Alexandre Kühn (aku) --- .../persona_im_status_icon.xml} | 14 ++++---- ...sts.js => persona_im_status_icon_tests.js} | 26 +++++++-------- ...nel_invitation_form_selectable_partner.xml | 6 ++-- .../channel_member/channel_member.xml | 8 ++--- .../composer_suggestion.xml | 8 ++--- .../src/components/message/message.scss | 2 +- .../static/src/components/message/message.xml | 10 +++--- .../notification_list_item.scss | 6 ++-- .../notification_request.xml | 8 ++--- .../persona_im_status_icon.js} | 18 +++++------ .../persona_im_status_icon.scss} | 6 ++-- .../persona_im_status_icon.xml} | 32 +++++++++---------- .../thread_needaction_preview.xml | 8 ++--- .../thread_preview/thread_preview.xml | 8 ++--- ...invitation_form_selectable_partner_view.js | 6 ++-- .../static/src/models/channel_member_view.js | 6 ++-- .../static/src/models/composer_suggestion.js | 6 ++-- addons/mail/static/src/models/message_view.js | 8 ++--- .../src/models/notification_request_view.js | 6 ++-- ...view.js => persona_im_status_icon_view.js} | 16 +++++----- .../models/thread_needaction_preview_view.js | 6 ++-- .../static/src/models/thread_preview_view.js | 6 ++-- addons/mail/static/src/widgets/common.xml | 2 +- .../composer_suggestion_partner_tests.js | 2 +- .../components/message_tests.js | 6 ++-- ...sts.js => persona_im_status_icon_tests.js} | 30 ++++++++--------- .../components/thread_icon_tests.js | 4 +-- 27 files changed, 132 insertions(+), 132 deletions(-) rename addons/hr_holidays/static/src/components/{partner_im_status_icon/partner_im_status_icon.xml => persona_im_status_icon/persona_im_status_icon.xml} (55%) rename addons/hr_holidays/static/tests/qunit_suite_tests/components/{partner_im_status_icon_tests.js => persona_im_status_icon_tests.js} (77%) rename addons/mail/static/src/components/{partner_im_status_icon/partner_im_status_icon.js => persona_im_status_icon/persona_im_status_icon.js} (71%) rename addons/mail/static/src/components/{partner_im_status_icon/partner_im_status_icon.scss => persona_im_status_icon/persona_im_status_icon.scss} (85%) rename addons/mail/static/src/components/{partner_im_status_icon/partner_im_status_icon.xml => persona_im_status_icon/persona_im_status_icon.xml} (55%) rename addons/mail/static/src/models/{partner_im_status_icon_view.js => persona_im_status_icon_view.js} (87%) rename addons/mail/static/tests/qunit_suite_tests/components/{partner_im_status_icon_tests.js => persona_im_status_icon_tests.js} (81%) diff --git a/addons/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon.xml b/addons/hr_holidays/static/src/components/persona_im_status_icon/persona_im_status_icon.xml similarity index 55% rename from addons/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon.xml rename to addons/hr_holidays/static/src/components/persona_im_status_icon/persona_im_status_icon.xml index ea9a2fcb687..8799c1aaacc 100644 --- a/addons/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon.xml +++ b/addons/hr_holidays/static/src/components/persona_im_status_icon/persona_im_status_icon.xml @@ -1,15 +1,15 @@ - + - - + + - - + + - - + + diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js similarity index 77% rename from addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js rename to addons/hr_holidays/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js index 6fd03dcf9da..c3f2d871e4d 100644 --- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js +++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js @@ -4,7 +4,7 @@ import { start, startServer } from '@mail/../tests/helpers/test_utils'; QUnit.module('hr_holidays', {}, function () { QUnit.module('components', {}, function () { -QUnit.module('partner_im_status_icon_tests.js'); +QUnit.module('persona_im_status_icon_tests.js'); QUnit.test('on leave & online', async function (assert) { assert.expect(2); @@ -29,14 +29,14 @@ QUnit.test('on leave & online', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.hasClass( - document.querySelector('.o_PartnerImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIcon_icon'), 'o-online', - "partner IM status icon should have online status rendering" + "persona IM status icon should have online status rendering" ); assert.hasClass( - document.querySelector('.o_PartnerImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIcon_icon'), 'fa-plane', - "partner IM status icon should have leave status rendering" + "persona IM status icon should have leave status rendering" ); }); @@ -63,14 +63,14 @@ QUnit.test('on leave & away', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.hasClass( - document.querySelector('.o_PartnerImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIcon_icon'), 'o-away', - "partner IM status icon should have away status rendering" + "persona IM status icon should have away status rendering" ); assert.hasClass( - document.querySelector('.o_PartnerImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIcon_icon'), 'fa-plane', - "partner IM status icon should have leave status rendering" + "persona IM status icon should have leave status rendering" ); }); @@ -97,14 +97,14 @@ QUnit.test('on leave & offline', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.hasClass( - document.querySelector('.o_PartnerImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIcon_icon'), 'o-offline', - "partner IM status icon should have offline status rendering" + "persona IM status icon should have offline status rendering" ); assert.hasClass( - document.querySelector('.o_PartnerImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIcon_icon'), 'fa-plane', - "partner IM status icon should have leave status rendering" + "persona IM status icon should have leave status rendering" ); }); diff --git a/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml b/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml index d9d2d5b7fbd..31ce7ff4020 100644 --- a/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml +++ b/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml @@ -5,14 +5,14 @@
Avatar - - +
diff --git a/addons/mail/static/src/components/channel_member/channel_member.xml b/addons/mail/static/src/components/channel_member/channel_member.xml index 35dd22bef00..e1246370990 100644 --- a/addons/mail/static/src/components/channel_member/channel_member.xml +++ b/addons/mail/static/src/components/channel_member/channel_member.xml @@ -6,14 +6,14 @@
Avatar - - +
diff --git a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml index 7ed0b05f676..93729bf7cec 100644 --- a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml +++ b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml @@ -16,11 +16,11 @@ - diff --git a/addons/mail/static/src/components/message/message.scss b/addons/mail/static/src/components/message/message.scss index 53907fa71be..7c729c9a504 100644 --- a/addons/mail/static/src/components/message/message.scss +++ b/addons/mail/static/src/components/message/message.scss @@ -70,7 +70,7 @@ margin-inline-end: map-get($spacers, 2); } -.o_Message_partnerImStatusIcon { +.o_Message_personaImStatusIcon { // Could be replaced by "position absolute bottom-0 end-0" // after the migration to BS5 for the backend AND the frontend @include o-position-absolute($bottom: 0, $right: 0); diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml index 7a363f13645..25356251cf1 100644 --- a/addons/mail/static/src/components/message/message.xml +++ b/addons/mail/static/src/components/message/message.xml @@ -35,18 +35,18 @@
- - +
diff --git a/addons/mail/static/src/components/notification_list/notification_list_item.scss b/addons/mail/static/src/components/notification_list/notification_list_item.scss index ad20b32f634..4bcf2ff8e70 100644 --- a/addons/mail/static/src/components/notification_list/notification_list_item.scss +++ b/addons/mail/static/src/components/notification_list/notification_list_item.scss @@ -14,7 +14,7 @@ $o-mail-notification-list-item-muted-hover-background-color: &:hover { background-color: $o-mail-notification-list-item-hover-background-color; - .o_NotificationListItem_partnerImStatusIcon { + .o_NotificationListItem_personaImStatusIcon { color: $o-mail-notification-list-item-hover-background-color; } } @@ -25,7 +25,7 @@ $o-mail-notification-list-item-muted-hover-background-color: &:hover { background-color: $o-mail-notification-list-item-muted-hover-background-color; - .o_NotificationListItem_partnerImStatusIcon { + .o_NotificationListItem_personaImStatusIcon { color: $o-mail-notification-list-item-muted-hover-background-color; } } @@ -51,7 +51,7 @@ $o-mail-notification-list-item-muted-hover-background-color: } } -.o_NotificationListItem_partnerImStatusIcon { +.o_NotificationListItem_personaImStatusIcon { color: $o-mail-notification-list-item-background-color; &.o-muted { diff --git a/addons/mail/static/src/components/notification_request/notification_request.xml b/addons/mail/static/src/components/notification_request/notification_request.xml index 9579b43a3d3..b5c90504480 100644 --- a/addons/mail/static/src/components/notification_request/notification_request.xml +++ b/addons/mail/static/src/components/notification_request/notification_request.xml @@ -7,11 +7,11 @@
Avatar of OdooBot -
diff --git a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js b/addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.js similarity index 71% rename from addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js rename to addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.js index 16d12396d2a..31f20650eda 100644 --- a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js +++ b/addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.js @@ -5,16 +5,16 @@ import { markEventHandled } from '@mail/utils/utils'; const { Component } = owl; -export class PartnerImStatusIcon extends Component { +export class PersonaImStatusIcon extends Component { //-------------------------------------------------------------------------- // Public //-------------------------------------------------------------------------- /** - * @returns {PartnerImStatusIconView} + * @returns {PersonaImStatusIconView} */ - get partnerImStatusIconView() { + get personaImStatusIconView() { return this.props.record; } @@ -27,16 +27,16 @@ export class PartnerImStatusIcon extends Component { * @param {MouseEvent} ev */ _onClick(ev) { - markEventHandled(ev, 'PartnerImStatusIcon.Click'); - if (!this.props.hasOpenChat || !this.partnerImStatusIconView.persona.partner) { + markEventHandled(ev, 'PersonaImStatusIcon.Click'); + if (!this.props.hasOpenChat || !this.personaImStatusIconView.persona.partner) { return; } - this.partnerImStatusIconView.persona.partner.openChat(); + this.personaImStatusIconView.persona.partner.openChat(); } } -Object.assign(PartnerImStatusIcon, { +Object.assign(PersonaImStatusIcon, { defaultProps: { hasBackground: true, hasOpenChat: false, @@ -50,7 +50,7 @@ Object.assign(PartnerImStatusIcon, { hasOpenChat: { type: Boolean, optional: true }, record: Object, }, - template: 'mail.PartnerImStatusIcon', + template: 'mail.PersonaImStatusIcon', }); -registerMessagingComponent(PartnerImStatusIcon); +registerMessagingComponent(PersonaImStatusIcon); diff --git a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.scss b/addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.scss similarity index 85% rename from addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.scss rename to addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.scss index 448bb6776b1..aee0bb9038f 100644 --- a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.scss +++ b/addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.scss @@ -2,13 +2,13 @@ // Layout // ------------------------------------------------------------------ -.o_PartnerImStatusIcon { +.o_PersonaImStatusIcon { width: $o-mail-partner-status-icon-size; height: $o-mail-partner-status-icon-size; line-height: 1.3em; } -.o_PartnerImStatusIcon_outerBackground { +.o_PersonaImStatusIcon_outerBackground { transform: scale(1.5); } @@ -16,7 +16,7 @@ // Style // ------------------------------------------------------------------ -.o_PartnerImStatusIcon_icon { +.o_PersonaImStatusIcon_icon { &.o-bot { color: $o-enterprise-primary-color; diff --git a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml b/addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.xml similarity index 55% rename from addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml rename to addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.xml index 8e1fcffa743..1bd9565beee 100644 --- a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml +++ b/addons/mail/static/src/components/persona_im_status_icon/persona_im_status_icon.xml @@ -1,14 +1,14 @@ - - + - - + + - - + + - - + + - - + + - - + + diff --git a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml index 57b270bf108..086cbe58953 100644 --- a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml +++ b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml @@ -11,14 +11,14 @@
Thread Image - - +
diff --git a/addons/mail/static/src/components/thread_preview/thread_preview.xml b/addons/mail/static/src/components/thread_preview/thread_preview.xml index a63ca3a15e6..cb74030bc57 100644 --- a/addons/mail/static/src/components/thread_preview/thread_preview.xml +++ b/addons/mail/static/src/components/thread_preview/thread_preview.xml @@ -11,15 +11,15 @@
Thread Image - - +
diff --git a/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js b/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js index 0d7cd49c1d2..9e83c3356b1 100644 --- a/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js +++ b/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js @@ -12,7 +12,7 @@ registerModel({ * @private * @returns {FieldCommand} */ - _computePartnerImStatusIconView() { + _computePersonaImStatusIconView() { return this.partner.isImStatusSet ? insertAndReplace() : clear(); }, }, @@ -27,8 +27,8 @@ registerModel({ readonly: true, required: true, }), - partnerImStatusIconView: one('PartnerImStatusIconView', { - compute: '_computePartnerImStatusIconView', + personaImStatusIconView: one('PersonaImStatusIconView', { + compute: '_computePersonaImStatusIconView', inverse: 'channelInvitationFormSelectablePartnerViewOwner', isCausal: true, readonly: true, diff --git a/addons/mail/static/src/models/channel_member_view.js b/addons/mail/static/src/models/channel_member_view.js index 4df82fe6ad8..0ebca16f446 100644 --- a/addons/mail/static/src/models/channel_member_view.js +++ b/addons/mail/static/src/models/channel_member_view.js @@ -32,7 +32,7 @@ registerModel({ * @private * @returns {FieldCommand} */ - _computePartnerImStatusIconView() { + _computePersonaImStatusIconView() { return this.channelMember.partner && this.channelMember.partner.isImStatusSet ? insertAndReplace() : clear(); }, }, @@ -47,8 +47,8 @@ registerModel({ readonly: true, required: true, }), - partnerImStatusIconView: one('PartnerImStatusIconView', { - compute: '_computePartnerImStatusIconView', + personaImStatusIconView: one('PersonaImStatusIconView', { + compute: '_computePersonaImStatusIconView', inverse: 'channelMemberViewOwner', isCausal: true, readonly: true, diff --git a/addons/mail/static/src/models/composer_suggestion.js b/addons/mail/static/src/models/composer_suggestion.js index e4df0827b69..83649f5ec52 100644 --- a/addons/mail/static/src/models/composer_suggestion.js +++ b/addons/mail/static/src/models/composer_suggestion.js @@ -70,7 +70,7 @@ registerModel({ * @private * @returns {FieldCommand} */ - _computePartnerImStatusIconView() { + _computePersonaImStatusIconView() { return this.partner && this.partner.isImStatusSet ? insertAndReplace() : clear(); }, /** @@ -150,8 +150,8 @@ registerModel({ partner: one('Partner', { readonly: true, }), - partnerImStatusIconView: one('PartnerImStatusIconView', { - compute: '_computePartnerImStatusIconView', + personaImStatusIconView: one('PersonaImStatusIconView', { + compute: '_computePersonaImStatusIconView', inverse: 'composerSuggestionViewOwner', isCausal: true, readonly: true, diff --git a/addons/mail/static/src/models/message_view.js b/addons/mail/static/src/models/message_view.js index 9fe0ee592b6..c56c34d0843 100644 --- a/addons/mail/static/src/models/message_view.js +++ b/addons/mail/static/src/models/message_view.js @@ -49,7 +49,7 @@ registerModel({ !isEventHandled(ev, 'MessageActionList.Click') && !isEventHandled(ev, 'MessageReactionGroup.Click') && !isEventHandled(ev, 'MessageInReplyToView.ClickMessageInReplyTo') && - !isEventHandled(ev, 'PartnerImStatusIcon.Click') + !isEventHandled(ev, 'PersonaImStatusIcon.Click') ) { if (this.messagingAsClickedMessageView) { this.messaging.update({ clickedMessageView: clear() }); @@ -298,7 +298,7 @@ registerModel({ * @private * @returns {FieldCommand} */ - _computePartnerImStatusIconView() { + _computePersonaImStatusIconView() { return this.message.author && this.message.author.isImStatusSet ? insertAndReplace() : clear(); }, }, @@ -446,8 +446,8 @@ registerModel({ messagingAsClickedMessageView: one('Messaging', { inverse: 'clickedMessageView', }), - partnerImStatusIconView: one('PartnerImStatusIconView', { - compute: '_computePartnerImStatusIconView', + personaImStatusIconView: one('PersonaImStatusIconView', { + compute: '_computePersonaImStatusIconView', inverse: 'messageViewOwner', isCausal: true, readonly: true, diff --git a/addons/mail/static/src/models/notification_request_view.js b/addons/mail/static/src/models/notification_request_view.js index dd0c36f7b55..13e0a707738 100644 --- a/addons/mail/static/src/models/notification_request_view.js +++ b/addons/mail/static/src/models/notification_request_view.js @@ -27,7 +27,7 @@ registerModel({ * @private * @returns {FieldCommand} */ - _computePartnerImStatusIconView() { + _computePersonaImStatusIconView() { return this.messaging.partnerRoot.isImStatusSet ? insertAndReplace() : clear(); }, }, @@ -40,8 +40,8 @@ registerModel({ required: true, readonly: true, }), - partnerImStatusIconView: one('PartnerImStatusIconView', { - compute: '_computePartnerImStatusIconView', + personaImStatusIconView: one('PersonaImStatusIconView', { + compute: '_computePersonaImStatusIconView', inverse: 'notificationRequestViewOwner', isCausal: true, readonly: true, diff --git a/addons/mail/static/src/models/partner_im_status_icon_view.js b/addons/mail/static/src/models/persona_im_status_icon_view.js similarity index 87% rename from addons/mail/static/src/models/partner_im_status_icon_view.js rename to addons/mail/static/src/models/persona_im_status_icon_view.js index 327999ab44e..11657a7f9b8 100644 --- a/addons/mail/static/src/models/partner_im_status_icon_view.js +++ b/addons/mail/static/src/models/persona_im_status_icon_view.js @@ -5,7 +5,7 @@ import { registerModel } from '@mail/model/model_core'; import { clear, replace } from '@mail/model/model_field_command'; registerModel({ - name: 'PartnerImStatusIconView', + name: 'PersonaImStatusIconView', identifyingFields: [[ 'channelInvitationFormSelectablePartnerViewOwner', 'channelMemberViewOwner', @@ -47,31 +47,31 @@ registerModel({ }, fields: { channelInvitationFormSelectablePartnerViewOwner: one('ChannelInvitationFormSelectablePartnerView', { - inverse: 'partnerImStatusIconView', + inverse: 'personaImStatusIconView', readonly: true, }), channelMemberViewOwner: one('ChannelMemberView', { - inverse: 'partnerImStatusIconView', + inverse: 'personaImStatusIconView', readonly: true, }), composerSuggestionViewOwner: one('ComposerSuggestion', { - inverse: 'partnerImStatusIconView', + inverse: 'personaImStatusIconView', readonly: true, }), messageViewOwner: one('MessageView', { - inverse: 'partnerImStatusIconView', + inverse: 'personaImStatusIconView', readonly: true, }), notificationRequestViewOwner: one('NotificationRequestView', { - inverse: 'partnerImStatusIconView', + inverse: 'personaImStatusIconView', readonly: true, }), threadNeedactionPreviewViewOwner: one('ThreadNeedactionPreviewView', { - inverse: 'partnerImStatusIconView', + inverse: 'personaImStatusIconView', readonly: true, }), threadPreviewViewOwner: one('ThreadPreviewView', { - inverse: 'partnerImStatusIconView', + inverse: 'personaImStatusIconView', readonly: true, }), persona: one('Persona', { diff --git a/addons/mail/static/src/models/thread_needaction_preview_view.js b/addons/mail/static/src/models/thread_needaction_preview_view.js index d4de697351b..d7f3917c3ec 100644 --- a/addons/mail/static/src/models/thread_needaction_preview_view.js +++ b/addons/mail/static/src/models/thread_needaction_preview_view.js @@ -79,7 +79,7 @@ registerModel({ * @private * @returns {FieldCommand} */ - _computePartnerImStatusIconView() { + _computePersonaImStatusIconView() { return this.thread.correspondent && this.thread.correspondent.isImStatusSet ? insertAndReplace() : clear(); }, }, @@ -112,8 +112,8 @@ registerModel({ readonly: true, required: true, }), - partnerImStatusIconView: one('PartnerImStatusIconView', { - compute: '_computePartnerImStatusIconView', + personaImStatusIconView: one('PersonaImStatusIconView', { + compute: '_computePersonaImStatusIconView', inverse: 'threadNeedactionPreviewViewOwner', isCausal: true, readonly: true, diff --git a/addons/mail/static/src/models/thread_preview_view.js b/addons/mail/static/src/models/thread_preview_view.js index 8cf8a91532b..f2dbf34b24e 100644 --- a/addons/mail/static/src/models/thread_preview_view.js +++ b/addons/mail/static/src/models/thread_preview_view.js @@ -78,7 +78,7 @@ registerModel({ * @private * @returns {FieldCommand} */ - _computePartnerImStatusIconView() { + _computePersonaImStatusIconView() { return this.thread.correspondent && this.thread.correspondent.isImStatusSet ? insertAndReplace() : clear(); }, }, @@ -111,8 +111,8 @@ registerModel({ readonly: true, required: true, }), - partnerImStatusIconView: one('PartnerImStatusIconView', { - compute: '_computePartnerImStatusIconView', + personaImStatusIconView: one('PersonaImStatusIconView', { + compute: '_computePersonaImStatusIconView', inverse: 'threadPreviewViewOwner', isCausal: true, readonly: true, diff --git a/addons/mail/static/src/widgets/common.xml b/addons/mail/static/src/widgets/common.xml index 291fcd7446a..ad554bf5721 100644 --- a/addons/mail/static/src/widgets/common.xml +++ b/addons/mail/static/src/widgets/common.xml @@ -2,7 +2,7 @@ diff --git a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js index 775b72d8b06..e75d7e1ed67 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js @@ -53,7 +53,7 @@ QUnit.test('partner mention suggestion correct data', async function (assert) { await insertText('.o_ComposerTextInput_textarea', "@demo"); assert.containsOnce( document.querySelector('.o_ComposerSuggestion'), - '.o_PartnerImStatusIcon', + '.o_PersonaImStatusIcon', "Partner's im_status should be displayed" ); assert.containsOnce( diff --git a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js index a8d42b89018..0ef525b8a4a 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js @@ -858,16 +858,16 @@ QUnit.test('chat with author should be opened after clicking on their im status await afterNextRender(() => advanceTime(50 * 1000)); // next fetch of im_status assert.containsOnce( document.body, - '.o_Message_partnerImStatusIcon', + '.o_Message_personaImStatusIcon', "message should have the author im status icon" ); assert.hasClass( - document.querySelector('.o_Message_partnerImStatusIcon'), + document.querySelector('.o_Message_personaImStatusIcon'), 'o-has-open-chat', "author im status icon should have the open chat style" ); - await click('.o_Message_partnerImStatusIcon'); + await click('.o_Message_personaImStatusIcon'); assert.containsOnce( document.body, '.o_ChatWindow_thread', diff --git a/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js similarity index 81% rename from addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js rename to addons/mail/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js index a8d7ca27e60..1248ebef2e0 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js @@ -4,7 +4,7 @@ import { start, startServer } from '@mail/../tests/helpers/test_utils'; QUnit.module('mail', {}, function () { QUnit.module('components', {}, function () { -QUnit.module('partner_im_status_icon_tests.js'); +QUnit.module('persona_im_status_icon_tests.js'); QUnit.test('initially online', async function (assert) { assert.expect(1); @@ -29,9 +29,9 @@ QUnit.test('initially online', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.strictEqual( - document.querySelectorAll(`.o_PartnerImStatusIcon.o-online`).length, + document.querySelectorAll(`.o_PersonaImStatusIcon.o-online`).length, 1, - "partner IM status icon should have online status rendering" + "persona IM status icon should have online status rendering" ); }); @@ -58,9 +58,9 @@ QUnit.test('initially offline', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.strictEqual( - document.querySelectorAll(`.o_PartnerImStatusIcon.o-offline`).length, + document.querySelectorAll(`.o_PersonaImStatusIcon.o-offline`).length, 1, - "partner IM status icon should have offline status rendering" + "persona IM status icon should have offline status rendering" ); }); @@ -87,9 +87,9 @@ QUnit.test('initially away', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.strictEqual( - document.querySelectorAll(`.o_PartnerImStatusIcon.o-away`).length, + document.querySelectorAll(`.o_PersonaImStatusIcon.o-away`).length, 1, - "partner IM status icon should have away status rendering" + "persona IM status icon should have away status rendering" ); }); @@ -116,33 +116,33 @@ QUnit.test('change icon on change partner im_status', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.strictEqual( - document.querySelectorAll(`.o_PartnerImStatusIcon.o-online`).length, + document.querySelectorAll(`.o_PersonaImStatusIcon.o-online`).length, 1, - "partner IM status icon should have online status rendering" + "persona IM status icon should have online status rendering" ); pyEnv['res.partner'].write([partnerId], { im_status: 'offline' }); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.strictEqual( - document.querySelectorAll(`.o_PartnerImStatusIcon.o-offline`).length, + document.querySelectorAll(`.o_PersonaImStatusIcon.o-offline`).length, 1, - "partner IM status icon should have offline status rendering" + "persona IM status icon should have offline status rendering" ); pyEnv['res.partner'].write([partnerId], { im_status: 'away' }); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.strictEqual( - document.querySelectorAll(`.o_PartnerImStatusIcon.o-away`).length, + document.querySelectorAll(`.o_PersonaImStatusIcon.o-away`).length, 1, - "partner IM status icon should have away status rendering" + "persona IM status icon should have away status rendering" ); pyEnv['res.partner'].write([partnerId], { im_status: 'online' }); await afterNextRender(() => advanceTime(messaging.fetchImStatusTimerDuration)); assert.strictEqual( - document.querySelectorAll(`.o_PartnerImStatusIcon.o-online`).length, + document.querySelectorAll(`.o_PersonaImStatusIcon.o-online`).length, 1, - "partner IM status icon should have online status rendering in the end" + "persona IM status icon should have online status rendering in the end" ); }); diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js index c19e039102a..4211454671c 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js @@ -40,7 +40,7 @@ QUnit.test('chat: correspondent is typing', async function (assert) { assert.containsOnce( document.body, '.o_ThreadIcon_online', - "should have thread icon with partner im status icon 'online'" + "should have thread icon with persona IM status icon 'online'" ); const mailChannel1 = pyEnv['mail.channel'].searchRead([['id', '=', mailChannelId1]])[0]; @@ -76,7 +76,7 @@ QUnit.test('chat: correspondent is typing', async function (assert) { assert.containsOnce( document.body, '.o_ThreadIcon_online', - "should have thread icon with partner im status icon 'online' (no longer typing)" + "should have thread icon with persona IM status icon 'online' (no longer typing)" ); });