diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index d1b22b3b3a7..88ca5a7bb82 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -68,7 +68,7 @@ Help your customers with this chat, and analyse their feedback. 'im_livechat/static/src/chat_window/**/*', 'im_livechat/static/src/composer/**/*', 'im_livechat/static/src/core/**/*', - 'im_livechat/static/src/discuss/**/*', + 'im_livechat/static/src/discuss_app/**/*', 'im_livechat/static/src/messaging_menu/**/*', 'im_livechat/static/src/web/**/*', 'im_livechat/static/src/scss/im_livechat_history.scss', diff --git a/addons/im_livechat/static/src/discuss/sidebar_patch.js b/addons/im_livechat/static/src/discuss_app/sidebar_patch.js similarity index 83% rename from addons/im_livechat/static/src/discuss/sidebar_patch.js rename to addons/im_livechat/static/src/discuss_app/sidebar_patch.js index 501df7c5656..1781faf78d6 100644 --- a/addons/im_livechat/static/src/discuss/sidebar_patch.js +++ b/addons/im_livechat/static/src/discuss_app/sidebar_patch.js @@ -1,6 +1,6 @@ /** @odoo-module */ -import { Sidebar } from "@mail/web/discuss/sidebar"; +import { Sidebar } from "@mail/web/discuss_app/sidebar"; import { patch } from "@web/core/utils/patch"; patch(Sidebar.prototype, "im_livechat", { diff --git a/addons/im_livechat/static/src/discuss/sidebar_patch.xml b/addons/im_livechat/static/src/discuss_app/sidebar_patch.xml similarity index 100% rename from addons/im_livechat/static/src/discuss/sidebar_patch.xml rename to addons/im_livechat/static/src/discuss_app/sidebar_patch.xml diff --git a/addons/im_livechat/static/src/discuss/thread_icon_patch.xml b/addons/im_livechat/static/src/discuss_app/thread_icon_patch.xml similarity index 100% rename from addons/im_livechat/static/src/discuss/thread_icon_patch.xml rename to addons/im_livechat/static/src/discuss_app/thread_icon_patch.xml diff --git a/addons/mail/static/src/composer/navigable_list.js b/addons/mail/static/src/composer/navigable_list.js index 98e26268dce..120cfdc4491 100644 --- a/addons/mail/static/src/composer/navigable_list.js +++ b/addons/mail/static/src/composer/navigable_list.js @@ -3,7 +3,7 @@ import { useService } from "@web/core/utils/hooks"; import { getActiveHotkey } from "@web/core/hotkeys/hotkey_service"; import { usePosition } from "@web/core/position_hook"; -import { ImStatus } from "../discuss/im_status"; // Used in composer suggestion template +import { ImStatus } from "../discuss_app/im_status"; // Used in composer suggestion template import { Component, useEffect, useExternalListener, useRef, useState } from "@odoo/owl"; import { markEventHandled, isEventHandled } from "../utils/misc"; import { onExternalClick } from "@mail/utils/hooks"; diff --git a/addons/mail/static/src/core_ui/message.js b/addons/mail/static/src/core_ui/message.js index 75fe7f0c95a..eb00f109630 100644 --- a/addons/mail/static/src/core_ui/message.js +++ b/addons/mail/static/src/core_ui/message.js @@ -1,6 +1,6 @@ /* @odoo-module */ -import { ImStatus } from "@mail/discuss/im_status"; +import { ImStatus } from "@mail/discuss_app/im_status"; import { AttachmentList } from "@mail/attachments/attachment_list"; import { MessageInReply } from "./message_in_reply"; import { isEventHandled, markEventHandled } from "@mail/utils/misc"; diff --git a/addons/mail/static/src/discuss/autoresize_input.js b/addons/mail/static/src/discuss_app/autoresize_input.js similarity index 100% rename from addons/mail/static/src/discuss/autoresize_input.js rename to addons/mail/static/src/discuss_app/autoresize_input.js diff --git a/addons/mail/static/src/discuss/autoresize_input.scss b/addons/mail/static/src/discuss_app/autoresize_input.scss similarity index 100% rename from addons/mail/static/src/discuss/autoresize_input.scss rename to addons/mail/static/src/discuss_app/autoresize_input.scss diff --git a/addons/mail/static/src/discuss/autoresize_input.xml b/addons/mail/static/src/discuss_app/autoresize_input.xml similarity index 100% rename from addons/mail/static/src/discuss/autoresize_input.xml rename to addons/mail/static/src/discuss_app/autoresize_input.xml diff --git a/addons/mail/static/src/discuss/channel_invitation.js b/addons/mail/static/src/discuss_app/channel_invitation.js similarity index 100% rename from addons/mail/static/src/discuss/channel_invitation.js rename to addons/mail/static/src/discuss_app/channel_invitation.js diff --git a/addons/mail/static/src/discuss/channel_invitation.scss b/addons/mail/static/src/discuss_app/channel_invitation.scss similarity index 100% rename from addons/mail/static/src/discuss/channel_invitation.scss rename to addons/mail/static/src/discuss_app/channel_invitation.scss diff --git a/addons/mail/static/src/discuss/channel_invitation.xml b/addons/mail/static/src/discuss_app/channel_invitation.xml similarity index 100% rename from addons/mail/static/src/discuss/channel_invitation.xml rename to addons/mail/static/src/discuss_app/channel_invitation.xml diff --git a/addons/mail/static/src/discuss/channel_member_list.js b/addons/mail/static/src/discuss_app/channel_member_list.js similarity index 100% rename from addons/mail/static/src/discuss/channel_member_list.js rename to addons/mail/static/src/discuss_app/channel_member_list.js diff --git a/addons/mail/static/src/discuss/channel_member_list.scss b/addons/mail/static/src/discuss_app/channel_member_list.scss similarity index 100% rename from addons/mail/static/src/discuss/channel_member_list.scss rename to addons/mail/static/src/discuss_app/channel_member_list.scss diff --git a/addons/mail/static/src/discuss/channel_member_list.xml b/addons/mail/static/src/discuss_app/channel_member_list.xml similarity index 100% rename from addons/mail/static/src/discuss/channel_member_list.xml rename to addons/mail/static/src/discuss_app/channel_member_list.xml diff --git a/addons/mail/static/src/discuss/channel_selector.js b/addons/mail/static/src/discuss_app/channel_selector.js similarity index 100% rename from addons/mail/static/src/discuss/channel_selector.js rename to addons/mail/static/src/discuss_app/channel_selector.js diff --git a/addons/mail/static/src/discuss/channel_selector.scss b/addons/mail/static/src/discuss_app/channel_selector.scss similarity index 100% rename from addons/mail/static/src/discuss/channel_selector.scss rename to addons/mail/static/src/discuss_app/channel_selector.scss diff --git a/addons/mail/static/src/discuss/channel_selector.xml b/addons/mail/static/src/discuss_app/channel_selector.xml similarity index 100% rename from addons/mail/static/src/discuss/channel_selector.xml rename to addons/mail/static/src/discuss_app/channel_selector.xml diff --git a/addons/mail/static/src/discuss/discuss.js b/addons/mail/static/src/discuss_app/discuss.js similarity index 99% rename from addons/mail/static/src/discuss/discuss.js rename to addons/mail/static/src/discuss_app/discuss.js index 506d82e30a5..1db040075e0 100644 --- a/addons/mail/static/src/discuss/discuss.js +++ b/addons/mail/static/src/discuss_app/discuss.js @@ -2,7 +2,7 @@ import { AutoresizeInput } from "./autoresize_input"; import { Thread } from "../core_ui/thread"; -import { ThreadIcon } from "../discuss/thread_icon"; +import { ThreadIcon } from "./thread_icon"; import { useMessaging, useStore } from "../core/messaging_hook"; import { useRtc } from "../rtc/rtc_hook"; import { useMessageEdition, useMessageHighlight, useMessageToReplyTo } from "@mail/utils/hooks"; diff --git a/addons/mail/static/src/discuss/discuss.scss b/addons/mail/static/src/discuss_app/discuss.scss similarity index 100% rename from addons/mail/static/src/discuss/discuss.scss rename to addons/mail/static/src/discuss_app/discuss.scss diff --git a/addons/mail/static/src/discuss/discuss.xml b/addons/mail/static/src/discuss_app/discuss.xml similarity index 100% rename from addons/mail/static/src/discuss/discuss.xml rename to addons/mail/static/src/discuss_app/discuss.xml diff --git a/addons/mail/static/src/discuss/discuss_client_action.js b/addons/mail/static/src/discuss_app/discuss_client_action.js similarity index 100% rename from addons/mail/static/src/discuss/discuss_client_action.js rename to addons/mail/static/src/discuss_app/discuss_client_action.js diff --git a/addons/mail/static/src/discuss/discuss_client_action.xml b/addons/mail/static/src/discuss_app/discuss_client_action.xml similarity index 100% rename from addons/mail/static/src/discuss/discuss_client_action.xml rename to addons/mail/static/src/discuss_app/discuss_client_action.xml diff --git a/addons/mail/static/src/discuss/im_status.js b/addons/mail/static/src/discuss_app/im_status.js similarity index 100% rename from addons/mail/static/src/discuss/im_status.js rename to addons/mail/static/src/discuss_app/im_status.js diff --git a/addons/mail/static/src/discuss/im_status.scss b/addons/mail/static/src/discuss_app/im_status.scss similarity index 100% rename from addons/mail/static/src/discuss/im_status.scss rename to addons/mail/static/src/discuss_app/im_status.scss diff --git a/addons/mail/static/src/discuss/im_status.xml b/addons/mail/static/src/discuss_app/im_status.xml similarity index 100% rename from addons/mail/static/src/discuss/im_status.xml rename to addons/mail/static/src/discuss_app/im_status.xml diff --git a/addons/mail/static/src/discuss/pinned_messages_panel.js b/addons/mail/static/src/discuss_app/pinned_messages_panel.js similarity index 100% rename from addons/mail/static/src/discuss/pinned_messages_panel.js rename to addons/mail/static/src/discuss_app/pinned_messages_panel.js diff --git a/addons/mail/static/src/discuss/pinned_messages_panel.scss b/addons/mail/static/src/discuss_app/pinned_messages_panel.scss similarity index 100% rename from addons/mail/static/src/discuss/pinned_messages_panel.scss rename to addons/mail/static/src/discuss_app/pinned_messages_panel.scss diff --git a/addons/mail/static/src/discuss/pinned_messages_panel.xml b/addons/mail/static/src/discuss_app/pinned_messages_panel.xml similarity index 100% rename from addons/mail/static/src/discuss/pinned_messages_panel.xml rename to addons/mail/static/src/discuss_app/pinned_messages_panel.xml diff --git a/addons/mail/static/src/discuss/thread_icon.js b/addons/mail/static/src/discuss_app/thread_icon.js similarity index 100% rename from addons/mail/static/src/discuss/thread_icon.js rename to addons/mail/static/src/discuss_app/thread_icon.js diff --git a/addons/mail/static/src/discuss/thread_icon.xml b/addons/mail/static/src/discuss_app/thread_icon.xml similarity index 100% rename from addons/mail/static/src/discuss/thread_icon.xml rename to addons/mail/static/src/discuss_app/thread_icon.xml diff --git a/addons/mail/static/src/public/discuss_public.js b/addons/mail/static/src/public/discuss_public.js index cd4b28082f1..4a2677a0587 100644 --- a/addons/mail/static/src/public/discuss_public.js +++ b/addons/mail/static/src/public/discuss_public.js @@ -3,7 +3,7 @@ import { Component, useEffect, useState } from "@odoo/owl"; import { browser } from "@web/core/browser/browser"; import { WelcomePage } from "./welcome_page"; -import { Discuss } from "./../discuss/discuss"; +import { Discuss } from "./../discuss_app/discuss"; import { useMessaging, useStore } from "../core/messaging_hook"; import { useService } from "@web/core/utils/hooks"; diff --git a/addons/mail/static/src/web/chat_window/chat_window.js b/addons/mail/static/src/web/chat_window/chat_window.js index aa2ef94e754..296380dc689 100644 --- a/addons/mail/static/src/web/chat_window/chat_window.js +++ b/addons/mail/static/src/web/chat_window/chat_window.js @@ -10,12 +10,12 @@ import { Component, useChildSubEnv, useRef, useState } from "@odoo/owl"; import { useService } from "@web/core/utils/hooks"; import { localization } from "@web/core/l10n/localization"; import { CallSettings } from "@mail/rtc/call_settings"; -import { ChannelMemberList } from "@mail/discuss/channel_member_list"; -import { ThreadIcon } from "@mail/discuss/thread_icon"; -import { ChannelInvitation } from "@mail/discuss/channel_invitation"; +import { ChannelMemberList } from "@mail/discuss_app/channel_member_list"; +import { ThreadIcon } from "@mail/discuss_app/thread_icon"; +import { ChannelInvitation } from "@mail/discuss_app/channel_invitation"; import { isEventHandled } from "@mail/utils/misc"; -import { ChannelSelector } from "@mail/discuss/channel_selector"; -import { PinnedMessagesPanel } from "@mail/discuss/pinned_messages_panel"; +import { ChannelSelector } from "@mail/discuss_app/channel_selector"; +import { PinnedMessagesPanel } from "@mail/discuss_app/pinned_messages_panel"; import { _t } from "@web/core/l10n/translation"; /** diff --git a/addons/mail/static/src/web/discuss/context_service.js b/addons/mail/static/src/web/discuss_app/context_service.js similarity index 100% rename from addons/mail/static/src/web/discuss/context_service.js rename to addons/mail/static/src/web/discuss_app/context_service.js diff --git a/addons/mail/static/src/web/discuss/discuss_patch.js b/addons/mail/static/src/web/discuss_app/discuss_patch.js similarity index 68% rename from addons/mail/static/src/web/discuss/discuss_patch.js rename to addons/mail/static/src/web/discuss_app/discuss_patch.js index 5fd2f3bfab8..7e8bcbd5482 100644 --- a/addons/mail/static/src/web/discuss/discuss_patch.js +++ b/addons/mail/static/src/web/discuss_app/discuss_patch.js @@ -1,8 +1,8 @@ /** @odoo-module **/ import { patch } from "@web/core/utils/patch"; -import { Sidebar } from "@mail/web/discuss/sidebar"; -import { Discuss } from "@mail/discuss/discuss"; +import { Sidebar } from "@mail/web/discuss_app/sidebar"; +import { Discuss } from "@mail/discuss_app/discuss"; import { MessagingMenu } from "@mail/web/messaging_menu/messaging_menu"; patch(Discuss, "mail/web", { diff --git a/addons/mail/static/src/web/discuss/discuss_patch.xml b/addons/mail/static/src/web/discuss_app/discuss_patch.xml similarity index 100% rename from addons/mail/static/src/web/discuss/discuss_patch.xml rename to addons/mail/static/src/web/discuss_app/discuss_patch.xml diff --git a/addons/mail/static/src/web/discuss/sidebar.js b/addons/mail/static/src/web/discuss_app/sidebar.js similarity index 96% rename from addons/mail/static/src/web/discuss/sidebar.js rename to addons/mail/static/src/web/discuss_app/sidebar.js index e84c9e5938c..b3824a2dedc 100644 --- a/addons/mail/static/src/web/discuss/sidebar.js +++ b/addons/mail/static/src/web/discuss_app/sidebar.js @@ -1,9 +1,9 @@ /* @odoo-module */ import { useMessaging, useStore } from "@mail/core/messaging_hook"; -import { ThreadIcon } from "@mail/discuss/thread_icon"; -import { ChannelSelector } from "@mail/discuss/channel_selector"; -import { ImStatus } from "@mail/discuss/im_status"; +import { ThreadIcon } from "@mail/discuss_app/thread_icon"; +import { ChannelSelector } from "@mail/discuss_app/channel_selector"; +import { ImStatus } from "@mail/discuss_app/im_status"; import { useService } from "@web/core/utils/hooks"; import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog"; import { onExternalClick } from "@mail/utils/hooks"; diff --git a/addons/mail/static/src/web/discuss/sidebar.scss b/addons/mail/static/src/web/discuss_app/sidebar.scss similarity index 100% rename from addons/mail/static/src/web/discuss/sidebar.scss rename to addons/mail/static/src/web/discuss_app/sidebar.scss diff --git a/addons/mail/static/src/web/discuss/sidebar.xml b/addons/mail/static/src/web/discuss_app/sidebar.xml similarity index 100% rename from addons/mail/static/src/web/discuss/sidebar.xml rename to addons/mail/static/src/web/discuss_app/sidebar.xml diff --git a/addons/mail/static/src/web/messaging_menu/messaging_menu.js b/addons/mail/static/src/web/messaging_menu/messaging_menu.js index 53193e2106a..477d9d86611 100644 --- a/addons/mail/static/src/web/messaging_menu/messaging_menu.js +++ b/addons/mail/static/src/web/messaging_menu/messaging_menu.js @@ -1,10 +1,10 @@ /* @odoo-module */ -import { ImStatus } from "@mail/discuss/im_status"; +import { ImStatus } from "@mail/discuss_app/im_status"; import { useMessaging, useStore } from "@mail/core/messaging_hook"; import { NotificationItem } from "@mail/web/messaging_menu/notification_item"; -import { ChannelSelector } from "@mail/discuss/channel_selector"; +import { ChannelSelector } from "@mail/discuss_app/channel_selector"; import { createLocalId } from "@mail/utils/misc"; import { onExternalClick } from "@mail/utils/hooks"; import { Component, useState } from "@odoo/owl"; diff --git a/addons/mail/static/src/web/messaging_menu/notification_item.js b/addons/mail/static/src/web/messaging_menu/notification_item.js index 4c3ba754b04..c6737df3758 100644 --- a/addons/mail/static/src/web/messaging_menu/notification_item.js +++ b/addons/mail/static/src/web/messaging_menu/notification_item.js @@ -1,7 +1,7 @@ /* @odoo-module */ import { Component, useRef } from "@odoo/owl"; -import { ImStatus } from "@mail/discuss/im_status"; +import { ImStatus } from "@mail/discuss_app/im_status"; import { RelativeTime } from "@mail/core_ui/relative_time"; import { ActionSwiper } from "@web/core/action_swiper/action_swiper"; diff --git a/addons/mail/static/tests/discuss/channel_invitation_tests.js b/addons/mail/static/tests/discuss_app/channel_invitation_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/channel_invitation_tests.js rename to addons/mail/static/tests/discuss_app/channel_invitation_tests.js diff --git a/addons/mail/static/tests/discuss/channel_member_list_tests.js b/addons/mail/static/tests/discuss_app/channel_member_list_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/channel_member_list_tests.js rename to addons/mail/static/tests/discuss_app/channel_member_list_tests.js diff --git a/addons/mail/static/tests/discuss/discuss_tests.js b/addons/mail/static/tests/discuss_app/discuss_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/discuss_tests.js rename to addons/mail/static/tests/discuss_app/discuss_tests.js diff --git a/addons/mail/static/tests/discuss/im_status_tests.js b/addons/mail/static/tests/discuss_app/im_status_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/im_status_tests.js rename to addons/mail/static/tests/discuss_app/im_status_tests.js diff --git a/addons/mail/static/tests/discuss/inbox_tests.js b/addons/mail/static/tests/discuss_app/inbox_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/inbox_tests.js rename to addons/mail/static/tests/discuss_app/inbox_tests.js diff --git a/addons/mail/static/tests/discuss/jump_to_present_tests.js b/addons/mail/static/tests/discuss_app/jump_to_present_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/jump_to_present_tests.js rename to addons/mail/static/tests/discuss_app/jump_to_present_tests.js diff --git a/addons/mail/static/tests/discuss/pinned_messages_tests.js b/addons/mail/static/tests/discuss_app/pinned_messages_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/pinned_messages_tests.js rename to addons/mail/static/tests/discuss_app/pinned_messages_tests.js diff --git a/addons/mail/static/tests/discuss/sidebar_tests.js b/addons/mail/static/tests/discuss_app/sidebar_tests.js similarity index 100% rename from addons/mail/static/tests/discuss/sidebar_tests.js rename to addons/mail/static/tests/discuss_app/sidebar_tests.js diff --git a/addons/mail/static/tests/helpers/webclient_setup.js b/addons/mail/static/tests/helpers/webclient_setup.js index f2bb9c30be5..e8164ab104f 100644 --- a/addons/mail/static/tests/helpers/webclient_setup.js +++ b/addons/mail/static/tests/helpers/webclient_setup.js @@ -30,13 +30,13 @@ import { threadService } from "@mail/core/thread_service"; import { messageService } from "@mail/core/message_service"; import { activityService } from "@mail/web/activity/activity_service"; import { outOfFocusService } from "@mail/core/out_of_focus_service"; -import { DiscussClientAction } from "@mail/discuss/discuss_client_action"; +import { DiscussClientAction } from "@mail/discuss_app/discuss_client_action"; import { personaService } from "@mail/core/persona_service"; import { attachmentService } from "@mail/attachments/attachment_service"; import { notificationPermissionService } from "@mail/core/notification_permission_service"; import { session } from "@web/session"; import { channelMemberService } from "@mail/core/channel_member_service"; -import { contextService } from "@mail/web/discuss/context_service"; +import { contextService } from "@mail/web/discuss_app/context_service"; const ROUTES_TO_IGNORE = [ "/web/webclient/load_menus", diff --git a/addons/website_livechat/static/src/core_ui/thread_patch.js b/addons/website_livechat/static/src/core_ui/thread_patch.js index b539cae9e67..c49e1ae35ba 100644 --- a/addons/website_livechat/static/src/core_ui/thread_patch.js +++ b/addons/website_livechat/static/src/core_ui/thread_patch.js @@ -1,6 +1,6 @@ /* @odoo-module */ import { Thread } from "@mail/core_ui/thread"; -import { ImStatus } from "@mail/discuss/im_status"; +import { ImStatus } from "@mail/discuss_app/im_status"; Object.assign(Thread.components, { ImStatus });