From b133f93213ff83c44bbdfcba4ea1c1739ce84625 Mon Sep 17 00:00:00 2001 From: "Michael (mcm)" Date: Fri, 25 Feb 2022 09:26:29 +0000 Subject: [PATCH] [REF] mail, im_livechat: use LegacyComponent This commit replaces Component by LegacyComponent when the component uses removed features from owl 1 like getting its `el` or `trigger` an event. Part-of: odoo/odoo#85389 --- addons/im_livechat/__manifest__.py | 1 + addons/mail/static/src/components/activity/activity.js | 3 ++- .../activity_mark_done_popover/activity_mark_done_popover.js | 3 ++- .../static/src/components/attachment_card/attachment_card.js | 3 ++- .../static/src/components/attachment_image/attachment_image.js | 3 ++- addons/mail/static/src/components/chatter/chatter.js | 3 ++- addons/mail/static/src/components/discuss/discuss.js | 3 ++- addons/mail/static/src/components/emoji_list/emoji_list.js | 3 ++- .../static/src/components/rtc_layout_menu/rtc_layout_menu.js | 3 ++- .../static/src/components/rtc_option_list/rtc_option_list.js | 3 ++- 10 files changed, 19 insertions(+), 9 deletions(-) diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index 16164395de6..6cb1c7185e0 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -82,6 +82,7 @@ Help your customers with this chat, and analyse their feedback. 'web/static/src/owl2_compatibility/*.js', 'web/static/src/legacy/js/promise_extension.js', 'web/static/src/boot.js', + 'web/static/src/legacy/legacy_component.js', 'web/static/src/core/assets.js', 'web/static/src/core/browser/browser.js', 'web/static/src/core/browser/feature_detection.js', diff --git a/addons/mail/static/src/components/activity/activity.js b/addons/mail/static/src/components/activity/activity.js index 4996297bb7d..badc03cb29d 100644 --- a/addons/mail/static/src/components/activity/activity.js +++ b/addons/mail/static/src/components/activity/activity.js @@ -3,10 +3,11 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import Popover from "web.Popover"; +import { LegacyComponent } from "@web/legacy/legacy_component"; const { Component, markup } = owl; -export class Activity extends Component { +export class Activity extends LegacyComponent { get noteAsMarkup() { return markup(this.activityView.activity.note); 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 bab0d14509c..920c689f413 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 @@ -3,10 +3,11 @@ 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 { registerMessagingComponent } from '@mail/utils/messaging_component'; +import { LegacyComponent } from "@web/legacy/legacy_component"; const { Component, onMounted, useRef } = owl; -export class ActivityMarkDonePopover extends Component { +export class ActivityMarkDonePopover extends LegacyComponent { /** * @override diff --git a/addons/mail/static/src/components/attachment_card/attachment_card.js b/addons/mail/static/src/components/attachment_card/attachment_card.js index f770de215a6..f665fe283e5 100644 --- a/addons/mail/static/src/components/attachment_card/attachment_card.js +++ b/addons/mail/static/src/components/attachment_card/attachment_card.js @@ -2,10 +2,11 @@ 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"; const { Component } = owl; -export class AttachmentCard extends Component { +export class AttachmentCard extends LegacyComponent { /** * @override diff --git a/addons/mail/static/src/components/attachment_image/attachment_image.js b/addons/mail/static/src/components/attachment_image/attachment_image.js index de60930afbf..c29d34a942c 100644 --- a/addons/mail/static/src/components/attachment_image/attachment_image.js +++ b/addons/mail/static/src/components/attachment_image/attachment_image.js @@ -2,10 +2,11 @@ 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"; const { Component } = owl; -export class AttachmentImage extends Component { +export class AttachmentImage extends LegacyComponent { /** * @override diff --git a/addons/mail/static/src/components/chatter/chatter.js b/addons/mail/static/src/components/chatter/chatter.js index 5cd3dcfbfa6..3d01c8fa490 100644 --- a/addons/mail/static/src/components/chatter/chatter.js +++ b/addons/mail/static/src/components/chatter/chatter.js @@ -3,10 +3,11 @@ 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 { Component, useRef } = owl; -export class Chatter extends Component { +export class Chatter extends LegacyComponent { /** * @override diff --git a/addons/mail/static/src/components/discuss/discuss.js b/addons/mail/static/src/components/discuss/discuss.js index 732d0f311d3..b2db1c4e931 100644 --- a/addons/mail/static/src/components/discuss/discuss.js +++ b/addons/mail/static/src/components/discuss/discuss.js @@ -2,10 +2,11 @@ import { useUpdate } from '@mail/component_hooks/use_update/use_update'; import { registerMessagingComponent } from '@mail/utils/messaging_component'; +import { LegacyComponent } from '@web/legacy/legacy_component'; const { Component } = owl; -export class Discuss extends Component { +export class Discuss extends LegacyComponent { /** * @override 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 0cb5ea9579b..f050cef3e1c 100644 --- a/addons/mail/static/src/components/emoji_list/emoji_list.js +++ b/addons/mail/static/src/components/emoji_list/emoji_list.js @@ -3,10 +3,11 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { useUpdate } from '@mail/component_hooks/use_update/use_update'; import emojis from '@mail/js/emojis'; +import { LegacyComponent } from '@web/legacy/legacy_component'; const { Component } = owl; -export class EmojiList extends Component { +export class EmojiList extends LegacyComponent { /** * @override 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 7a06b0b0ac0..4951b356c06 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 @@ -2,10 +2,11 @@ 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"; const { Component } = owl; -export class RtcLayoutMenu extends Component { +export class RtcLayoutMenu extends LegacyComponent { /** * @override 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 595d4c328c6..90365e5db73 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 @@ -2,10 +2,11 @@ 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"; const { Component } = owl; -export class RtcOptionList extends Component { +export class RtcOptionList extends LegacyComponent { /** * @override