From bb1003893faffc3d5f553b569b90518fd6cafd99 Mon Sep 17 00:00:00 2001
From: "Louis Wicket (wil)" <wil@odoo.com>
Date: Mon, 21 Mar 2022 15:01:58 +0000
Subject: [PATCH] [MOV] mail: move component hooks up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-2759571

closes odoo/odoo#86802

Related: odoo/enterprise#25434
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/__manifest__.py                                 | 4 ++--
 .../{use_component_to_model => }/use_component_to_model.js  | 0
 .../use_drag_visible_dropzone.js                            | 0
 .../src/component_hooks/{use_models => }/use_models.js      | 0
 .../{use_ref_to_model => }/use_ref_to_model.js              | 0
 .../static/src/component_hooks/{use_refs => }/use_refs.js   | 0
 .../{use_rendered_values => }/use_rendered_values.js        | 0
 .../src/component_hooks/{use_update => }/use_update.js      | 0
 .../{use_update_to_model => }/use_update_to_model.js        | 2 +-
 .../activity_mark_done_popover.js                           | 4 ++--
 .../static/src/components/attachment_box/attachment_box.js  | 4 ++--
 .../attachment_delete_confirm/attachment_delete_confirm.js  | 2 +-
 .../src/components/attachment_viewer/attachment_viewer.js   | 4 ++--
 .../channel_invitation_form/channel_invitation_form.js      | 6 +++---
 .../mail/static/src/components/chat_window/chat_window.js   | 2 +-
 addons/mail/static/src/components/chatter/chatter.js        | 4 ++--
 addons/mail/static/src/components/composer/composer.js      | 6 +++---
 .../composer_suggested_recipient.js                         | 2 +-
 .../components/composer_suggestion/composer_suggestion.js   | 4 ++--
 .../components/composer_text_input/composer_text_input.js   | 4 ++--
 .../delete_message_confirm/delete_message_confirm.js        | 2 +-
 addons/mail/static/src/components/discuss/discuss.js        | 2 +-
 .../src/components/discuss_container/discuss_container.js   | 4 ++--
 .../src/components/discuss_sidebar/discuss_sidebar.js       | 2 +-
 addons/mail/static/src/components/emoji_list/emoji_list.js  | 4 ++--
 .../follower_subtype_list/follower_subtype_list.js          | 2 +-
 .../static/src/components/media_preview/media_preview.js    | 2 +-
 addons/mail/static/src/components/message/message.js        | 6 +++---
 .../components/message_action_list/message_action_list.js   | 2 +-
 .../mail/static/src/components/message_list/message_list.js | 6 +++---
 .../messaging_menu_container/messaging_menu_container.js    | 2 +-
 .../mail/static/src/components/popover_view/popover_view.js | 2 +-
 .../rtc_activity_notice_container.js                        | 2 +-
 .../src/components/rtc_call_viewer/rtc_call_viewer.js       | 2 +-
 .../src/components/rtc_layout_menu/rtc_layout_menu.js       | 2 +-
 .../src/components/rtc_option_list/rtc_option_list.js       | 2 +-
 addons/mail/static/src/components/rtc_video/rtc_video.js    | 2 +-
 .../src/components/thread_view_topbar/thread_view_topbar.js | 4 ++--
 .../mail/static/src/components/welcome_view/welcome_view.js | 4 ++--
 addons/mail/static/src/utils/messaging_component.js         | 2 +-
 .../src/components/snailmail_error/snailmail_error.js       | 2 +-
 41 files changed, 53 insertions(+), 53 deletions(-)
 rename addons/mail/static/src/component_hooks/{use_component_to_model => }/use_component_to_model.js (100%)
 rename addons/mail/static/src/component_hooks/{use_drag_visible_dropzone => }/use_drag_visible_dropzone.js (100%)
 rename addons/mail/static/src/component_hooks/{use_models => }/use_models.js (100%)
 rename addons/mail/static/src/component_hooks/{use_ref_to_model => }/use_ref_to_model.js (100%)
 rename addons/mail/static/src/component_hooks/{use_refs => }/use_refs.js (100%)
 rename addons/mail/static/src/component_hooks/{use_rendered_values => }/use_rendered_values.js (100%)
 rename addons/mail/static/src/component_hooks/{use_update => }/use_update.js (100%)
 rename addons/mail/static/src/component_hooks/{use_update_to_model => }/use_update_to_model.js (90%)

diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index a87b132c3579..cb25c60bbf74 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -74,7 +74,7 @@
             'web/static/src/core/utils/*.scss',
             # Dependency of notification_group, notification_request, thread_needaction_preview and thread_preview
             'mail/static/src/components/notification_list/notification_list_item.scss',
-            'mail/static/src/component_hooks/*/*.js',
+            'mail/static/src/component_hooks/*.js',
             'mail/static/src/components/*/*',
             # Unused by guests and depends on ViewDialogs, better to remove it instead of pulling the whole view dependency tree
             ('remove', 'mail/static/src/components/composer_suggested_recipient/*'),
@@ -120,7 +120,7 @@
             'mail/static/src/utils/messaging_component.js',
             'mail/static/src/utils/utils.js',
             'mail/static/src/scss/*.scss',
-            'mail/static/src/component_hooks/*/*.js',
+            'mail/static/src/component_hooks/*.js',
             'mail/static/src/components/*/*.js',
             'mail/static/src/components/*/*.scss',
             'mail/static/src/model/*.js',
diff --git a/addons/mail/static/src/component_hooks/use_component_to_model/use_component_to_model.js b/addons/mail/static/src/component_hooks/use_component_to_model.js
similarity index 100%
rename from addons/mail/static/src/component_hooks/use_component_to_model/use_component_to_model.js
rename to addons/mail/static/src/component_hooks/use_component_to_model.js
diff --git a/addons/mail/static/src/component_hooks/use_drag_visible_dropzone/use_drag_visible_dropzone.js b/addons/mail/static/src/component_hooks/use_drag_visible_dropzone.js
similarity index 100%
rename from addons/mail/static/src/component_hooks/use_drag_visible_dropzone/use_drag_visible_dropzone.js
rename to addons/mail/static/src/component_hooks/use_drag_visible_dropzone.js
diff --git a/addons/mail/static/src/component_hooks/use_models/use_models.js b/addons/mail/static/src/component_hooks/use_models.js
similarity index 100%
rename from addons/mail/static/src/component_hooks/use_models/use_models.js
rename to addons/mail/static/src/component_hooks/use_models.js
diff --git a/addons/mail/static/src/component_hooks/use_ref_to_model/use_ref_to_model.js b/addons/mail/static/src/component_hooks/use_ref_to_model.js
similarity index 100%
rename from addons/mail/static/src/component_hooks/use_ref_to_model/use_ref_to_model.js
rename to addons/mail/static/src/component_hooks/use_ref_to_model.js
diff --git a/addons/mail/static/src/component_hooks/use_refs/use_refs.js b/addons/mail/static/src/component_hooks/use_refs.js
similarity index 100%
rename from addons/mail/static/src/component_hooks/use_refs/use_refs.js
rename to addons/mail/static/src/component_hooks/use_refs.js
diff --git a/addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js b/addons/mail/static/src/component_hooks/use_rendered_values.js
similarity index 100%
rename from addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js
rename to addons/mail/static/src/component_hooks/use_rendered_values.js
diff --git a/addons/mail/static/src/component_hooks/use_update/use_update.js b/addons/mail/static/src/component_hooks/use_update.js
similarity index 100%
rename from addons/mail/static/src/component_hooks/use_update/use_update.js
rename to addons/mail/static/src/component_hooks/use_update.js
diff --git a/addons/mail/static/src/component_hooks/use_update_to_model/use_update_to_model.js b/addons/mail/static/src/component_hooks/use_update_to_model.js
similarity index 90%
rename from addons/mail/static/src/component_hooks/use_update_to_model/use_update_to_model.js
rename to addons/mail/static/src/component_hooks/use_update_to_model.js
index c108484d534d..293be17f3337 100644
--- a/addons/mail/static/src/component_hooks/use_update_to_model/use_update_to_model.js
+++ b/addons/mail/static/src/component_hooks/use_update_to_model.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
+import { useUpdate } from '@mail/component_hooks/use_update';
 
 const { useComponent } = owl;
 
