[IMP] mail, *: move up model files

Move model definition files from `models/thing/thing.js` to
`models/thing.js` and remove the now empty intermediate directory.

Task-2759582
 * = calendar, crm_livechat, hr, im_livechat, mail_bot, sms, snailmail,
     website_livechat, website_slides

closes odoo/odoo#86464

Related: odoo/enterprise#25291
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>

addons/calendar/__manifest__.py

@@ -39,7 +39,7 @@ If you need to manage your meetings, you should install the CRM module.
     'auto_install': False,
     'assets': {
         'web.assets_backend': [
-            'calendar/static/src/models/*/*.js',
+            'calendar/static/src/models/*.js',
             'calendar/static/src/scss/calendar.scss',
             'calendar/static/src/js/base_calendar.js',
             'calendar/static/src/js/calendar_renderer.js',

addons/calendar/static/src/models/activity.js

@@ -3,7 +3,7 @@
 import { addFields, patchModelMethods, patchRecordMethods } from '@mail/model/model_core';
 import { attr } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/activity/activity';
+import '@mail/models/activity';
 
 addFields('Activity', {
     calendar_event_id: attr({ default: false }),

addons/calendar/static/src/models/activity_view.js

@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/activity_view/activity_view';
+import '@mail/models/activity_view';
 
 import Dialog from 'web.Dialog';
 

addons/crm_livechat/__manifest__.py

@@ -17,10 +17,10 @@
     'license': 'LGPL-3',
     'assets': {
         'mail.assets_discuss_public': [
-            'crm_livechat/static/src/models/*/*.js',
+            'crm_livechat/static/src/models/*.js',
         ],
         'web.assets_backend': [
-            'crm_livechat/static/src/models/*/*.js',
+            'crm_livechat/static/src/models/*.js',
         ],
     },
 }

addons/crm_livechat/static/src/models/messaging_initializer.js

@@ -3,7 +3,7 @@
 import { patchRecordMethods } from '@mail/model/model_core';
 import { insert } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_initializer/messaging_initializer';
+import '@mail/models/messaging_initializer';
 
 patchRecordMethods('MessagingInitializer', {
     /**

addons/hr/__manifest__.py

@@ -50,7 +50,7 @@
     'auto_install': False,
     'assets': {
         'mail.assets_discuss_public': [
-            'hr/static/src/models/*/*.js',
+            'hr/static/src/models/*.js',
         ],
         'web.assets_backend': [
             'hr/static/src/scss/hr.scss',
@@ -61,7 +61,7 @@
             'hr/static/src/js/standalone_m2o_avatar_employee.js',
             'hr/static/src/js/user_menu.js',
             'hr/static/src/js/work_permit_upload.js',
-            'hr/static/src/models/*/*.js',
+            'hr/static/src/models/*.js',
         ],
         'web.assets_qweb': [
             'hr/static/src/xml/*.xml',

addons/hr/static/src/models/messaging.js

@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging/messaging';
+import '@mail/models/messaging';
 
 patchRecordMethods('Messaging', {
     /**

addons/hr/static/src/models/partner.js

@@ -3,7 +3,7 @@
 import { addFields, addRecordMethods, patchRecordMethods } from '@mail/model/model_core';
 import { attr, one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/partner/partner';
+import '@mail/models/partner';
 
 addRecordMethods('Partner', {
     /**

addons/hr/static/src/models/user.js

@@ -3,7 +3,7 @@
 import { addFields } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/user/user';
+import '@mail/models/user';
 
 addFields('User', {
     /**

addons/hr_holidays/__manifest__.py

@@ -64,11 +64,11 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
     'assets': {
         'mail.assets_discuss_public': [
             'hr_holidays/static/src/components/*/*',
-            'hr_holidays/static/src/models/*/*.js',
+            'hr_holidays/static/src/models/*.js',
         ],
         'web.assets_backend': [
             'hr_holidays/static/src/js/**/*.js',
-            'hr_holidays/static/src/models/*/*.js',
+            'hr_holidays/static/src/models/*.js',
             'hr_holidays/static/src/components/*/*.scss',
             'hr_holidays/static/src/dashboard/**/*.js',
             'hr_holidays/static/src/dashboard/**/*.scss',

addons/hr_holidays/static/src/models/partner.js

@@ -4,7 +4,7 @@ import { addFields, addRecordMethods, patchModelMethods, patchRecordMethods } fr
 import { attr } from '@mail/model/model_field';
 import { clear } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/partner/partner';
+import '@mail/models/partner';
 
 import { str_to_date } from 'web.time';
 

addons/im_livechat/__manifest__.py

@@ -44,13 +44,13 @@ Help your customers with this chat, and analyse their feedback.
     'assets': {
         'mail.assets_discuss_public': [
             'im_livechat/static/src/components/*/*',
-            'im_livechat/static/src/models/*/*.js',
+            'im_livechat/static/src/models/*.js',
         ],
         'web.assets_backend': [
             'im_livechat/static/src/js/im_livechat_channel_form_view.js',
             'im_livechat/static/src/js/im_livechat_channel_form_controller.js',
             'im_livechat/static/src/components/*/*.js',
-            'im_livechat/static/src/models/*/*.js',
+            'im_livechat/static/src/models/*.js',
             'im_livechat/static/src/scss/im_livechat_history.scss',
             'im_livechat/static/src/scss/im_livechat_form.scss',
         ],

addons/im_livechat/static/src/models/chat_window.js

@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/chat_window/chat_window';
+import '@mail/models/chat_window';
 
 patchRecordMethods('ChatWindow', {
     /**

addons/im_livechat/static/src/models/discuss.js

@@ -3,7 +3,7 @@
 import { addFields, patchRecordMethods } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/discuss/discuss';
+import '@mail/models/discuss';
 
 patchRecordMethods('Discuss', {
     /**

addons/im_livechat/static/src/models/discuss_sidebar_category.js

@@ -3,7 +3,7 @@
 import { addFields, patchIdentifyingFields } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/discuss_sidebar_category/discuss_sidebar_category';
+import '@mail/models/discuss_sidebar_category';
 
 addFields('DiscussSidebarCategory', {
     discussAsLivechat: one('Discuss', {

addons/im_livechat/static/src/models/discuss_sidebar_category_item.js

@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/discuss_sidebar_category_item/discuss_sidebar_category_item';
+import '@mail/models/discuss_sidebar_category_item';
 
 patchRecordMethods('DiscussSidebarCategoryItem', {
     /**

addons/im_livechat/static/src/models/message.js

@@ -3,7 +3,7 @@
 import { patchModelMethods } from '@mail/model/model_core';
 import { insertAndReplace } from '@mail/model/model_field_command';
 // ensure the model definition is loaded before the patch
-import '@mail/models/message/message';
+import '@mail/models/message';
 
 patchModelMethods('Message', {
     /**

addons/im_livechat/static/src/models/messaging.js

@@ -3,7 +3,7 @@
 import { addFields } from '@mail/model/model_core';
 import { many } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging/messaging';
+import '@mail/models/messaging';
 
 addFields('Messaging', {
     /**

addons/im_livechat/static/src/models/messaging_initializer.js

@@ -3,7 +3,7 @@
 import { patchRecordMethods } from '@mail/model/model_core';
 import { insert, insertAndReplace } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_initializer/messaging_initializer';
+import '@mail/models/messaging_initializer';
 
 patchRecordMethods('MessagingInitializer', {
     /**

addons/im_livechat/static/src/models/messaging_notification_handler.js

@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_notification_handler/messaging_notification_handler';
+import '@mail/models/messaging_notification_handler';
 
 patchRecordMethods('MessagingNotificationHandler', {
     /**

addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js

@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/mobile_messaging_navbar_view/mobile_messaging_navbar_view';
+import '@mail/models/mobile_messaging_navbar_view';
 
 patchRecordMethods('MobileMessagingNavbarView', {
     /**

addons/im_livechat/static/src/models/notification_list_view.js

@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 import { replace } from '@mail/model/model_field_command';
-import '@mail/models/notification_list_view/notification_list_view'; // ensure the model definition is loaded before the patch
+import '@mail/models/notification_list_view'; // ensure the model definition is loaded before the patch
 
 patchRecordMethods('NotificationListView', {
     /**

addons/im_livechat/static/src/models/partner.js

@@ -4,7 +4,7 @@ import { addFields, addModelMethods, patchModelMethods } from '@mail/model/model
 import { attr } from '@mail/model/model_field';
 
 // ensure that the model definition is loaded before the patch
-import '@mail/models/partner/partner';
+import '@mail/models/partner';
 
 let nextPublicId = -1;
 

addons/im_livechat/static/src/models/thread.js

@@ -4,7 +4,7 @@ import { addFields, addRecordMethods, patchModelMethods, patchRecordMethods } fr
 import { one } from '@mail/model/model_field';
 import { clear, insert, link, replace, unlink } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/thread/thread';
+import '@mail/models/thread';
 
 addFields('Thread', {
     /**

addons/mail/__manifest__.py

@@ -81,7 +81,7 @@
             'mail/static/src/js/emojis.js',
             'mail/static/src/js/utils.js',
             'mail/static/src/model/*.js',
-            'mail/static/src/models/*/*.js',
+            'mail/static/src/models/*.js',
             'mail/static/src/public/*',
             'mail/static/src/services/messaging/messaging.js',
             'mail/static/src/utils/*/*.js',
@@ -124,7 +124,7 @@
             'mail/static/src/components/*/*.js',
             'mail/static/src/components/*/*.scss',
             'mail/static/src/model/*.js',
-            'mail/static/src/models/*/*.js',
+            'mail/static/src/models/*.js',
             'mail/static/src/services/*/*.js',
             'mail/static/src/webclient/commands/*.js',
             'mail/static/src/widgets/*/*.js',
@@ -151,7 +151,6 @@
             'mail/static/tests/webclient/commands/*.js',
             'mail/static/src/components/*/tests/*.js',
             'mail/static/src/model/tests/**/*.js',
-            'mail/static/src/models/*/tests/*.js',
             'mail/static/src/utils/*/tests/*.js',
             'mail/static/src/widgets/*/tests/*.js',
         ],

addons/mail/static/src/components/chat_window_manager/tests/chat_window_manager_tests.js

@@ -234,7 +234,7 @@ QUnit.test('open chat from "new message" chat window should open chat in place o
     /**
      * InnerWith computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -868,7 +868,7 @@ QUnit.test('focus next visible chat window when closing current chat window with
     /**
      * computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1062,7 +1062,7 @@ QUnit.test('open 2 different chat windows: enough screen width [REQUIRE FOCUS]',
     /**
      * computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1280,7 +1280,7 @@ QUnit.test('open 2 folded chat windows: check shift operations are available', a
     /**
      * computation uses following info:
      * ([mocked] global window width: 900px)
-     * (others: @see `mail/static/src/models/chat_window_manager/chat_window_manager.js:visual`)
+     * (others: @see `mail/static/src/models/chat_window_manager.js:visual`)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1406,7 +1406,7 @@ QUnit.test('open 3 different chat windows: not enough screen width', async funct
     /**
      * computation uses following info:
      * ([mocked] global window width: 900px)
-     * (others: @see `mail/static/src/models/chat_window_manager/chat_window_manager.js:visual`)
+     * (others: @see `mail/static/src/models/chat_window_manager.js:visual`)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1665,7 +1665,7 @@ QUnit.test('chat window: TAB cycle with 3 open chat windows [REQUIRE FOCUS]', as
     /**
      * InnerWith computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -2064,7 +2064,7 @@ QUnit.test('chat window does not fetch messages if hidden', async function (asse
     /**
      * computation uses following info:
      * ([mocked] global window width: 900px)
-     * (others: @see `mail/static/src/models/chat_window_manager/chat_window_manager.js:visual`)
+     * (others: @see `mail/static/src/models/chat_window_manager.js:visual`)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px