From 2d5a144898f8f62cc7337a9d2fed5569934609f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Mon, 7 Feb 2022 17:59:17 +0000 Subject: [PATCH] [IMP] mail: rename newItem/itemNew to addingItem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consistency in naming. Remove CSS as a bonus. Part of task-2694206, split from main PR to ease its diff closes odoo/odoo#84127 Signed-off-by: Sébastien Theys (seb) --- .../discuss/tests/discuss_sidebar_tests.js | 12 ++++----- .../components/discuss/tests/discuss_tests.js | 2 +- .../discuss_sidebar_category.scss | 26 +++++++------------ .../discuss_sidebar_category.xml | 4 +-- addons/mail/static/src/js/tours/mail.js | 2 +- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/addons/mail/static/src/components/discuss/tests/discuss_sidebar_tests.js b/addons/mail/static/src/components/discuss/tests/discuss_sidebar_tests.js index 717747d6385..d2a6f330fd7 100644 --- a/addons/mail/static/src/components/discuss/tests/discuss_sidebar_tests.js +++ b/addons/mail/static/src/components/discuss/tests/discuss_sidebar_tests.js @@ -54,11 +54,11 @@ QUnit.test('sidebar find shows channels matching search term', async function (a await afterNextRender(() => document.querySelector(`.o_DiscussSidebarCategory_commandAdd`).click() ); - document.querySelector(`.o_DiscussSidebarCategory_newItem`).focus(); + document.querySelector(`.o_DiscussSidebarCategory_addingItem`).focus(); document.execCommand('insertText', false, "test"); - document.querySelector(`.o_DiscussSidebarCategory_newItem`) + document.querySelector(`.o_DiscussSidebarCategory_addingItem`) .dispatchEvent(new window.KeyboardEvent('keydown')); - document.querySelector(`.o_DiscussSidebarCategory_newItem`) + document.querySelector(`.o_DiscussSidebarCategory_addingItem`) .dispatchEvent(new window.KeyboardEvent('keyup')); await searchReadDef; @@ -106,11 +106,11 @@ QUnit.test('sidebar find shows channels matching search term even when user is m await afterNextRender(() => document.querySelector(`.o_DiscussSidebarCategory_commandAdd`).click() ); - document.querySelector(`.o_DiscussSidebarCategory_newItem`).focus(); + document.querySelector(`.o_DiscussSidebarCategory_addingItem`).focus(); document.execCommand('insertText', false, "test"); - document.querySelector(`.o_DiscussSidebarCategory_newItem`) + document.querySelector(`.o_DiscussSidebarCategory_addingItem`) .dispatchEvent(new window.KeyboardEvent('keydown')); - document.querySelector(`.o_DiscussSidebarCategory_newItem`) + document.querySelector(`.o_DiscussSidebarCategory_addingItem`) .dispatchEvent(new window.KeyboardEvent('keyup')); await searchReadDef; diff --git a/addons/mail/static/src/components/discuss/tests/discuss_tests.js b/addons/mail/static/src/components/discuss/tests/discuss_tests.js index 8a56339576f..2683869af26 100644 --- a/addons/mail/static/src/components/discuss/tests/discuss_tests.js +++ b/addons/mail/static/src/components/discuss/tests/discuss_tests.js @@ -428,7 +428,7 @@ QUnit.test('sidebar: add channel', async function (assert) { `).click() ); assert.strictEqual( - document.querySelectorAll(`.o_DiscussSidebar_categoryChannel .o_DiscussSidebarCategory_itemNewInput`).length, + document.querySelectorAll(`.o_DiscussSidebar_categoryChannel .o_DiscussSidebarCategory_addingItemInput`).length, 1, "should have item to add a new channel" ); diff --git a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.scss b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.scss index ba06695de0b..a0cbbd7a971 100644 --- a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.scss +++ b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.scss @@ -1,6 +1,12 @@ // ------------------------------------------------------------------ // Layout // ------------------------------------------------------------------ + +.o_DiscussSidebarCategory_addingItemInput { + margin-left: $o-mail-discuss-sidebar-category-item-avatar-left-margin; + margin-right: $o-mail-discuss-sidebar-scrollbar-width; +} + .o_DiscussSidebarCategory_command { margin-left: $o-mail-discuss-sidebar-category-item-margin; margin-right:$o-mail-discuss-sidebar-category-item-margin; @@ -33,18 +39,6 @@ } } -.o_DiscussSidebarCategory_itemNewInput { - flex: 1 1 auto; - margin-left: $o-mail-discuss-sidebar-category-item-avatar-left-margin; - margin-right: $o-mail-discuss-sidebar-scrollbar-width; -} - -.o_DiscussSidebarCategory_newItem { - display: flex; - justify-content: center; - padding-bottom: map-get($spacers, 2); -} - .o_DiscussSidebarCategory_title { display: flex; align-items: baseline; @@ -60,6 +54,10 @@ // style // ------------------------------------------------------------------ +.o_DiscussSidebarCategory_addingItemInput { + outline: none; +} + .o_DiscussSidebarCategory_command { cursor: pointer; @@ -77,10 +75,6 @@ user-select: none; } -.o_DiscussSidebarCategory_itemNewInput { - outline: none; -} - .o_DiscussSidebarCategory_title { cursor: pointer; diff --git a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml index 7385b7f2f0a..70e7df02b5b 100644 --- a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml +++ b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml @@ -26,9 +26,9 @@
-
+
Channels make it easy to organize information across different topics and groups.

Try to create your first channel (e.g. sales, marketing, product XYZ, after work party, etc).

")), position: 'bottom', }, { - trigger: '.o_DiscussSidebarCategory_itemNewInput', + trigger: '.o_DiscussSidebarCategory_addingItemInput', content: Markup(_t("

Create a channel here.

")), position: 'bottom', auto: true,