diff --git a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js
index 1f7c8aef59bf..744bd75b45a8 100644
--- a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js
+++ b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
-import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useRefToModel } from '@mail/component_hooks/use_ref_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 import { LegacyComponent } from "@web/legacy/legacy_component";
 
diff --git a/addons/mail/static/src/components/attachment_box/attachment_box.js b/addons/mail/static/src/components/attachment_box/attachment_box.js
index e9fd27533fc5..b4a7d22a164e 100644
--- a/addons/mail/static/src/components/attachment_box/attachment_box.js
+++ b/addons/mail/static/src/components/attachment_box/attachment_box.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useDragVisibleDropZone } from '@mail/component_hooks/use_drag_visible_dropzone';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
-import { useDragVisibleDropZone } from '@mail/component_hooks/use_drag_visible_dropzone/use_drag_visible_dropzone';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js b/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
index d11f97dd4625..f02ea13a173c 100644
--- a/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
+++ b/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
index 219cb44c4819..04f2b40c091a 100644
--- a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
+++ b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useRefs } from '@mail/component_hooks/use_refs';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
-import { useRefs } from '@mail/component_hooks/use_refs/use_refs';
 import { hidePDFJSButtons } from '@web/legacy/js/libs/pdfjs';
 
 const { Component, onMounted, onPatched, onWillUnmount, useRef } = owl;
diff --git a/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js b/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js
index 859e1a6376d8..ae331db8d3ab 100644
--- a/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js
+++ b/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useRefToModel } from '@mail/component_hooks/use_ref_to_model';
+import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model';
-import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model/use_update_to_model';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/chat_window/chat_window.js b/addons/mail/static/src/components/chat_window/chat_window.js
index 69d08228416d..7437f7732177 100644
--- a/addons/mail/static/src/components/chat_window/chat_window.js
+++ b/addons/mail/static/src/components/chat_window/chat_window.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 import { isEventHandled } from '@mail/utils/utils';
 
 const { Component } = owl;
diff --git a/addons/mail/static/src/components/chatter/chatter.js b/addons/mail/static/src/components/chatter/chatter.js
index facceb043b60..e7af10dc9996 100644
--- a/addons/mail/static/src/components/chatter/chatter.js
+++ b/addons/mail/static/src/components/chatter/chatter.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 import { LegacyComponent } from '@web/legacy/legacy_component';
 
 const { useRef } = owl;
diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js
index 6d2a6ff26b4d..ec76d9ab0269 100644
--- a/addons/mail/static/src/components/composer/composer.js
+++ b/addons/mail/static/src/components/composer/composer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
-import { useDragVisibleDropZone } from '@mail/component_hooks/use_drag_visible_dropzone/use_drag_visible_dropzone';
-import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useDragVisibleDropZone } from '@mail/component_hooks/use_drag_visible_dropzone';
+import { useRefToModel } from '@mail/component_hooks/use_ref_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 import { isEventHandled } from '@mail/utils/utils';
 
diff --git a/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js b/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js
index b6d1501e270a..d4130989811d 100644
--- a/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js
+++ b/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 
 import { FormViewDialog } from 'web.view_dialogs';
 import { ComponentAdapter } from 'web.OwlCompatibility';
