diff --git a/addons/hr/static/tests/m2x_avatar_employee_legacy_tests.js b/addons/hr/static/tests/m2x_avatar_employee_legacy_tests.js index 5a72996a70b..7f6d8078887 100644 --- a/addons/hr/static/tests/m2x_avatar_employee_legacy_tests.js +++ b/addons/hr/static/tests/m2x_avatar_employee_legacy_tests.js @@ -111,7 +111,7 @@ QUnit.module('hr', {}, function () { assert.containsN( document.body, - '.o_ChatWindowHeader_name', + '.o_ChatWindowHeaderView_name', 2, "should have 2 chat windows" ); @@ -176,7 +176,7 @@ QUnit.module('hr', {}, function () { `read hr.employee.public ${hrEmployeePublicId2}` ]); - assert.containsOnce(document.body, '.o_ChatWindowHeader_name', + assert.containsOnce(document.body, '.o_ChatWindowHeaderView_name', "should have 1 chat window"); }); }); diff --git a/addons/hr/static/tests/m2x_avatar_employee_tests.js b/addons/hr/static/tests/m2x_avatar_employee_tests.js index cc7c536168f..001936f1eb6 100644 --- a/addons/hr/static/tests/m2x_avatar_employee_tests.js +++ b/addons/hr/static/tests/m2x_avatar_employee_tests.js @@ -69,11 +69,11 @@ QUnit.module('hr', {}, function () { ); assert.containsOnce( document.body, - '.o_ChatWindowHeader_name', + '.o_ChatWindowHeaderView_name', 'should have opened chat window' ); assert.strictEqual( - document.querySelector('.o_ChatWindowHeader_name').textContent, + document.querySelector('.o_ChatWindowHeaderView_name').textContent, "Mario", 'chat window should be with clicked employee' ); @@ -88,12 +88,12 @@ QUnit.module('hr', {}, function () { ); assert.containsN( document.body, - '.o_ChatWindowHeader_name', + '.o_ChatWindowHeaderView_name', 2, 'should have opened second chat window' ); assert.strictEqual( - document.querySelectorAll('.o_ChatWindowHeader_name')[1].textContent, + document.querySelectorAll('.o_ChatWindowHeaderView_name')[1].textContent, "Luigi", 'chat window should be with clicked employee' ); @@ -108,7 +108,7 @@ QUnit.module('hr', {}, function () { ); assert.containsN( document.body, - '.o_ChatWindowHeader_name', + '.o_ChatWindowHeaderView_name', 2, "should still have only 2 chat windows because third is the same partner as first" ); @@ -241,7 +241,7 @@ QUnit.module('hr', {}, function () { assert.containsN( document.body, - '.o_ChatWindowHeader_name', + '.o_ChatWindowHeaderView_name', 2, "should have 2 chat windows" ); @@ -292,11 +292,11 @@ QUnit.module('hr', {}, function () { ); assert.containsOnce( document.body, - '.o_ChatWindowHeader_name', + '.o_ChatWindowHeaderView_name', 'should have opened chat window' ); assert.strictEqual( - document.querySelector('.o_ChatWindowHeader_name').textContent, + document.querySelector('.o_ChatWindowHeaderView_name').textContent, "Mario", 'chat window should be with clicked employee' ); @@ -311,12 +311,12 @@ QUnit.module('hr', {}, function () { ); assert.containsN( document.body, - '.o_ChatWindowHeader_name', + '.o_ChatWindowHeaderView_name', 2, 'should have opened second chat window' ); assert.strictEqual( - document.querySelectorAll('.o_ChatWindowHeader_name')[1].textContent, + document.querySelectorAll('.o_ChatWindowHeaderView_name')[1].textContent, "Yoshi", 'chat window should be with clicked employee' ); @@ -444,7 +444,7 @@ QUnit.module('hr', {}, function () { `read hr.employee.public ${hrEmployeePublicId2}` ]); - assert.containsOnce(document.body, '.o_ChatWindowHeader_name', + assert.containsOnce(document.body, '.o_ChatWindowHeaderView_name', "should have 1 chat window"); }); }); diff --git a/addons/hr_attendance/static/src/js/kiosk_mode.js b/addons/hr_attendance/static/src/js/kiosk_mode.js index 18ff659f047..b2e76f888f1 100644 --- a/addons/hr_attendance/static/src/js/kiosk_mode.js +++ b/addons/hr_attendance/static/src/js/kiosk_mode.js @@ -44,7 +44,7 @@ var KioskMode = AbstractAction.extend({ on_attach_callback: function () { // Stop the bus_service to avoid notifications in kiosk mode this.call('bus_service', 'stop'); - $('body').find('.o_ChatWindowHeader_commandClose').click(); + $('body').find('.o_ChatWindowHeaderView_commandClose').click(); }, _onBarcodeScanned: function(barcode) { diff --git a/addons/hr_holidays/static/src/components/persona_im_status_icon/persona_im_status_icon.xml b/addons/hr_holidays/static/src/components/persona_im_status_icon/persona_im_status_icon.xml index 8799c1aaacc..4b624b620fd 100644 --- a/addons/hr_holidays/static/src/components/persona_im_status_icon/persona_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/src/components/thread_icon/thread_icon.xml b/addons/hr_holidays/static/src/components/thread_icon/thread_icon.xml index 17888a19735..b857f8013c0 100644 --- a/addons/hr_holidays/static/src/components/thread_icon/thread_icon.xml +++ b/addons/hr_holidays/static/src/components/thread_icon/thread_icon.xml @@ -1,15 +1,15 @@ - + -
+
-
+
-
+
diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js index c61006c8158..8973423d9cf 100644 --- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js +++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/persona_im_status_icon_tests.js @@ -31,12 +31,12 @@ QUnit.test('on leave & online', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(UPDATE_BUS_PRESENCE_DELAY)); assert.hasClass( - document.querySelector('.o_PersonaImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIconView_icon'), 'o-online', "persona IM status icon should have online status rendering" ); assert.hasClass( - document.querySelector('.o_PersonaImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIconView_icon'), 'fa-plane', "persona IM status icon should have leave status rendering" ); @@ -65,12 +65,12 @@ QUnit.test('on leave & away', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(UPDATE_BUS_PRESENCE_DELAY)); assert.hasClass( - document.querySelector('.o_PersonaImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIconView_icon'), 'o-away', "persona IM status icon should have away status rendering" ); assert.hasClass( - document.querySelector('.o_PersonaImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIconView_icon'), 'fa-plane', "persona IM status icon should have leave status rendering" ); @@ -99,12 +99,12 @@ QUnit.test('on leave & offline', async function (assert) { await openDiscuss(); await afterNextRender(() => advanceTime(UPDATE_BUS_PRESENCE_DELAY)); assert.hasClass( - document.querySelector('.o_PersonaImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIconView_icon'), 'o-offline', "persona IM status icon should have offline status rendering" ); assert.hasClass( - document.querySelector('.o_PersonaImStatusIcon_icon'), + document.querySelector('.o_PersonaImStatusIconView_icon'), 'fa-plane', "persona IM status icon should have leave status rendering" ); diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js index c7fdb45720d..35074c9eda4 100644 --- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js +++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js @@ -29,11 +29,11 @@ QUnit.test('thread icon of a chat when correspondent is on leave & online', asyn assert.containsOnce( document.body, - '.o_ThreadIcon_online', + '.o_ThreadIconView_online', "thread icon should have online status rendering" ); assert.hasClass( - document.querySelector('.o_ThreadIcon_online'), + document.querySelector('.o_ThreadIconView_online'), 'fa-plane', "thread icon should have leave status rendering" ); @@ -59,11 +59,11 @@ QUnit.test('thread icon of a chat when correspondent is on leave & away', async assert.containsOnce( document.body, - '.o_ThreadIcon_away', + '.o_ThreadIconView_away', "thread icon should have away status rendering" ); assert.hasClass( - document.querySelector('.o_ThreadIcon_away'), + document.querySelector('.o_ThreadIconView_away'), 'fa-plane', "thread icon should have leave status rendering" ); @@ -89,11 +89,11 @@ QUnit.test('thread icon of a chat when correspondent is on leave & offline', asy assert.containsOnce( document.body, - '.o_ThreadIcon_offline', + '.o_ThreadIconView_offline', "thread icon should have offline status rendering" ); assert.hasClass( - document.querySelector('.o_ThreadIcon_offline'), + document.querySelector('.o_ThreadIconView_offline'), 'fa-plane', "thread icon should have leave status rendering" ); diff --git a/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js b/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js index a0819049f11..1a5147e1b3b 100644 --- a/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js +++ b/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js @@ -83,7 +83,7 @@ tour.register('hr_recruitment_tour',{ content: Markup(_t("
Try to send an email to the applicant.
Tips: All emails sent or received are saved in the history here")), position: "bottom" }, { - trigger: ".o_Chatter .o_Composer_buttonSend", + trigger: ".o_Chatter .o_ComposerView_buttonSend", extra_trigger: '.o_applicant_form', content: _t("Send your email. Followers will get a copy of the communication."), position: "bottom" diff --git a/addons/hr_recruitment/static/src/scss/hr_applicant.scss b/addons/hr_recruitment/static/src/scss/hr_applicant.scss index f71d8a51de4..2973a5c3229 100644 --- a/addons/hr_recruitment/static/src/scss/hr_applicant.scss +++ b/addons/hr_recruitment/static/src/scss/hr_applicant.scss @@ -1,7 +1,7 @@ .o_applicant_interviewer_form { .o_ChatterTopbar_buttonSendMessage, .o_ChatterTopbar_buttonLogNote, - .o_MessageList_empty { + .o_MessageListView_empty { display: none; } } diff --git a/addons/im_livechat/static/src/components/composer/composer.xml b/addons/im_livechat/static/src/components/composer/composer.xml index b012c1a6165..08c0b4ea34d 100644 --- a/addons/im_livechat/static/src/components/composer/composer.xml +++ b/addons/im_livechat/static/src/components/composer/composer.xml @@ -1,8 +1,8 @@ - - + + $0 diff --git a/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml b/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml index e1e964b3f31..aae5a24732c 100644 --- a/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml +++ b/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml @@ -1,11 +1,11 @@ - + diff --git a/addons/im_livechat/static/src/components/thread_icon/thread_icon.xml b/addons/im_livechat/static/src/components/thread_icon/thread_icon.xml index 0467648eff6..45a329abc58 100644 --- a/addons/im_livechat/static/src/components/thread_icon/thread_icon.xml +++ b/addons/im_livechat/static/src/components/thread_icon/thread_icon.xml @@ -1,11 +1,11 @@ - + - diff --git a/addons/im_livechat/static/src/components/thread_needaction_preview/thread_needaction_preview.js b/addons/im_livechat/static/src/components/thread_needaction_preview/thread_needaction_preview.js index 63bb22069d4..67e58fe1d1f 100644 --- a/addons/im_livechat/static/src/components/thread_needaction_preview/thread_needaction_preview.js +++ b/addons/im_livechat/static/src/components/thread_needaction_preview/thread_needaction_preview.js @@ -1,12 +1,12 @@ /** @odoo-module **/ -import { ThreadNeedactionPreview } from '@mail/components/thread_needaction_preview/thread_needaction_preview'; +import { ThreadNeedactionPreviewView } from '@mail/components/thread_needaction_preview/thread_needaction_preview'; import { patch } from 'web.utils'; -const components = { ThreadNeedactionPreview }; +const components = { ThreadNeedactionPreviewView }; -patch(components.ThreadNeedactionPreview.prototype, 'thread_needaction_preview', { +patch(components.ThreadNeedactionPreviewView.prototype, 'thread_needaction_preview', { //-------------------------------------------------------------------------- // Public diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js index c88451b7baf..eb3ba831d03 100644 --- a/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js +++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js @@ -33,8 +33,8 @@ QUnit.test('closing a chat window with no message from admin side unpins it', as const { messaging } = await start(); await afterNextRender(() => document.querySelector(`.o_MessagingMenu_toggler`).click()); - await afterNextRender(() => document.querySelector(`.o_NotificationList_preview`).click()); - await afterNextRender(() => document.querySelector(`.o_ChatWindowHeader_commandClose`).click()); + await afterNextRender(() => document.querySelector(`.o_NotificationListView_preview`).click()); + await afterNextRender(() => document.querySelector(`.o_ChatWindowHeaderView_commandClose`).click()); const channels = await messaging.rpc({ model: 'mail.channel', method: 'channel_info', diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js index 7bd9c39ebbe..bc4dab99c92 100644 --- a/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js +++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js @@ -19,10 +19,10 @@ QUnit.test('livechat: no add attachment button', async function (assert) { }, }); await openDiscuss(); - assert.containsOnce(document.body, '.o_Composer', "should have a composer"); + assert.containsOnce(document.body, '.o_ComposerView', "should have a composer"); assert.containsNone( document.body, - '.o_Composer_buttonAttachment', + '.o_ComposerView_buttonAttachment', "composer linked to livechat should not have a 'Add attachment' button" ); }); @@ -38,10 +38,10 @@ QUnit.test('livechat: disable attachment upload via drag and drop', async functi }, }); await openDiscuss(); - assert.containsOnce(document.body, '.o_Composer', "should have a composer"); + assert.containsOnce(document.body, '.o_ComposerView', "should have a composer"); assert.containsNone( document.body, - '.o_Composer_dropZone', + '.o_ComposerView_dropZone', "composer linked to livechat should not have a dropzone" ); }); diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js index 96adbca6b40..7503704b0b7 100644 --- a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js +++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js @@ -27,7 +27,7 @@ QUnit.test('livechat - counter: should not have a counter if the category is unf await openDiscuss(); assert.containsNone( document.body, - `.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategory_counter`, + `.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategory_counter`, "should not have a counter if the category is unfolded and without unread messages", ); }); @@ -52,7 +52,7 @@ QUnit.test('livechat - counter: should not have a counter if the category is unf await openDiscuss(); assert.containsNone( document.body, - `.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategory_counter`, + `.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategory_counter`, "should not have a counter if the category is unfolded and with unread messages", ); }); @@ -79,7 +79,7 @@ QUnit.test('livechat - counter: should not have a counter if category is folded assert.containsNone( document.body, - `.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategory_counter`, + `.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategory_counter`, "should not have a counter if the category is folded and without unread messages" ); }); @@ -108,7 +108,7 @@ QUnit.test('livechat - counter: should have correct value of unread threads if c await openDiscuss(); assert.strictEqual( - document.querySelector(`.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategory_counter`).textContent, + document.querySelector(`.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategory_counter`).textContent, "1", "should have correct value of unread threads if category is folded and with unread messages" ); diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js index db83b086151..37dbc38dca2 100644 --- a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js +++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js @@ -29,10 +29,10 @@ QUnit.test('livechat in the sidebar: basic rendering', async function (assert) { const { openDiscuss } = await start(); await openDiscuss(); - assert.containsOnce(document.body, '.o_Discuss_sidebar', + assert.containsOnce(document.body, '.o_DiscussView_sidebar', "should have a sidebar section" ); - const groupLivechat = document.querySelector('.o_DiscussSidebar_categoryLivechat'); + const groupLivechat = document.querySelector('.o_DiscussSidebarView_categoryLivechat'); assert.ok(groupLivechat, "should have a channel group livechat" ); @@ -81,10 +81,10 @@ QUnit.test('livechat in the sidebar: existing user with country', async function assert.containsOnce( document.body, - '.o_DiscussSidebar_categoryLivechat', + '.o_DiscussSidebarView_categoryLivechat', "should have a channel group livechat in the side bar" ); - const livechat = document.querySelector('.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategoryItem'); + const livechat = document.querySelector('.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategoryItem'); assert.ok( livechat, "should have a livechat in sidebar" @@ -109,7 +109,7 @@ QUnit.test('do not add livechat in the sidebar on visitor opening his chat', asy assert.containsNone( document.body, - '.o_DiscussSidebar_categoryLivechat', + '.o_DiscussSidebarView_categoryLivechat', "should not have any livechat in the sidebar initially" ); @@ -126,7 +126,7 @@ QUnit.test('do not add livechat in the sidebar on visitor opening his chat', asy await nextAnimationFrame(); assert.containsNone( document.body, - '.o_DiscussSidebar_categoryLivechat', + '.o_DiscussSidebarView_categoryLivechat', "should still not have any livechat in the sidebar after visitor opened his chat" ); }); @@ -156,7 +156,7 @@ QUnit.test('do not add livechat in the sidebar on visitor typing', async functio assert.containsNone( document.body, - '.o_DiscussSidebar_categoryLivechat', + '.o_DiscussSidebarView_categoryLivechat', "should not have any livechat in the sidebar initially" ); @@ -175,7 +175,7 @@ QUnit.test('do not add livechat in the sidebar on visitor typing', async functio await nextAnimationFrame(); assert.containsNone( document.body, - '.o_DiscussSidebar_categoryLivechat', + '.o_DiscussSidebarView_categoryLivechat', "should still not have any livechat in the sidebar after visitor started typing" ); }); @@ -210,7 +210,7 @@ QUnit.test('add livechat in the sidebar on visitor sending first message', async await openDiscuss(); assert.containsNone( document.body, - '.o_DiscussSidebar_categoryLivechat', + '.o_DiscussSidebarView_categoryLivechat', "should not have any livechat in the sidebar initially" ); @@ -228,16 +228,16 @@ QUnit.test('add livechat in the sidebar on visitor sending first message', async })); assert.containsOnce( document.body, - '.o_DiscussSidebar_categoryLivechat', + '.o_DiscussSidebarView_categoryLivechat', "should have a channel group livechat in the side bar after receiving first message" ); assert.containsOnce( document.body, - '.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategoryItem', + '.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategoryItem', "should have a livechat in the sidebar after receiving first message" ); assert.strictEqual( - document.querySelector('.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategoryItem .o_DiscussSidebarCategoryItem_name').textContent, + document.querySelector('.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategoryItem .o_DiscussSidebarCategoryItem_name').textContent, "Visitor (Belgium)", "should have visitor name and country as livechat name" ); @@ -275,7 +275,7 @@ QUnit.test('livechats are sorted by last activity time in the sidebar: most rece ]); const { openDiscuss } = await start(); await openDiscuss(); - const initialLivechats = document.querySelectorAll('.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategory_item'); + const initialLivechats = document.querySelectorAll('.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategory_item'); assert.strictEqual( initialLivechats.length, 2, @@ -295,9 +295,9 @@ QUnit.test('livechats are sorted by last activity time in the sidebar: most rece // post a new message on the last channel await afterNextRender(() => initialLivechats[1].click()); await afterNextRender(() => document.execCommand('insertText', false, "Blabla")); - await afterNextRender(() => document.querySelector('.o_Composer_buttonSend').click()); + await afterNextRender(() => document.querySelector('.o_ComposerView_buttonSend').click()); - const newLivechats = document.querySelectorAll('.o_DiscussSidebar_categoryLivechat .o_DiscussSidebarCategory_item'); + const newLivechats = document.querySelectorAll('.o_DiscussSidebarView_categoryLivechat .o_DiscussSidebarCategory_item'); assert.strictEqual( newLivechats.length, 2, @@ -393,9 +393,9 @@ QUnit.test('reaction button should not be present on livechat', async function ( }, }); await openDiscuss(); - await insertText('.o_ComposerTextInput_textarea', "Test"); - await click('.o_Composer_buttonSend'); - await click('.o_Message'); + await insertText('.o_ComposerTextInputView_textarea', "Test"); + await click('.o_ComposerView_buttonSend'); + await click('.o_MessageView'); assert.containsNone( document.body, '.o_MessageActionView_actionReaction', @@ -421,9 +421,9 @@ QUnit.test('reply button should not be present on livechat', async function (ass }, }); await openDiscuss(); - await insertText('.o_ComposerTextInput_textarea', "Test"); - await click('.o_Composer_buttonSend'); - await click('.o_Message'); + await insertText('.o_ComposerTextInputView_textarea', "Test"); + await click('.o_ComposerView_buttonSend'); + await click('.o_MessageView'); assert.containsNone( document.body, '.o_MessageActionView_actionReplyTo', diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js index 2191dbe0a35..934d3d6bd48 100644 --- a/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js +++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js @@ -33,16 +33,16 @@ QUnit.test('livechats should be in "chat" filter', async function (assert) { await afterNextRender(() => document.querySelector('.o_MessagingMenu_toggler').click()); assert.containsOnce( document.body, - '.o_MessagingMenuTab[data-tab-id="all"]', + '.o_MessagingMenuTabView[data-tab-id="all"]', "should have a tab/filter 'all' in messaging menu" ); assert.containsOnce( document.body, - '.o_MessagingMenuTab[data-tab-id="chat"]', + '.o_MessagingMenuTabView[data-tab-id="chat"]', "should have a tab/filter 'chat' in messaging menu" ); assert.hasClass( - document.querySelector('.o_MessagingMenuTab[data-tab-id="all"]'), + document.querySelector('.o_MessagingMenuTabView[data-tab-id="all"]'), 'o-active', "tab/filter 'all' of messaging menu should be active initially" ); @@ -53,10 +53,10 @@ QUnit.test('livechats should be in "chat" filter', async function (assert) { ); await afterNextRender(() => - document.querySelector('.o_MessagingMenuTab[data-tab-id="chat"]').click() + document.querySelector('.o_MessagingMenuTabView[data-tab-id="chat"]').click() ); assert.hasClass( - document.querySelector('.o_MessagingMenuTab[data-tab-id="chat"]'), + document.querySelector('.o_MessagingMenuTabView[data-tab-id="chat"]'), 'o-active', "tab/filter 'chat' of messaging menu should become active after click" ); diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js index 7fa88a571d4..e8eceae772a 100644 --- a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js +++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js @@ -31,12 +31,12 @@ QUnit.test('livechat: public website visitor is typing', async function (assert) await openDiscuss(); assert.containsOnce( document.body, - '.o_ThreadViewTopbar .o_ThreadIcon', + '.o_ThreadViewTopbar .o_ThreadIconView', "should have thread icon" ); assert.containsOnce( document.body, - '.o_ThreadIcon .fa.fa-comments', + '.o_ThreadIconView .fa.fa-comments', "should have default livechat icon" ); @@ -54,11 +54,11 @@ QUnit.test('livechat: public website visitor is typing', async function (assert) })); assert.containsOnce( document.body, - '.o_ThreadIcon_typing', + '.o_ThreadIconView_typing', "should have thread icon with visitor currently typing" ); assert.strictEqual( - document.querySelector('.o_ThreadIcon_typing').title, + document.querySelector('.o_ThreadIconView_typing').title, "Visitor 20 is typing...", "title of icon should tell visitor is currently typing" ); diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js index fc8e74571b5..c507a5f950d 100644 --- a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js +++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js @@ -31,7 +31,7 @@ QUnit.test('receive visitor typing status "is typing"', async function (assert) await openDiscuss(); assert.strictEqual( - document.querySelector('.o_ThreadTextualTypingStatus').textContent, + document.querySelector('.o_ThreadTextualTypingStatusView').textContent, "", "Should display no one is currently typing" ); @@ -49,7 +49,7 @@ QUnit.test('receive visitor typing status "is typing"', async function (assert) }, })); assert.strictEqual( - document.querySelector('.o_ThreadTextualTypingStatus').textContent, + document.querySelector('.o_ThreadTextualTypingStatusView').textContent, "Visitor 20 is typing...", "Should display that visitor is typing" ); diff --git a/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml b/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml index a309dff4e3c..58840dff4b6 100644 --- a/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml +++ b/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml @@ -26,9 +26,9 @@
- +
- diff --git a/addons/mail/static/src/components/activity/activity.xml b/addons/mail/static/src/components/activity/activity.xml index eca0af60191..9c5d0bcb710 100644 --- a/addons/mail/static/src/components/activity/activity.xml +++ b/addons/mail/static/src/components/activity/activity.xml @@ -111,7 +111,7 @@
- diff --git a/addons/mail/static/src/components/activity_box/activity_box.js b/addons/mail/static/src/components/activity_box/activity_box.js index 29f65b0400a..95c992e5708 100644 --- a/addons/mail/static/src/components/activity_box/activity_box.js +++ b/addons/mail/static/src/components/activity_box/activity_box.js @@ -4,7 +4,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { Component } from '@odoo/owl'; -export class ActivityBox extends Component { +export class ActivityBoxView extends Component { /** * @returns {ActivityBoxView} @@ -15,9 +15,9 @@ export class ActivityBox extends Component { } -Object.assign(ActivityBox, { +Object.assign(ActivityBoxView, { props: { record: Object }, - template: 'mail.ActivityBox', + template: 'mail.ActivityBoxView', }); -registerMessagingComponent(ActivityBox); +registerMessagingComponent(ActivityBoxView); diff --git a/addons/mail/static/src/components/activity_box/activity_box.scss b/addons/mail/static/src/components/activity_box/activity_box.scss index 859c17358cb..cf03cccb875 100644 --- a/addons/mail/static/src/components/activity_box/activity_box.scss +++ b/addons/mail/static/src/components/activity_box/activity_box.scss @@ -2,7 +2,7 @@ // Layout // ------------------------------------------------------------------ -.o_ActivityBox_activityList { +.o_ActivityBoxView_activityList { max-width: var(--Chatter-max-width, none); } @@ -10,6 +10,6 @@ // Style // ------------------------------------------------------------------ -.o_ActivityBox_titleLine { +.o_ActivityBoxView_titleLine { border-top: $border-width $border-color dashed; } diff --git a/addons/mail/static/src/components/activity_box/activity_box.xml b/addons/mail/static/src/components/activity_box/activity_box.xml index 3c8af338b71..8de36dc3f14 100644 --- a/addons/mail/static/src/components/activity_box/activity_box.xml +++ b/addons/mail/static/src/components/activity_box/activity_box.xml @@ -1,40 +1,40 @@ - + -
- -
- +
+ +
+ Planned activities - + - + - + - + -
+
-
+
- +
diff --git a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js index f66417e2dd8..7a35fd17ce5 100644 --- a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js +++ b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js @@ -5,7 +5,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { Component, onMounted } from '@odoo/owl'; -export class ActivityMarkDonePopoverContent extends Component { +export class ActivityMarkDonePopoverContentView extends Component { /** * @override @@ -25,9 +25,9 @@ export class ActivityMarkDonePopoverContent extends Component { } -Object.assign(ActivityMarkDonePopoverContent, { +Object.assign(ActivityMarkDonePopoverContentView, { props: { record: Object }, - template: 'mail.ActivityMarkDonePopoverContent', + template: 'mail.ActivityMarkDonePopoverContentView', }); -registerMessagingComponent(ActivityMarkDonePopoverContent); +registerMessagingComponent(ActivityMarkDonePopoverContentView); diff --git a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.scss b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.scss index b9d52f5bb22..51b41394c1e 100644 --- a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.scss +++ b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.scss @@ -2,6 +2,6 @@ // Layout // ------------------------------------------------------------------ -.o_ActivityMarkDonePopoverContent_feedback { +.o_ActivityMarkDonePopoverContentView_feedback { min-height: 70px; } diff --git a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.xml b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.xml index d43617e6c3f..5d290d0b59c 100644 --- a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.xml +++ b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.xml @@ -1,22 +1,22 @@ - + -
-
-
-