[IMP] mail: rename newItem/itemNew to addingItem

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) <seb@odoo.com>
This commit is contained in:
Sébastien Theys
2022-02-07 19:03:56 +00:00
parent 67713706b5
commit 2d5a144898
5 changed files with 20 additions and 26 deletions
@@ -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;
@@ -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"
);
@@ -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;
@@ -26,9 +26,9 @@
<div class="o_DiscussSidebarCategory_content">
<t t-if="category.isOpen">
<t t-if="category.isAddingItem">
<div class="o_DiscussSidebarCategory_newItem">
<div class="o_DiscussSidebarCategory_addingItem d-flex mb-2">
<AutocompleteInput
className="'o_DiscussSidebarCategory_itemNewInput'"
className="'o_DiscussSidebarCategory_addingItemInput flex-grow-1'"
customClass="category === messaging.discuss.categoryChannel ? 'o_DiscussSidebarCategory_newChannelAutocompleteSuggestions' : False"
isFocusOnMount="true"
isHtml="category === messaging.discuss.categoryChannel ? true : False"
+1 -1
View File
@@ -12,7 +12,7 @@ tour.register('mail_tour', {
content: Markup(_t("<p>Channels make it easy to organize information across different topics and groups.</p> <p>Try to <b>create your first channel</b> (e.g. sales, marketing, product XYZ, after work party, etc).</p>")),
position: 'bottom',
}, {
trigger: '.o_DiscussSidebarCategory_itemNewInput',
trigger: '.o_DiscussSidebarCategory_addingItemInput',
content: Markup(_t("<p>Create a channel here.</p>")),
position: 'bottom',
auto: true,