diff --git a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
index c3de7705d4bc..4e8df1e55da8 100644
--- a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
+++ b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { link } from '@mail/model/model_field_command';
+import { registerMessagingComponent } from '@mail/utils/messaging_component';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/composer_text_input/composer_text_input.js b/addons/mail/static/src/components/composer_text_input/composer_text_input.js
index 54b11e023431..94a09ea4204d 100644
--- a/addons/mail/static/src/components/composer_text_input/composer_text_input.js
+++ b/addons/mail/static/src/components/composer_text_input/composer_text_input.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 import { markEventHandled } from '@mail/utils/utils';
 
 const { Component, useRef } = owl;
diff --git a/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
index e08002137faf..d84af6bd7657 100644
--- a/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
+++ b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 
 const { Component } = owl;
diff --git a/addons/mail/static/src/components/discuss/discuss.js b/addons/mail/static/src/components/discuss/discuss.js
index 77152194d265..1e81074a169b 100644
--- a/addons/mail/static/src/components/discuss/discuss.js
+++ b/addons/mail/static/src/components/discuss/discuss.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 import { LegacyComponent } from '@web/legacy/legacy_component';
 
diff --git a/addons/mail/static/src/components/discuss_container/discuss_container.js b/addons/mail/static/src/components/discuss_container/discuss_container.js
index b7279cc35e35..ada09ead34e0 100644
--- a/addons/mail/static/src/components/discuss_container/discuss_container.js
+++ b/addons/mail/static/src/components/discuss_container/discuss_container.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
-import { useModels } from "@mail/component_hooks/use_models/use_models";
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
+import { useModels } from '@mail/component_hooks/use_models';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { getMessagingComponent } from "@mail/utils/messaging_component";
 
 const { Component, onWillUnmount } = owl;
diff --git a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
index 1adf8dad7d23..910d1e916796 100644
--- a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
+++ b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 
 const { Component, useRef } = owl;
 
diff --git a/addons/mail/static/src/components/emoji_list/emoji_list.js b/addons/mail/static/src/components/emoji_list/emoji_list.js
index 292945f8a079..1f28a3e659bd 100644
--- a/addons/mail/static/src/components/emoji_list/emoji_list.js
+++ b/addons/mail/static/src/components/emoji_list/emoji_list.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import emojis from '@mail/js/emojis';
+import { registerMessagingComponent } from '@mail/utils/messaging_component';
 import { LegacyComponent } from '@web/legacy/legacy_component';
 
 export class EmojiList extends LegacyComponent {
diff --git a/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js b/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js
index 31d04bc7c687..abb6ac54f667 100644
--- a/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js
+++ b/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 
 const { Component } = owl;
diff --git a/addons/mail/static/src/components/media_preview/media_preview.js b/addons/mail/static/src/components/media_preview/media_preview.js
index b49bbb107e98..f53670fa1ca2 100644
--- a/addons/mail/static/src/components/media_preview/media_preview.js
+++ b/addons/mail/static/src/components/media_preview/media_preview.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useRefToModel } from '@mail/component_hooks/use_ref_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/message/message.js b/addons/mail/static/src/components/message/message.js
index fee02e3baa56..2ab44bd12d6b 100644
--- a/addons/mail/static/src/components/message/message.js
+++ b/addons/mail/static/src/components/message/message.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
-import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model/use_update_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useUpdate } from '@mail/component_hooks/use_update';
+import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 import { isEventHandled, markEventHandled } from '@mail/utils/utils';
 
 import { _lt } from 'web.core';
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
index c892cef1caad..f02e11768c87 100644
--- 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
@@ -1,7 +1,7 @@
 /** @odoo-module */
 
+import { useRefToModel } from '@mail/component_hooks/use_ref_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/message_list/message_list.js b/addons/mail/static/src/components/message_list/message_list.js
index 213642aeb8b9..224d3a65c3af 100644
--- a/addons/mail/static/src/components/message_list/message_list.js
+++ b/addons/mail/static/src/components/message_list/message_list.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
+import { useRenderedValues } from '@mail/component_hooks/use_rendered_values';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
-import { useRenderedValues } from '@mail/component_hooks/use_rendered_values/use_rendered_values';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 
 import { Transition } from "@web/core/transition";
 
diff --git a/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.js b/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.js
index 09d56191feec..15d21b804a0e 100644
--- a/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.js
+++ b/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useModels } from "@mail/component_hooks/use_models/use_models";
+import { useModels } from '@mail/component_hooks/use_models';
 import { getMessagingComponent } from "@mail/utils/messaging_component";
 
 const { Component, useSubEnv } = owl;
diff --git a/addons/mail/static/src/components/popover_view/popover_view.js b/addons/mail/static/src/components/popover_view/popover_view.js
index 866d7ef45f3c..9e890743a492 100644
--- a/addons/mail/static/src/components/popover_view/popover_view.js
+++ b/addons/mail/static/src/components/popover_view/popover_view.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 
 import { usePosition } from '@web/core/position_hook';
diff --git a/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.js b/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.js
index 84bee737e4ce..98bad460d499 100644
--- a/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.js
+++ b/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useModels } from "@mail/component_hooks/use_models/use_models";
+import { useModels } from '@mail/component_hooks/use_models';
 import { getMessagingComponent } from "@mail/utils/messaging_component";
 
 const { Component, useSubEnv } = owl;
diff --git a/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js b/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js
index 44dfb86bc3ea..02a3a197050f 100644
--- a/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js
+++ b/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 
 import Dialog from 'web.OwlDialog';
diff --git a/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js b/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js
index 8d594e4e4de4..2731a20e5a0d 100644
--- a/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js
+++ b/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
 import { LegacyComponent } from "@web/legacy/legacy_component";
 
 export class RtcLayoutMenu extends LegacyComponent {
diff --git a/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js b/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js
index 520423adcb97..567927678d38 100644
--- a/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js
+++ b/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
 import { LegacyComponent } from "@web/legacy/legacy_component";
 
 export class RtcOptionList extends LegacyComponent {
diff --git a/addons/mail/static/src/components/rtc_video/rtc_video.js b/addons/mail/static/src/components/rtc_video/rtc_video.js
index af8e7cc1dad5..bdfc1b458adf 100644
--- a/addons/mail/static/src/components/rtc_video/rtc_video.js
+++ b/addons/mail/static/src/components/rtc_video/rtc_video.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
+import { useUpdate } from '@mail/component_hooks/use_update';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useUpdate } from '@mail/component_hooks/use_update/use_update';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js
index 68b825574711..056760579d46 100644
--- a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js
+++ b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
+import { useRefToModel } from '@mail/component_hooks/use_ref_to_model';
+import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model';
-import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model/use_update_to_model';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/components/welcome_view/welcome_view.js b/addons/mail/static/src/components/welcome_view/welcome_view.js
index c01c46648a7d..b3bc0a76ccd9 100644
--- a/addons/mail/static/src/components/welcome_view/welcome_view.js
+++ b/addons/mail/static/src/components/welcome_view/welcome_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
+import { useRefToModel } from '@mail/component_hooks/use_ref_to_model';
+import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
-import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model';
-import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model/use_update_to_model';
 
 const { Component } = owl;
 
diff --git a/addons/mail/static/src/utils/messaging_component.js b/addons/mail/static/src/utils/messaging_component.js
index e002f475229c..6d0129d97415 100644
--- a/addons/mail/static/src/utils/messaging_component.js
+++ b/addons/mail/static/src/utils/messaging_component.js
@@ -1,6 +1,6 @@
 /** @odoo-module */
 
-import { useModels } from "@mail/component_hooks/use_models/use_models";
+import { useModels } from '@mail/component_hooks/use_models';
 
 const { useRef } = owl;
 
diff --git a/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js b/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
index 9c19a6c3a55f..eadd73db71d5 100644
--- a/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
+++ b/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model';
+import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { registerMessagingComponent } from '@mail/utils/messaging_component';
 
 const { Component } = owl;
-- 
GitLab