From db63ff22590f0a8e8b223d04499a74811ca31146 Mon Sep 17 00:00:00 2001 From: Julien Mougenot Date: Thu, 13 Jan 2022 15:28:37 +0000 Subject: [PATCH] [REF] web: Owl imports adaptation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the next version of Owl, all exported terms are directly available from the top level `owl` object. This commit aims to adapt existing imports to this new system. This is done by importing any Owl property used in files at the top, right after the `import` or `require` statements. closes odoo/odoo#82736 Related: odoo/enterprise#23609 Signed-off-by: Géry Debongnie --- .../static/src/js/account_resequence_field.js | 4 +- .../static/src/js/grouped_view_widget.js | 4 +- addons/account/static/src/js/tax_totals.js | 4 +- .../tests/base_automation_error_dialog.js | 5 +- .../js/services/assets_watchdog_service.js | 4 +- addons/bus/static/tests/bus_tests.js | 3 +- .../services/calendar_notification_service.js | 4 +- .../standalone_m2o_avatar_employee_tests.js | 3 +- .../static/src/dashboard/time_off_card.js | 6 +- .../src/dashboard/time_off_dashboard.js | 4 +- addons/im_livechat/__manifest__.py | 1 + .../use_component_to_model.js | 2 +- .../use_drag_visible_dropzone.js | 2 +- .../component_hooks/use_models/use_models.js | 2 +- .../use_ref_to_model/use_ref_to_model.js | 2 +- .../use_rendered_values.js | 3 +- .../use_should_update_based_on_props.js | 3 +- .../component_hooks/use_update/use_update.js | 2 +- .../use_update_to_model.js | 2 +- .../activity_mark_done_popover.js | 3 +- .../attachment_card/attachment_card.js | 1 + .../attachment_delete_confirm_dialog.js | 4 +- .../attachment_image/attachment_image.js | 1 + .../attachment_viewer/attachment_viewer.js | 3 +- .../autocomplete_input/autocomplete_input.js | 3 +- .../src/components/chat_window/chat_window.js | 3 +- .../chat_window_hidden_menu.js | 3 +- .../static/src/components/chatter/chatter.js | 3 +- .../chatter_container/chatter_container.js | 3 +- .../composer_suggested_recipient.js | 3 +- .../composer_suggested_recipient_list.js | 3 +- .../composer_text_input.js | 3 +- .../static/src/components/dialog/dialog.js | 3 +- .../dialog_manager/dialog_manager.js | 3 +- .../static/src/components/discuss/discuss.js | 3 +- .../discuss_sidebar/discuss_sidebar.js | 3 +- .../components/follow_button/follow_button.js | 3 +- .../follower_list_menu/follower_list_menu.js | 3 +- .../components/media_preview/media_preview.js | 4 +- .../static/src/components/message/message.js | 3 +- .../components/message_list/message_list.js | 3 +- .../message_reaction_group.js | 3 +- .../messaging_menu/messaging_menu.js | 3 +- .../messaging_menu_container.js | 2 +- .../notification_group/notification_group.js | 3 +- .../notification_list/notification_list.js | 3 +- .../rtc_activity_notice_container.js | 2 +- .../rtc_call_participant_card.js | 3 +- .../rtc_call_viewer/rtc_call_viewer.js | 3 +- .../rtc_configuration_menu.js | 3 +- .../thread_needaction_preview.js | 3 +- .../thread_preview/thread_preview.js | 3 +- .../components/welcome_view/welcome_view.js | 4 +- addons/mail/static/src/js/core/translation.js | 6 +- addons/mail/static/src/js/utils.js | 4 +- .../js/views/activity/activity_renderer.js | 2 +- .../src/models/composer_view/composer_view.js | 6 +- .../mail/static/src/models/discuss/discuss.js | 8 +- .../static/src/models/messaging/messaging.js | 4 +- .../messaging_notification_handler.js | 3 +- .../src/models/popover_view/popover_view.js | 4 +- .../static/src/public/discuss_public_boot.js | 28 ++--- addons/mail/static/src/public/root_widget.js | 2 + .../static/src/utils/messaging_component.js | 2 +- addons/mail/static/src/utils/test_utils.js | 13 +-- .../src/webclient/commands/mail_providers.js | 3 +- .../widgets/form_renderer/form_renderer.js | 6 +- .../tours/mail_full_composer_test_tour.js | 4 +- addons/point_of_sale/static/src/js/Chrome.js | 4 +- .../js/ChromeWidgets/ClientScreenButton.js | 3 +- .../src/js/ChromeWidgets/DebugWidget.js | 4 +- .../src/js/ChromeWidgets/ProxyStatus.js | 3 +- .../src/js/ChromeWidgets/SyncNotification.js | 3 +- addons/point_of_sale/static/src/js/Gui.js | 6 +- .../src/js/Misc/AbstractReceiptScreen.js | 3 +- .../static/src/js/Misc/Draggable.js | 3 +- .../static/src/js/Misc/NumberBuffer.js | 4 +- .../static/src/js/Misc/SearchBar.js | 3 +- .../static/src/js/PopupControllerMixin.js | 3 +- .../src/js/Popups/AbstractAwaitablePopup.js | 5 +- .../static/src/js/Popups/CashMovePopup.js | 6 +- .../static/src/js/Popups/CashOpeningPopup.js | 2 +- .../static/src/js/Popups/ClosePosPopup.js | 3 +- .../static/src/js/Popups/EditListPopup.js | 3 +- .../static/src/js/Popups/MoneyDetailsPopup.js | 3 +- .../static/src/js/Popups/NumberPopup.js | 3 +- .../src/js/Popups/ProductConfiguratorPopup.js | 3 +- .../static/src/js/Popups/SelectionPopup.js | 3 +- .../static/src/js/Popups/TextAreaPopup.js | 3 +- .../static/src/js/Popups/TextInputPopup.js | 3 +- .../ClientListScreen/ClientListScreen.js | 5 +- .../js/Screens/ProductScreen/OrderWidget.js | 3 +- .../js/Screens/ProductScreen/ProductScreen.js | 3 +- .../Screens/ProductScreen/ProductsWidget.js | 3 +- .../ProductsWidgetControlPanel.js | 4 +- .../js/Screens/ReceiptScreen/ReceiptScreen.js | 2 +- .../src/js/Screens/ScaleScreen/ScaleScreen.js | 3 +- .../js/Screens/TicketScreen/TicketScreen.js | 2 +- .../static/src/js/chrome_adapter.js | 13 ++- .../static/src/js/custom_hooks.js | 3 +- addons/point_of_sale/static/src/js/main.js | 8 +- addons/point_of_sale/static/src/js/models.js | 3 +- addons/point_of_sale/static/src/js/utils.js | 3 +- .../static/tests/unit/helpers/test_env.js | 4 +- .../static/tests/unit/test_ChromeWidgets.js | 3 +- .../static/tests/unit/test_NumberBuffer.js | 4 +- .../static/tests/unit/test_PaymentScreen.js | 4 +- .../static/tests/unit/test_ProductScreen.js | 4 +- .../static/tests/unit/test_popups.js | 3 +- .../static/src/js/GiftCardPopup.js | 3 +- .../pos_hr/static/src/js/HeaderLockButton.js | 1 + .../static/src/js/PaymentTransactionPopup.js | 3 +- .../static/src/js/Resizeable.js | 3 +- .../src/js/Screens/FloorScreen/EditBar.js | 3 +- .../js/Screens/FloorScreen/EditableTable.js | 3 +- .../src/js/Screens/FloorScreen/FloorScreen.js | 4 +- .../SplitBillScreen/SplitBillScreen.js | 3 +- .../static/src/js/Screens/TicketScreen.js | 3 +- .../static/src/js/Screens/TipScreen.js | 3 +- .../static/tests/unit/test_FloorScreen.js | 4 +- .../MobileSaleOrderManagementScreen.js | 3 +- .../OrderManagementScreen/SaleOrderFetcher.js | 3 +- .../js/OrderManagementScreen/SaleOrderList.js | 3 +- .../SaleOrderManagementControlPanel.js | 3 +- .../SaleOrderManagementScreen.js | 3 +- .../src/js/right_panel/project_right_panel.js | 5 +- .../src/js/right_panel/project_utils.js | 5 +- .../snailmail_error_dialog.js | 1 - addons/web/__manifest__.py | 1 + addons/web/static/src/core/assets.js | 17 +-- .../src/core/commands/command_palette.js | 5 +- .../core/commands/command_palette_dialog.js | 3 +- .../src/core/commands/command_service.js | 3 +- .../static/src/core/datepicker/datepicker.js | 3 +- .../static/src/core/debug/debug_context.js | 2 +- .../core/debug/profiling/profiling_service.js | 7 +- addons/web/static/src/core/dialog/dialog.js | 5 +- .../src/core/dialog/dialog_container.js | 4 +- .../static/src/core/dialog/dialog_service.js | 3 +- .../web/static/src/core/dropdown/dropdown.js | 13 ++- .../static/src/core/dropdown/dropdown_item.js | 1 + .../core/dropdown/dropdown_navigation_hook.js | 5 +- .../src/core/effects/effect_container.js | 4 +- .../static/src/core/effects/effect_service.js | 4 +- .../static/src/core/effects/rainbow_man.js | 4 +- .../static/src/core/errors/error_dialogs.js | 3 +- .../static/src/core/file_input/file_input.js | 3 +- .../src/core/l10n/localization_service.js | 4 +- .../src/core/main_components_container.js | 4 +- .../src/core/notifications/notification.js | 18 +-- .../notifications/notification_container.js | 4 +- .../notifications/notification_service.js | 2 +- addons/web/static/src/core/pager/pager.js | 3 +- .../src/core/popover/popover_container.js | 4 +- .../static/src/core/popover/popover_hook.js | 2 +- .../src/core/popover/popover_service.js | 2 +- .../static/src/core/position/position_hook.js | 5 +- addons/web/static/src/core/registry.js | 3 +- addons/web/static/src/core/ui/block_ui.js | 4 +- addons/web/static/src/core/ui/ui_service.js | 4 +- .../web/static/src/core/utils/components.js | 6 +- addons/web/static/src/core/utils/hooks.js | 2 +- addons/web/static/src/env.js | 10 +- addons/web/static/src/fields/fields.js | 10 +- .../web/static/src/legacy/action_adapters.js | 8 +- addons/web/static/src/legacy/debug_manager.js | 3 +- .../src/legacy/js/chrome/abstract_action.js | 3 +- addons/web/static/src/legacy/js/common_env.js | 3 +- .../src/legacy/js/component_extension.js | 11 +- .../legacy/js/components/custom_file_input.js | 3 +- .../src/legacy/js/components/datepicker.js | 3 +- .../src/legacy/js/components/dropdown_menu.js | 3 +- .../js/components/dropdown_menu_item.js | 3 +- .../static/src/legacy/js/components/pager.js | 3 +- .../legacy/js/control_panel/control_panel.js | 3 +- .../js/control_panel/custom_favorite_item.js | 3 +- .../js/control_panel/custom_filter_item.js | 3 +- .../js/control_panel/custom_group_by_item.js | 3 +- .../legacy/js/control_panel/favorite_menu.js | 1 + .../src/legacy/js/control_panel/search_bar.js | 3 +- .../static/src/legacy/js/core/custom_hooks.js | 3 +- .../static/src/legacy/js/core/owl_dialog.js | 4 +- .../web/static/src/legacy/js/core/popover.js | 4 +- addons/web/static/src/legacy/js/core/utils.js | 6 +- .../legacy/js/fields/abstract_field_owl.js | 4 +- .../src/legacy/js/fields/field_registry.js | 5 +- .../legacy/js/fields/field_registry_owl.js | 4 +- .../src/legacy/js/fields/relational_fields.js | 3 +- addons/web/static/src/legacy/js/model.js | 3 +- .../static/src/legacy/js/owl_compatibility.js | 9 +- .../src/legacy/js/public/public_root.js | 8 +- .../legacy/js/views/abstract_controller.js | 9 +- .../src/legacy/js/views/abstract_renderer.js | 6 +- .../legacy/js/views/abstract_renderer_owl.js | 4 +- .../legacy/js/views/basic/basic_renderer.js | 6 +- .../src/legacy/js/views/basic/basic_view.js | 4 +- .../legacy/js/views/basic/widget_registry.js | 4 +- .../js/views/basic/widget_registry_owl.js | 4 +- .../legacy/js/views/graph/graph_renderer.js | 4 +- .../legacy/js/views/kanban/kanban_record.js | 4 +- .../legacy/js/views/pivot/pivot_renderer.js | 3 +- .../src/legacy/js/views/search_panel.js | 3 +- .../static/src/legacy/js/widgets/week_days.js | 5 +- .../src/legacy/legacy_client_actions.js | 6 +- addons/web/static/src/legacy/legacy_setup.js | 5 +- addons/web/static/src/legacy/legacy_views.js | 6 +- .../static/src/legacy/systray_menu_item.js | 4 +- addons/web/static/src/owl_next_adapter.js | 34 ++++++ .../favorite_menu/custom_favorite_item.js | 3 +- .../src/search/favorite_menu/favorite_menu.js | 3 +- .../search/filter_menu/custom_filter_item.js | 3 +- .../group_by_menu/custom_group_by_item.js | 3 +- addons/web/static/src/search/pager_hook.js | 2 +- .../src/search/search_bar/search_bar.js | 3 +- addons/web/static/src/search/search_model.js | 2 +- .../src/search/search_panel/search_panel.js | 3 +- .../src/search/with_search/with_search.js | 3 +- addons/web/static/src/start.js | 5 +- addons/web/static/src/views/debug_items.js | 4 +- .../static/src/views/graph/graph_renderer.js | 3 +- .../web/static/src/views/graph/graph_view.js | 3 +- addons/web/static/src/views/helpers/model.js | 4 +- .../web/static/src/views/helpers/view_hook.js | 6 +- .../web/static/src/views/onboarding_banner.js | 6 +- .../web/static/src/views/pivot/pivot_view.js | 3 +- addons/web/static/src/views/view.js | 4 +- .../src/webclient/actions/action_container.js | 4 +- .../src/webclient/actions/action_dialog.js | 4 +- .../src/webclient/actions/action_hook.js | 2 +- .../src/webclient/actions/action_service.js | 7 +- .../src/webclient/actions/client_actions.js | 5 +- .../src/webclient/clickbot/clickbot_loader.js | 2 +- .../web/static/src/webclient/debug_items.js | 4 +- .../web/static/src/webclient/navbar/navbar.js | 3 +- .../switch_company_menu.js | 3 +- addons/web/static/src/webclient/webclient.js | 3 +- .../web/static/tests/core/checkbox_tests.js | 3 +- .../core/commands/command_palette_tests.js | 3 +- .../core/commands/command_service_tests.js | 3 +- .../web/static/tests/core/datepicker_tests.js | 3 +- .../tests/core/debug/debug_manager_tests.js | 3 +- .../static/tests/core/dialog_service_tests.js | 4 +- addons/web/static/tests/core/dialog_tests.js | 51 ++++----- .../web/static/tests/core/dropdown_tests.js | 108 +++++++++--------- .../core/effects/effect_service_tests.js | 6 +- .../tests/core/errors/error_dialogs_tests.js | 17 +-- .../tests/core/errors/error_service_tests.js | 8 +- .../core/hotkeys/hotkey_service_tests.js | 3 +- .../tests/core/l10n/translation_tests.js | 12 +- .../core/main_components_container_tests.js | 4 +- .../tests/core/network/rpc_service_tests.js | 3 +- .../static/tests/core/orm_service_tests.js | 3 +- addons/web/static/tests/core/pager_tests.js | 4 +- .../tests/core/popover/popover_hook_tests.js | 3 +- .../core/popover/popover_service_tests.js | 3 +- .../static/tests/core/position_hook_tests.js | 4 +- .../static/tests/core/router_service_tests.js | 4 +- .../tests/core/scroller_service_tests.js | 14 +-- .../tests/core/tooltip/tooltip_hook_tests.js | 3 +- .../web/static/tests/core/ui_service_tests.js | 6 +- .../tests/core/utils/component_tests.js | 10 +- .../static/tests/core/utils/hooks_tests.js | 37 +++--- .../tests/legacy/component_extension_tests.js | 4 +- .../legacy/components/dropdown_menu_tests.js | 11 +- .../tests/legacy/core/owl_dialog_tests.js | 5 +- .../static/tests/legacy/core/popover_tests.js | 4 +- .../relational_fields/field_one2many_tests.js | 14 ++- .../static/tests/legacy/helpers/test_env.js | 8 +- .../tests/legacy/helpers/test_utils_create.js | 4 +- .../tests/legacy/helpers/test_utils_dom.js | 4 +- .../tests/legacy/helpers/test_utils_mock.js | 5 +- .../tests/legacy/owl_compatibility_tests.js | 3 +- .../legacy/views/abstract_controller_tests.js | 3 +- .../tests/legacy/views/basic_view_tests.js | 5 +- .../static/tests/legacy/views/form_tests.js | 6 +- .../static/tests/legacy/views/kanban_tests.js | 6 +- .../static/tests/legacy/views/list_tests.js | 49 ++++---- .../tests/legacy/views/state_mapping_tests.js | 5 +- addons/web/static/tests/qunit.js | 8 +- .../search/custom_favorite_item_tests.js | 5 +- .../tests/search/favorite_menu_tests.js | 5 +- addons/web/static/tests/search/helpers.js | 3 +- .../static/tests/search/pager_hook_tests.js | 4 +- .../static/tests/search/search_model_tests.js | 3 +- .../static/tests/search/search_panel_tests.js | 3 +- .../static/tests/search/with_search_tests.js | 4 +- addons/web/static/tests/setup.js | 6 +- addons/web/static/tests/views/helpers.js | 4 +- addons/web/static/tests/views/layout_tests.js | 4 +- addons/web/static/tests/views/view_tests.js | 4 +- .../webclient/actions/client_action_tests.js | 10 +- .../webclient/actions/concurrency_tests.js | 6 +- .../webclient/actions/error_handling_tests.js | 6 +- .../webclient/actions/load_state_tests.js | 12 +- .../webclient/actions/push_state_tests.js | 8 +- .../tests/webclient/actions/target_tests.js | 14 ++- .../webclient/actions/window_action_tests.js | 4 +- addons/web/static/tests/webclient/helpers.js | 6 +- .../static/tests/webclient/navbar_tests.js | 8 +- .../static/tests/webclient/webclient_tests.js | 3 +- addons/web/tooling/types/qunit.d.ts | 5 +- .../components/configurator/configurator.js | 9 +- .../website/static/src/js/menu/debug_menu.js | 3 +- 303 files changed, 826 insertions(+), 745 deletions(-) create mode 100644 addons/web/static/src/owl_next_adapter.js diff --git a/addons/account/static/src/js/account_resequence_field.js b/addons/account/static/src/js/account_resequence_field.js index 57b57bfeac0..ec49f11fde5 100644 --- a/addons/account/static/src/js/account_resequence_field.js +++ b/addons/account/static/src/js/account_resequence_field.js @@ -1,11 +1,11 @@ odoo.define('account.ShowResequenceRenderer', function (require) { "use strict"; -const { Component } = owl; -const { useState } = owl.hooks; const AbstractFieldOwl = require('web.AbstractFieldOwl'); const field_registry = require('web.field_registry_owl'); +const { Component } = owl; + class ChangeLine extends Component { } ChangeLine.template = 'account.ResequenceChangeLine'; ChangeLine.props = ["changeLine", 'ordering']; diff --git a/addons/account/static/src/js/grouped_view_widget.js b/addons/account/static/src/js/grouped_view_widget.js index e1df30cf997..3ff897676fd 100644 --- a/addons/account/static/src/js/grouped_view_widget.js +++ b/addons/account/static/src/js/grouped_view_widget.js @@ -1,11 +1,11 @@ odoo.define('account.ShowGroupedList', function (require) { "use strict"; -const { Component } = owl; -const { useState } = owl.hooks; const AbstractFieldOwl = require('web.AbstractFieldOwl'); const field_registry = require('web.field_registry_owl'); +const { Component } = owl; + class ListItem extends Component { } ListItem.template = 'account.GroupedItemTemplate'; ListItem.props = ["item_vals", "options"]; diff --git a/addons/account/static/src/js/tax_totals.js b/addons/account/static/src/js/tax_totals.js index 30ddba19083..8e50c8bca65 100644 --- a/addons/account/static/src/js/tax_totals.js +++ b/addons/account/static/src/js/tax_totals.js @@ -1,13 +1,13 @@ /** @odoo-module alias=account.tax_group_owl **/ "use strict"; -const { Component } = owl; -const { useState, useRef } = owl.hooks; import session from 'web.session'; import AbstractFieldOwl from 'web.AbstractFieldOwl'; import fieldUtils from 'web.field_utils'; import field_registry from 'web.field_registry_owl'; +const { Component, useRef, useState } = owl; + /** A line of some TaxTotalsComponent, giving the values of a tax group. **/ diff --git a/addons/base_automation/static/tests/base_automation_error_dialog.js b/addons/base_automation/static/tests/base_automation_error_dialog.js index 9489d0b7df3..462fd92cdba 100644 --- a/addons/base_automation/static/tests/base_automation_error_dialog.js +++ b/addons/base_automation/static/tests/base_automation_error_dialog.js @@ -18,6 +18,7 @@ import { DialogContainer } from "@web/core/dialog/dialog_container"; import { getFixture } from "@web/../tests/helpers/utils"; import { nextTick } from "@web/../tests/helpers/utils"; +const { mount } = owl; const serviceRegistry = registry.category("services"); QUnit.module("base_automation", {}, function () { @@ -79,7 +80,7 @@ QUnit.module("base_automation", {}, function () { const env = await makeTestEnv(); const { Component: Container, props } = registry.category("main_components").get("DialogContainer"); - const dialogContainer = await owl.mount(Container, { target: getFixture(), env, props }); + const dialogContainer = await mount(Container, { target: getFixture(), env, props }); const errorEvent = new PromiseRejectionEvent("error", { reason: { message: error, @@ -114,7 +115,7 @@ QUnit.module("base_automation", {}, function () { const env = await makeTestEnv(); const { Component: Container, props } = registry.category("main_components").get("DialogContainer"); - const dialogContainer = await owl.mount(Container, { target: getFixture(), env, props }); + const dialogContainer = await mount(Container, { target: getFixture(), env, props }); const errorEvent = new PromiseRejectionEvent("error", { reason: { message: error, diff --git a/addons/bus/static/src/js/services/assets_watchdog_service.js b/addons/bus/static/src/js/services/assets_watchdog_service.js index df11b8de00b..1dca8c8f22d 100644 --- a/addons/bus/static/src/js/services/assets_watchdog_service.js +++ b/addons/bus/static/src/js/services/assets_watchdog_service.js @@ -4,6 +4,8 @@ import { browser } from "@web/core/browser/browser"; import { registry } from "@web/core/registry"; import { session } from "@web/session"; +const { Component } = owl; + export const assetsWatchdogService = { dependencies: ["notification"], @@ -12,7 +14,7 @@ export const assetsWatchdogService = { let bundleNotifTimerID = null; env.bus.on("WEB_CLIENT_READY", null, async () => { - const legacyEnv = owl.Component.env; + const legacyEnv = Component.env; legacyEnv.services.bus_service.onNotification(this, onNotification); legacyEnv.services.bus_service.startPolling(); }); diff --git a/addons/bus/static/tests/bus_tests.js b/addons/bus/static/tests/bus_tests.js index 612e417e4e6..b29d3be8a98 100644 --- a/addons/bus/static/tests/bus_tests.js +++ b/addons/bus/static/tests/bus_tests.js @@ -12,6 +12,7 @@ const { ConnectionLostError } = require("@web/core/network/rpc_service"); const { patchWithCleanup, nextTick } = require("@web/../tests/helpers/utils"); const { createWebClient } = require('@web/../tests/webclient/helpers'); +const { Component } = owl; var LocalStorageServiceMock; @@ -114,7 +115,7 @@ QUnit.module('Bus', { }, legacyParams: { serviceRegistry: legacyRegistry }, }); - busService = owl.Component.env.services.bus_service; + busService = Component.env.services.bus_service; busService.startPolling(); // Give longpolling bus a tick to try to restart polling await nextTick(); diff --git a/addons/calendar/static/src/js/services/calendar_notification_service.js b/addons/calendar/static/src/js/services/calendar_notification_service.js index bd3560a1a86..debe2927fd1 100644 --- a/addons/calendar/static/src/js/services/calendar_notification_service.js +++ b/addons/calendar/static/src/js/services/calendar_notification_service.js @@ -4,6 +4,8 @@ import { browser } from "@web/core/browser/browser"; import { ConnectionLostError } from "@web/core/network/rpc_service"; import { registry } from "@web/core/registry"; +const { Component } = owl; + export const calendarNotificationService = { dependencies: ["action", "notification", "rpc"], @@ -13,7 +15,7 @@ export const calendarNotificationService = { const displayedNotifications = new Set(); env.bus.on("WEB_CLIENT_READY", null, async () => { - const legacyEnv = owl.Component.env; + const legacyEnv = Component.env; legacyEnv.services.bus_service.onNotification(this, (notifications) => { for (const { payload, type } of notifications) { if (type === "calendar.alarm") { diff --git a/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js b/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js index f5cf02405ec..d1ba8d42f44 100644 --- a/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js +++ b/addons/hr/static/tests/standalone_m2o_avatar_employee_tests.js @@ -1,6 +1,5 @@ /** @odoo-module **/ - const { xml } = owl.tags; import AbstractRendererOwl from 'web.AbstractRendererOwl'; import BasicView from "web.BasicView"; @@ -10,6 +9,8 @@ import StandaloneM2OAvatarEmployee from '@hr/js/standalone_m2o_avatar_employee'; + const { xml } = owl; + function getHtmlRenderer(html) { return BasicRenderer.extend({ start: function () { diff --git a/addons/hr_holidays/static/src/dashboard/time_off_card.js b/addons/hr_holidays/static/src/dashboard/time_off_card.js index 5ccbcb2d66c..6443516b5ef 100644 --- a/addons/hr_holidays/static/src/dashboard/time_off_card.js +++ b/addons/hr_holidays/static/src/dashboard/time_off_card.js @@ -1,11 +1,13 @@ /* @odoo-module */ -export class TimeOffCardPopover extends owl.Component {} +const { Component } = owl; + +export class TimeOffCardPopover extends Component {} TimeOffCardPopover.template = 'hr_holidays.TimeOffCardPopover'; TimeOffCardPopover.props = ['allocated', 'approved', 'planned', 'left']; -export class TimeOffCard extends owl.Component {} +export class TimeOffCard extends Component {} TimeOffCard.components = { TimeOffCardPopover }; TimeOffCard.template = 'hr_holidays.TimeOffCard'; diff --git a/addons/hr_holidays/static/src/dashboard/time_off_dashboard.js b/addons/hr_holidays/static/src/dashboard/time_off_dashboard.js index 75db5a2d62b..f448fb2bb1c 100644 --- a/addons/hr_holidays/static/src/dashboard/time_off_dashboard.js +++ b/addons/hr_holidays/static/src/dashboard/time_off_dashboard.js @@ -2,7 +2,9 @@ import { TimeOffCard } from './time_off_card'; -export class TimeOffDashboard extends owl.Component {} +const { Component } = owl; + +export class TimeOffDashboard extends Component {} TimeOffDashboard.components = { TimeOffCard }; TimeOffDashboard.template = 'hr_holidays.TimeOffDashboard'; diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index 273bc52f98b..bdd717fa82f 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -80,6 +80,7 @@ Help your customers with this chat, and analyse their feedback. 'web/static/lib/qweb/qweb2.js', # Odoo JS Framework 'web/static/lib/owl/owl.js', + 'web/static/src/owl_next_adapter.js', 'web/static/src/legacy/js/promise_extension.js', 'web/static/src/boot.js', 'web/static/src/core/assets.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/use_component_to_model.js index 02acdb29cea..fdc80fab382 100644 --- 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/use_component_to_model.js @@ -2,7 +2,7 @@ import { clear } from '@mail/model/model_field_command'; -const { onWillUpdateProps, useComponent } = owl.hooks; +const { onWillUpdateProps, useComponent } = owl; /** * This hook provides support for saving the reference of the component directly 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/use_drag_visible_dropzone.js index 59a2a82b1e1..65a83022b92 100644 --- 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/use_drag_visible_dropzone.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -const { useState, onMounted, onWillUnmount } = owl.hooks; +const { onMounted, onWillUnmount, useState } = owl; /** * This hook handle the visibility of the dropzone based on drag & drop events. diff --git a/addons/mail/static/src/component_hooks/use_models/use_models.js b/addons/mail/static/src/component_hooks/use_models/use_models.js index c555afa8e14..94fa51f0752 100644 --- a/addons/mail/static/src/component_hooks/use_models/use_models.js +++ b/addons/mail/static/src/component_hooks/use_models/use_models.js @@ -2,7 +2,7 @@ import { Listener } from '@mail/model/model_listener'; -const { useComponent } = owl.hooks; +const { useComponent } = owl; /** * This hook provides support for automatically re-rendering when used records 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/use_ref_to_model.js index 85862c1671d..ec186423bd8 100644 --- 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/use_ref_to_model.js @@ -2,7 +2,7 @@ import { clear } from '@mail/model/model_field_command'; -const { onWillUpdateProps, useComponent, useRef } = owl.hooks; +const { onWillUpdateProps, useComponent, useRef } = owl; /** * This hook provides support for saving the result of useRef directly into the 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/use_rendered_values.js index 525e00efe6f..ac305e0aa1c 100644 --- a/addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js +++ b/addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js @@ -2,8 +2,7 @@ import { Listener } from '@mail/model/model_listener'; -const { Component } = owl; -const { onMounted, onPatched } = owl.hooks; +const { Component, onMounted, onPatched } = owl; /** * This hooks provides support for accessing the values returned by the given diff --git a/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js b/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js index 142cd288049..316f433d026 100644 --- a/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js +++ b/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js @@ -1,8 +1,7 @@ /** @odoo-module **/ 'use strict'; -const { Component } = owl; -const { onPatched } = owl.hooks; +const { Component, onPatched } = owl; /** * Shallow compares props `a` and `b`. diff --git a/addons/mail/static/src/component_hooks/use_update/use_update.js b/addons/mail/static/src/component_hooks/use_update/use_update.js index d58b60601c0..60de8ac40ce 100644 --- a/addons/mail/static/src/component_hooks/use_update/use_update.js +++ b/addons/mail/static/src/component_hooks/use_update/use_update.js @@ -2,7 +2,7 @@ import { Listener } from '@mail/model/model_listener'; -const { onMounted, onPatched, useComponent } = owl.hooks; +const { onMounted, onPatched, useComponent } = owl; /** * This hook provides support for executing code after update (render or patch). 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/use_update_to_model.js index c91271c1678..c108484d534 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/use_update_to_model.js @@ -2,7 +2,7 @@ import { useUpdate } from '@mail/component_hooks/use_update/use_update'; -const { useComponent } = owl.hooks; +const { useComponent } = owl; /** * This hook provides support for binding the onMounted/onPatched hooks to the 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 c49eb9ec6c6..bab0d14509c 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 @@ -4,8 +4,7 @@ import { useComponentToModel } from '@mail/component_hooks/use_component_to_mode import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model'; import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted, useRef } = owl.hooks; +const { Component, onMounted, useRef } = owl; export class ActivityMarkDonePopover extends Component { 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 a8a9d14cc88..81425e9c855 100644 --- a/addons/mail/static/src/components/attachment_card/attachment_card.js +++ b/addons/mail/static/src/components/attachment_card/attachment_card.js @@ -2,6 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model'; + const { Component } = owl; export class AttachmentCard extends Component { diff --git a/addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js b/addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js index 629f5595555..796839b74dd 100644 --- a/addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js +++ b/addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js @@ -4,7 +4,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import Dialog from 'web.OwlDialog'; -const { Component } = owl; +const { Component, escape } = owl; export class AttachmentDeleteConfirmDialog extends Component { @@ -25,7 +25,7 @@ export class AttachmentDeleteConfirmDialog extends Component { getBody() { return _.str.sprintf( this.env._t(`Do you really want to delete "%s"?`), - owl.utils.escape(this.attachment.displayName) + escape(this.attachment.displayName) ); } 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 5ef48a0e84f..8f5cc0f3ad6 100644 --- a/addons/mail/static/src/components/attachment_image/attachment_image.js +++ b/addons/mail/static/src/components/attachment_image/attachment_image.js @@ -2,6 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { useComponentToModel } from '@mail/component_hooks/use_component_to_model/use_component_to_model'; + const { Component } = owl; export class AttachmentImage extends Component { 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 f4ea6e8b58d..48ae6cf0ae2 100644 --- a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js +++ b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js @@ -7,8 +7,7 @@ import { link } from '@mail/model/model_field_command'; import { hidePDFJSButtons } from '@web/legacy/js/libs/pdfjs'; -const { Component } = owl; -const { onMounted, onPatched, onWillUnmount, useRef } = owl.hooks; +const { Component, onMounted, onPatched, onWillUnmount, useRef } = owl; const MIN_SCALE = 0.5; const SCROLL_ZOOM_STEP = 0.1; diff --git a/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js b/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js index cad75ebec19..8fe13e45aff 100644 --- a/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js +++ b/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted, onWillUnmount } = owl.hooks; +const { Component, onMounted, onWillUnmount } = owl; export class AutocompleteInput extends Component { 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 41314b74f6b..13ab1d50bb9 100644 --- a/addons/mail/static/src/components/chat_window/chat_window.js +++ b/addons/mail/static/src/components/chat_window/chat_window.js @@ -4,8 +4,7 @@ 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; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class ChatWindow extends Component { diff --git a/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.js b/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.js index 94fea342cf4..5c7aecc676c 100644 --- a/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.js +++ b/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted, onPatched, onWillUnmount, useRef } = owl.hooks; +const { Component, onMounted, onPatched, onWillUnmount, useRef } = owl; export class ChatWindowHiddenMenu extends Component { diff --git a/addons/mail/static/src/components/chatter/chatter.js b/addons/mail/static/src/components/chatter/chatter.js index 1338c4a498e..5cd3dcfbfa6 100644 --- a/addons/mail/static/src/components/chatter/chatter.js +++ b/addons/mail/static/src/components/chatter/chatter.js @@ -4,8 +4,7 @@ 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'; -const { Component } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class Chatter extends Component { diff --git a/addons/mail/static/src/components/chatter_container/chatter_container.js b/addons/mail/static/src/components/chatter_container/chatter_container.js index e1e57369e6a..6bdf4f9531d 100644 --- a/addons/mail/static/src/components/chatter_container/chatter_container.js +++ b/addons/mail/static/src/components/chatter_container/chatter_container.js @@ -3,8 +3,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { clear } from '@mail/model/model_field_command'; -const { Component } = owl; -const { onWillUpdateProps } = owl.hooks; +const { Component, onWillUpdateProps } = owl; const getChatterNextTemporaryId = (function () { let tmpId = 0; 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 4199a36804a..d50fa7f4fe1 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 @@ -6,8 +6,7 @@ import { useUpdate } from '@mail/component_hooks/use_update/use_update'; import { FormViewDialog } from 'web.view_dialogs'; import { ComponentAdapter } from 'web.OwlCompatibility'; -const { Component } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; class FormViewDialogComponentAdapter extends ComponentAdapter { diff --git a/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js b/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js index d1eb9bbe068..9177315e5b6 100644 --- a/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js +++ b/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { useState } = owl.hooks; +const { Component, useState } = owl; export class ComposerSuggestedRecipientList extends Component { 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 42dbe9ced09..9d136d9c65a 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 @@ -5,8 +5,7 @@ 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 } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class ComposerTextInput extends Component { diff --git a/addons/mail/static/src/components/dialog/dialog.js b/addons/mail/static/src/components/dialog/dialog.js index 8dd7cc8496f..f0697e0558e 100644 --- a/addons/mail/static/src/components/dialog/dialog.js +++ b/addons/mail/static/src/components/dialog/dialog.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted, onWillUnmount } = owl.hooks; +const { Component, onMounted, onWillUnmount } = owl; export class Dialog extends Component { diff --git a/addons/mail/static/src/components/dialog_manager/dialog_manager.js b/addons/mail/static/src/components/dialog_manager/dialog_manager.js index 858775e9673..f0e0d635cf5 100644 --- a/addons/mail/static/src/components/dialog_manager/dialog_manager.js +++ b/addons/mail/static/src/components/dialog_manager/dialog_manager.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted, onPatched } = owl.hooks; +const { Component, onMounted, onPatched } = owl; export class DialogManager extends Component { diff --git a/addons/mail/static/src/components/discuss/discuss.js b/addons/mail/static/src/components/discuss/discuss.js index 7907b37829e..1b5c70d527a 100644 --- a/addons/mail/static/src/components/discuss/discuss.js +++ b/addons/mail/static/src/components/discuss/discuss.js @@ -3,8 +3,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { useUpdate } from '@mail/component_hooks/use_update/use_update'; -const { Component } = owl; -const { onWillUnmount } = owl.hooks; +const { Component, onWillUnmount } = owl; export class Discuss extends Component { 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 04765ca869a..64c0b2fb8c3 100644 --- a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js +++ b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js @@ -3,8 +3,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { useUpdate } from '@mail/component_hooks/use_update/use_update'; -const { Component } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class DiscussSidebar extends Component { diff --git a/addons/mail/static/src/components/follow_button/follow_button.js b/addons/mail/static/src/components/follow_button/follow_button.js index d3fe4e51073..4c059fcaead 100644 --- a/addons/mail/static/src/components/follow_button/follow_button.js +++ b/addons/mail/static/src/components/follow_button/follow_button.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { useState } = owl.hooks; +const { Component, useState } = owl; export class FollowButton extends Component { diff --git a/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js b/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js index 2bc13e1a0bc..7ed398b7a7b 100644 --- a/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js +++ b/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted, onWillUnmount, useRef, useState } = owl.hooks; +const { Component, onMounted, onWillUnmount, useRef, useState } = owl; export class FollowerListMenu extends Component { 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 f7adc3cb1f2..b49bbb107e9 100644 --- a/addons/mail/static/src/components/media_preview/media_preview.js +++ b/addons/mail/static/src/components/media_preview/media_preview.js @@ -3,7 +3,9 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { useRefToModel } from '@mail/component_hooks/use_ref_to_model/use_ref_to_model'; -export class MediaPreview extends owl.Component { +const { Component } = owl; + +export class MediaPreview extends Component { /** * @override diff --git a/addons/mail/static/src/components/message/message.js b/addons/mail/static/src/components/message/message.js index 11ccb39874a..4c36264cb4e 100644 --- a/addons/mail/static/src/components/message/message.js +++ b/addons/mail/static/src/components/message/message.js @@ -10,8 +10,7 @@ import { _lt } from 'web.core'; import { format } from 'web.field_utils'; import { getLangDatetimeFormat } from 'web.time'; -const { Component, useState } = owl; -const { onWillUnmount, useRef } = owl.hooks; +const { Component, onWillUnmount, useRef, useState } = owl; const READ_MORE = _lt("Read More"); const READ_LESS = _lt("Read Less"); 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 2e49105acd2..d9b9de3b5f8 100644 --- a/addons/mail/static/src/components/message_list/message_list.js +++ b/addons/mail/static/src/components/message_list/message_list.js @@ -5,8 +5,7 @@ import { useComponentToModel } from '@mail/component_hooks/use_component_to_mode import { useRenderedValues } from '@mail/component_hooks/use_rendered_values/use_rendered_values'; import { useUpdate } from '@mail/component_hooks/use_update/use_update'; -const { Component } = owl; -const { onWillPatch, useRef } = owl.hooks; +const { Component, onWillPatch, useRef } = owl; export class MessageList extends Component { diff --git a/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js b/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js index 054d9fc0e10..6e26af2a727 100644 --- a/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js +++ b/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js @@ -1,8 +1,9 @@ /** @odoo-module **/ -const { Component } = owl; import { registerMessagingComponent } from '@mail/utils/messaging_component'; +const { Component } = owl; + export class MessageReactionGroup extends Component { get messageReactionGroup() { diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.js b/addons/mail/static/src/components/messaging_menu/messaging_menu.js index 6a6269c258e..36859ccb62b 100644 --- a/addons/mail/static/src/components/messaging_menu/messaging_menu.js +++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted, onWillUnmount } = owl.hooks; +const { Component, onMounted, onWillUnmount } = owl; export class MessagingMenu extends Component { 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 bacdb041c6c..435789220b6 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 @@ -13,7 +13,7 @@ export class MessagingMenuContainer extends Component { setup() { // for now, the legacy env is needed for internal functions such as // `useModels` to work - this.env = owl.Component.env; + this.env = Component.env; useModels(); super.setup(); } diff --git a/addons/mail/static/src/components/notification_group/notification_group.js b/addons/mail/static/src/components/notification_group/notification_group.js index 0a16fa64dcd..3ec1ef1ca34 100644 --- a/addons/mail/static/src/components/notification_group/notification_group.js +++ b/addons/mail/static/src/components/notification_group/notification_group.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class NotificationGroup extends Component { diff --git a/addons/mail/static/src/components/notification_list/notification_list.js b/addons/mail/static/src/components/notification_list/notification_list.js index c65922258bd..0ab0f9c8ee1 100644 --- a/addons/mail/static/src/components/notification_list/notification_list.js +++ b/addons/mail/static/src/components/notification_list/notification_list.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { onMounted } = owl.hooks; +const { Component, onMounted } = owl; export class NotificationList extends Component { 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 669c4848200..af016b30531 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 @@ -13,7 +13,7 @@ export class RtcActivityNoticeContainer extends Component { setup() { // for now, the legacy env is needed for internal functions such as // `useModels` to work - this.env = owl.Component.env; + this.env = Component.env; useModels(); super.setup(); } diff --git a/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js b/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js index 695407153c2..ad06e98cb98 100644 --- a/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js +++ b/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js @@ -2,8 +2,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class RtcCallParticipantCard extends Component { 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 ae60d9bab7d..44dfb86bc3e 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 @@ -5,8 +5,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import Dialog from 'web.OwlDialog'; -const { Component, useState } = owl; -const { useRef } = owl.hooks; +const { Component, useRef, useState } = owl; const components = { Dialog, diff --git a/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js b/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js index 1a0179de1c1..0b7c03ecfaf 100644 --- a/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js +++ b/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js @@ -4,8 +4,7 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import { browser } from "@web/core/browser/browser"; -const { Component } = owl; -const { onWillStart, useState } = owl.hooks; +const { Component, onWillStart, useState } = owl; export class RtcConfigurationMenu extends Component { diff --git a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js index d270bd0225e..2612844aa2b 100644 --- a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js +++ b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js @@ -4,8 +4,7 @@ import * as mailUtils from '@mail/js/utils'; import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class ThreadNeedactionPreview extends Component { diff --git a/addons/mail/static/src/components/thread_preview/thread_preview.js b/addons/mail/static/src/components/thread_preview/thread_preview.js index 6601a3b6348..177ac42ecd7 100644 --- a/addons/mail/static/src/components/thread_preview/thread_preview.js +++ b/addons/mail/static/src/components/thread_preview/thread_preview.js @@ -4,8 +4,7 @@ import * as mailUtils from '@mail/js/utils'; import { registerMessagingComponent } from '@mail/utils/messaging_component'; -const { Component } = owl; -const { useRef } = owl.hooks; +const { Component, useRef } = owl; export class ThreadPreview extends Component { 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 220fb04e15a..c01c46648a7 100644 --- a/addons/mail/static/src/components/welcome_view/welcome_view.js +++ b/addons/mail/static/src/components/welcome_view/welcome_view.js @@ -4,7 +4,9 @@ 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'; -export class WelcomeView extends owl.Component { +const { Component } = owl; + +export class WelcomeView extends Component { /** * @override diff --git a/addons/mail/static/src/js/core/translation.js b/addons/mail/static/src/js/core/translation.js index b968c158a73..5ef62e7aa56 100644 --- a/addons/mail/static/src/js/core/translation.js +++ b/addons/mail/static/src/js/core/translation.js @@ -2,17 +2,19 @@ import { TranslationDataBase } from 'web.translation'; +const { Component } = owl; + TranslationDataBase.include({ /** * @override */ set_bundle() { const res = this._super(...arguments); - if (owl.Component.env.services && owl.Component.env.services.messaging) { + if (Component.env.services && Component.env.services.messaging) { // During boot `env.services` might not even be set yet, in this // case this can safely be ignored as messaging will then load // locale information during its initialization. - owl.Component.env.services.messaging.get().then(messaging => { + Component.env.services.messaging.get().then(messaging => { // Update messaging locale whenever the translation bundle changes. // In particular if messaging is created before the end of the // `load_translations` RPC, the default values have to be diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js index ee3c26fe683..da8b7eeb7f3 100644 --- a/addons/mail/static/src/js/utils.js +++ b/addons/mail/static/src/js/utils.js @@ -2,6 +2,8 @@ import core from 'web.core'; +const { escape } = owl; + var _t = core._t; /** @@ -146,7 +148,7 @@ function parseEmail(text) { */ function escapeAndCompactTextContent(content) { //Removing unwanted extra spaces from message - let value = owl.utils.escape(content).trim(); + let value = escape(content).trim(); value = value.replace(/(\r|\n){2,}/g, '

'); value = value.replace(/(\r|\n)/g, '
'); diff --git a/addons/mail/static/src/js/views/activity/activity_renderer.js b/addons/mail/static/src/js/views/activity/activity_renderer.js index 0f9164d6c43..94b19a75baa 100644 --- a/addons/mail/static/src/js/views/activity/activity_renderer.js +++ b/addons/mail/static/src/js/views/activity/activity_renderer.js @@ -11,9 +11,9 @@ import QWeb from 'web.QWeb'; import session from 'web.session'; import utils from 'web.utils'; +const { useState } = owl; const _t = core._t; -const { useState } = owl.hooks; /** * Owl Component Adapter for ActivityRecord which is KanbanRecord (Odoo Widget) diff --git a/addons/mail/static/src/models/composer_view/composer_view.js b/addons/mail/static/src/models/composer_view/composer_view.js index 636bfcbd0e2..77b59f058d7 100644 --- a/addons/mail/static/src/models/composer_view/composer_view.js +++ b/addons/mail/static/src/models/composer_view/composer_view.js @@ -8,6 +8,8 @@ import { OnChange } from '@mail/model/model_onchange'; import { addLink, escapeAndCompactTextContent, parseAndTransform } from '@mail/js/utils'; import { isEventHandled, markEventHandled } from '@mail/utils/utils'; +const { escape } = owl; + registerModel({ name: 'ComposerView', identifyingFields: [['threadView', 'messageViewInEditing', 'chatter']], @@ -722,7 +724,7 @@ registerModel({ const mentions = []; for (const partner of this.composer.mentionedPartners) { const placeholder = `@-mention-partner-${partner.id}`; - const text = `@${owl.utils.escape(partner.name)}`; + const text = `@${escape(partner.name)}`; mentions.push({ class: 'o_mail_redirect', id: partner.id, @@ -734,7 +736,7 @@ registerModel({ } for (const channel of this.composer.mentionedChannels) { const placeholder = `#-mention-channel-${channel.id}`; - const text = `#${owl.utils.escape(channel.name)}`; + const text = `#${escape(channel.name)}`; mentions.push({ class: 'o_channel_redirect', id: channel.id, diff --git a/addons/mail/static/src/models/discuss/discuss.js b/addons/mail/static/src/models/discuss/discuss.js index 2f8479a6c27..61e50a30a77 100644 --- a/addons/mail/static/src/models/discuss/discuss.js +++ b/addons/mail/static/src/models/discuss/discuss.js @@ -4,6 +4,8 @@ import { registerModel } from '@mail/model/model_core'; import { attr, many2one, one2one } from '@mail/model/model_field'; import { clear, insertAndReplace, link, unlink } from '@mail/model/model_field_command'; +const { escape } = owl; + registerModel({ name: 'Discuss', identifyingFields: ['messaging'], @@ -64,14 +66,14 @@ registerModel({ this.update({ addingChannelValue: req.term }); const threads = await this.messaging.models['Thread'].searchChannelsToOpen({ limit: 10, searchTerm: req.term }); const items = threads.map((thread) => { - const escapedName = owl.utils.escape(thread.name); + const escapedName = escape(thread.name); return { id: thread.id, label: escapedName, value: escapedName, }; }); - const escapedValue = owl.utils.escape(req.term); + const escapedValue = escape(req.term); // XDU FIXME could use a component but be careful with owl's // renderToString https://github.com/odoo/owl/issues/708 items.push({ @@ -107,7 +109,7 @@ registerModel({ * @param {function} res */ handleAddChatAutocompleteSource(req, res) { - const value = owl.utils.escape(req.term); + const value = escape(req.term); this.messaging.models['Partner'].imSearch({ callback: partners => { const suggestions = partners.map(partner => { diff --git a/addons/mail/static/src/models/messaging/messaging.js b/addons/mail/static/src/models/messaging/messaging.js index 6c69e810b35..82e1272d0fa 100644 --- a/addons/mail/static/src/models/messaging/messaging.js +++ b/addons/mail/static/src/models/messaging/messaging.js @@ -6,7 +6,7 @@ import { OnChange } from '@mail/model/model_onchange'; import { insertAndReplace, link, unlink } from '@mail/model/model_field_command'; import { makeDeferred } from '@mail/utils/deferred/deferred'; -const { EventBus } = owl.core; +const { EventBus } = owl; registerModel({ name: 'Messaging', @@ -171,7 +171,7 @@ registerModel({ }, /** * @private - * @returns {owl.EventBus} + * @returns {EventBus} */ _computeMessagingBus() { if (this.messagingBus) { diff --git a/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js b/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js index 0da52cce477..17b479fc87e 100644 --- a/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js +++ b/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js @@ -7,6 +7,7 @@ import { htmlToTextContentInline } from '@mail/js/utils'; import { str_to_datetime } from 'web.time'; import { Markup } from 'web.utils'; +const { escape } = owl; const PREVIEW_MSG_MAX_SIZE = 350; // optimal for native English speakers registerModel({ @@ -692,7 +693,7 @@ registerModel({ notificationTitle = author.nameOrDisplayName; } } - const notificationContent = owl.utils.escape( + const notificationContent = escape( htmlToTextContentInline(message.body).substr(0, PREVIEW_MSG_MAX_SIZE) ); this.env.services['bus_service'].sendNotification({ diff --git a/addons/mail/static/src/models/popover_view/popover_view.js b/addons/mail/static/src/models/popover_view/popover_view.js index 0af4fe332d9..c8aff299908 100644 --- a/addons/mail/static/src/models/popover_view/popover_view.js +++ b/addons/mail/static/src/models/popover_view/popover_view.js @@ -4,6 +4,8 @@ import { registerModel } from '@mail/model/model_core'; import { attr, one2one } from '@mail/model/model_field'; import { clear, insertAndReplace, replace } from '@mail/model/model_field_command'; +const { Ref } = owl; + registerModel({ name: 'PopoverView', identifyingFields: [['composerViewOwnerAsEmoji', 'messageActionListOwnerAsReaction', 'threadViewTopbarOwnerAsInvite']], @@ -28,7 +30,7 @@ registerModel({ }, /** * @private - * @returns {owl.Ref} + * @returns {Ref} */ _computeAnchorRef() { if (this.threadViewTopbarOwnerAsInvite) { diff --git a/addons/mail/static/src/public/discuss_public_boot.js b/addons/mail/static/src/public/discuss_public_boot.js index 3c68a8fc7b5..6f5f1f78156 100644 --- a/addons/mail/static/src/public/discuss_public_boot.js +++ b/addons/mail/static/src/public/discuss_public_boot.js @@ -24,20 +24,22 @@ import { } from '@web/legacy/utils'; import * as legacySession from 'web.session'; -owl.Component.env = legacyEnv; +const { Component, config, mount, whenReady } = owl; + +Component.env = legacyEnv; (async function boot() { - await owl.utils.whenReady(); - owl.config.mode = owl.Component.env.isDebug() ? 'dev' : 'prod'; - AbstractService.prototype.deployServices(owl.Component.env); + await whenReady(); + config.mode = Component.env.isDebug() ? 'dev' : 'prod'; + AbstractService.prototype.deployServices(Component.env); const serviceRegistry = registry.category('services'); - serviceRegistry.add('legacy_rpc', makeLegacyRpcService(owl.Component.env)); - serviceRegistry.add('legacy_session', makeLegacySessionService(owl.Component.env, legacySession)); - serviceRegistry.add('legacy_notification', makeLegacyNotificationService(owl.Component.env)); - serviceRegistry.add('legacy_crash_manager', makeLegacyCrashManagerService(owl.Component.env)); - serviceRegistry.add('legacy_dialog_mapping', makeLegacyDialogMappingService(owl.Component.env)); + serviceRegistry.add('legacy_rpc', makeLegacyRpcService(Component.env)); + serviceRegistry.add('legacy_session', makeLegacySessionService(Component.env, legacySession)); + serviceRegistry.add('legacy_notification', makeLegacyNotificationService(Component.env)); + serviceRegistry.add('legacy_crash_manager', makeLegacyCrashManagerService(Component.env)); + serviceRegistry.add('legacy_dialog_mapping', makeLegacyDialogMappingService(Component.env)); await legacySession.is_bound; - owl.Component.env.qweb.addTemplates(legacySession.owlTemplates); + Component.env.qweb.addTemplates(legacySession.owlTemplates); Object.assign(odoo, { info: { db: session.db, @@ -53,19 +55,19 @@ owl.Component.env = legacyEnv; odoo.loadTemplatesPromise.then(processTemplates), ]); env.qweb.addTemplates(templates); - mapLegacyEnvToWowlEnv(owl.Component.env, env); + mapLegacyEnvToWowlEnv(Component.env, env); odoo.isReady = true; legacyServiceRegistry.add('messaging', MessagingService.extend({ messagingValues: { autofetchPartnerImStatus: false, }, })); - await owl.mount(MainComponentsContainer, { env, target: document.body }); + await mount(MainComponentsContainer, { env, target: document.body }); createAndMountDiscussPublicView(); })(); async function createAndMountDiscussPublicView() { - const messaging = await owl.Component.env.services.messaging.get(); + const messaging = await Component.env.services.messaging.get(); // needed by the attachment viewer const DialogManager = getMessagingComponent('DialogManager'); const dialogManagerComponent = new DialogManager(null, {}); diff --git a/addons/mail/static/src/public/root_widget.js b/addons/mail/static/src/public/root_widget.js index 89e5282034c..9ba6785d6a6 100644 --- a/addons/mail/static/src/public/root_widget.js +++ b/addons/mail/static/src/public/root_widget.js @@ -4,6 +4,8 @@ */ odoo.define("root.widget", function (require) { const { ComponentAdapter } = require("web.OwlCompatibility"); + const { Component } = owl; + return new ComponentAdapter(null, { Component }); }); diff --git a/addons/mail/static/src/utils/messaging_component.js b/addons/mail/static/src/utils/messaging_component.js index c157d8ca82d..6228913a1bf 100644 --- a/addons/mail/static/src/utils/messaging_component.js +++ b/addons/mail/static/src/utils/messaging_component.js @@ -3,7 +3,7 @@ import { useModels } from "@mail/component_hooks/use_models/use_models"; import { useShouldUpdateBasedOnProps } from "@mail/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props"; -const { useRef } = owl.hooks; +const { useRef } = owl; const componentRegistry = {}; diff --git a/addons/mail/static/src/utils/test_utils.js b/addons/mail/static/src/utils/test_utils.js index 90c579011ba..3314eab5925 100644 --- a/addons/mail/static/src/utils/test_utils.js +++ b/addons/mail/static/src/utils/test_utils.js @@ -29,13 +29,12 @@ import { createWebClient, getActionManagerServerData } from "@web/../tests/webcl import LegacyRegistry from "web.Registry"; +const { Component, EventBus } = owl; const { addMockEnvironment, patch: legacyPatch, unpatch: legacyUnpatch, } = mock; -const { Component } = owl; -const { EventBus } = owl.core; //------------------------------------------------------------------------------ // Private @@ -163,7 +162,7 @@ function _useDiscuss(callbacks, { afterNextRender }) { * @returns {Promise} */ function nextAnimationFrame() { - const requestAnimationFrame = owl.Component.scheduler.requestAnimationFrame; + const requestAnimationFrame = Component.scheduler.requestAnimationFrame; return new Promise(function (resolve) { setTimeout(() => requestAnimationFrame(() => resolve())); }); @@ -178,10 +177,10 @@ function nextAnimationFrame() { * @returns {Promise} */ const afterNextRender = (function () { - const stop = owl.Component.scheduler.stop; + const stop = Component.scheduler.stop; const stopPromises = []; - owl.Component.scheduler.stop = function () { + Component.scheduler.stop = function () { const wasRunning = this.isRunning; stop.call(this); if (wasRunning) { @@ -201,7 +200,7 @@ const afterNextRender = (function () { const timeoutProm = new Promise((resolve, reject) => { timeoutNoRender = setTimeout(() => { let error = startError; - if (owl.Component.scheduler.isRunning) { + if (Component.scheduler.isRunning) { error = stopError; } console.error(error); @@ -222,7 +221,7 @@ const afterNextRender = (function () { await funcRes; // Wait one more frame to make sure no new render has been queued. await nextAnimationFrame(); - if (owl.Component.scheduler.isRunning) { + if (Component.scheduler.isRunning) { await afterNextRender(() => {}, timeoutDelay); } } diff --git a/addons/mail/static/src/webclient/commands/mail_providers.js b/addons/mail/static/src/webclient/commands/mail_providers.js index 3a5443ed0cc..87fd0fbd1b1 100644 --- a/addons/mail/static/src/webclient/commands/mail_providers.js +++ b/addons/mail/static/src/webclient/commands/mail_providers.js @@ -3,8 +3,7 @@ import { _lt } from "@web/core/l10n/translation"; import { registry } from "@web/core/registry"; -const { Component } = owl; -const { xml } = owl.tags; +const { Component, xml } = owl; class DialogCommand extends Component {} DialogCommand.template = xml` diff --git a/addons/mail/static/src/widgets/form_renderer/form_renderer.js b/addons/mail/static/src/widgets/form_renderer/form_renderer.js index 9ae725fa815..78abe007e6e 100644 --- a/addons/mail/static/src/widgets/form_renderer/form_renderer.js +++ b/addons/mail/static/src/widgets/form_renderer/form_renderer.js @@ -5,6 +5,8 @@ import { getMessagingComponent } from "@mail/utils/messaging_component"; import FormRenderer from 'web.FormRenderer'; import { ComponentWrapper } from 'web.OwlCompatibility'; +const { Component } = owl; + class ChatterContainerWrapperComponent extends ComponentWrapper {} /** @@ -37,7 +39,7 @@ FormRenderer.include({ this.off('o_attachments_changed', this); this.off('o_chatter_rendered', this); this.off('o_message_posted', this); - owl.Component.env.bus.off('Thread:promptAddFollower-closed', this); + Component.env.bus.off('Thread:promptAddFollower-closed', this); }, //-------------------------------------------------------------------------- @@ -76,7 +78,7 @@ FormRenderer.include({ this.on('o_attachments_changed', this, ev => this.trigger_up('reload', { keepChanges: true })); } if (this.chatterFields.hasRecordReloadOnFollowersUpdate) { - owl.Component.env.bus.on('Thread:promptAddFollower-closed', this, ev => this.trigger_up('reload', { keepChanges: true })); + Component.env.bus.on('Thread:promptAddFollower-closed', this, ev => this.trigger_up('reload', { keepChanges: true })); } }, /** diff --git a/addons/mail/static/tests/tours/mail_full_composer_test_tour.js b/addons/mail/static/tests/tours/mail_full_composer_test_tour.js index b15f47b358c..2d81a67cf33 100644 --- a/addons/mail/static/tests/tours/mail_full_composer_test_tour.js +++ b/addons/mail/static/tests/tours/mail_full_composer_test_tour.js @@ -7,6 +7,8 @@ import { import tour from 'web_tour.tour'; +const { Component } = owl; + /** * This tour depends on data created by python test in charge of launching it. * It is not intended to work when launched from interface. It is needed to test @@ -31,7 +33,7 @@ tour.register('mail/static/tests/tours/mail_full_composer_test_tour.js', { contentType: 'text/plain', name: 'text.txt', }); - const messaging = await window.owl.Component.env.services.messaging.get(); + const messaging = await Component.env.services.messaging.get(); const uploaders = messaging.models['FileUploader'].all(); inputFiles( uploaders[0].fileInput, diff --git a/addons/point_of_sale/static/src/js/Chrome.js b/addons/point_of_sale/static/src/js/Chrome.js index 6b5c9e7bddf..11fae88f777 100644 --- a/addons/point_of_sale/static/src/js/Chrome.js +++ b/addons/point_of_sale/static/src/js/Chrome.js @@ -1,8 +1,6 @@ odoo.define('point_of_sale.Chrome', function(require) { 'use strict'; - const { useState, useRef, useContext, useExternalListener } = owl.hooks; - const { debounce } = owl.utils; const { loadCSS } = require('web.ajax'); const { useListener } = require('web.custom_hooks'); const { BarcodeEvents } = require('barcodes.BarcodeEvents'); @@ -23,6 +21,8 @@ odoo.define('point_of_sale.Chrome', function(require) { // we instantiate the extended one. const models = require('point_of_sale.models'); + const { debounce, useContext, useExternalListener, useRef, useState } = owl; + /** * Chrome is the root component of the PoS App. */ diff --git a/addons/point_of_sale/static/src/js/ChromeWidgets/ClientScreenButton.js b/addons/point_of_sale/static/src/js/ChromeWidgets/ClientScreenButton.js index d0a9e056df6..b0e6772fd48 100644 --- a/addons/point_of_sale/static/src/js/ChromeWidgets/ClientScreenButton.js +++ b/addons/point_of_sale/static/src/js/ChromeWidgets/ClientScreenButton.js @@ -1,10 +1,11 @@ odoo.define('point_of_sale.ClientScreenButton', function(require) { 'use strict'; - const { useState } = owl; const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + // Formerly ClientScreenWidget class ClientScreenButton extends PosComponent { constructor() { diff --git a/addons/point_of_sale/static/src/js/ChromeWidgets/DebugWidget.js b/addons/point_of_sale/static/src/js/ChromeWidgets/DebugWidget.js index 5cbebde9141..e0bd12df195 100644 --- a/addons/point_of_sale/static/src/js/ChromeWidgets/DebugWidget.js +++ b/addons/point_of_sale/static/src/js/ChromeWidgets/DebugWidget.js @@ -1,14 +1,14 @@ odoo.define('point_of_sale.DebugWidget', function (require) { 'use strict'; - const { useState } = owl; - const { useRef } = owl.hooks; const { getFileAsText } = require('point_of_sale.utils'); const { parse } = require('web.field_utils'); const NumberBuffer = require('point_of_sale.NumberBuffer'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useRef, useState } = owl; + class DebugWidget extends PosComponent { constructor() { super(...arguments); diff --git a/addons/point_of_sale/static/src/js/ChromeWidgets/ProxyStatus.js b/addons/point_of_sale/static/src/js/ChromeWidgets/ProxyStatus.js index 98c24c025e4..5eb51e60d08 100644 --- a/addons/point_of_sale/static/src/js/ChromeWidgets/ProxyStatus.js +++ b/addons/point_of_sale/static/src/js/ChromeWidgets/ProxyStatus.js @@ -1,10 +1,11 @@ odoo.define('point_of_sale.ProxyStatus', function(require) { 'use strict'; - const { useState } = owl; const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + // Previously ProxyStatusWidget class ProxyStatus extends PosComponent { constructor() { diff --git a/addons/point_of_sale/static/src/js/ChromeWidgets/SyncNotification.js b/addons/point_of_sale/static/src/js/ChromeWidgets/SyncNotification.js index 5a4e158de3b..28b3e5e54d1 100644 --- a/addons/point_of_sale/static/src/js/ChromeWidgets/SyncNotification.js +++ b/addons/point_of_sale/static/src/js/ChromeWidgets/SyncNotification.js @@ -1,10 +1,11 @@ odoo.define('point_of_sale.SyncNotification', function(require) { 'use strict'; - const { useState } = owl; const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + // Previously SynchNotificationWidget class SyncNotification extends PosComponent { constructor() { diff --git a/addons/point_of_sale/static/src/js/Gui.js b/addons/point_of_sale/static/src/js/Gui.js index 659f735a05e..c2c039768cd 100644 --- a/addons/point_of_sale/static/src/js/Gui.js +++ b/addons/point_of_sale/static/src/js/Gui.js @@ -1,9 +1,11 @@ odoo.define('point_of_sale.Gui', function (require) { 'use strict'; + const { Component, component } = owl; + /** * This module bridges the data classes (such as those defined in - * models.js) to the view (owl.Component) but not vice versa. + * models.js) to the view (Component) but not vice versa. * * The idea is to be able to perform side-effects to the user interface * during calculation. Think of console.log during times we want to see @@ -29,7 +31,7 @@ odoo.define('point_of_sale.Gui', function (require) { /** * Call this when the user interface is ready. Provide the component * that will be used to control the ui. - * @param {owl.component} component component having the ui methods. + * @param {component} component component having the ui methods. */ const configureGui = ({ component }) => { config.component = component; diff --git a/addons/point_of_sale/static/src/js/Misc/AbstractReceiptScreen.js b/addons/point_of_sale/static/src/js/Misc/AbstractReceiptScreen.js index 2ebdce20e3f..f0935be8214 100644 --- a/addons/point_of_sale/static/src/js/Misc/AbstractReceiptScreen.js +++ b/addons/point_of_sale/static/src/js/Misc/AbstractReceiptScreen.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.AbstractReceiptScreen', function (require) { 'use strict'; - const { useRef } = owl.hooks; const { nextFrame } = require('point_of_sale.utils'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useRef } = owl; + /** * This relies on the assumption that there is a reference to * `order-receipt` so it is important to declare a `t-ref` to diff --git a/addons/point_of_sale/static/src/js/Misc/Draggable.js b/addons/point_of_sale/static/src/js/Misc/Draggable.js index cbb1eba85f8..f7e092304ee 100644 --- a/addons/point_of_sale/static/src/js/Misc/Draggable.js +++ b/addons/point_of_sale/static/src/js/Misc/Draggable.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.Draggable', function(require) { 'use strict'; - const { useExternalListener } = owl.hooks; const { useListener } = require('web.custom_hooks'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useExternalListener } = owl; + /** * Wrap an element or a component with { position: absolute } to make it * draggable around the limitArea or the nearest positioned ancestor. diff --git a/addons/point_of_sale/static/src/js/Misc/NumberBuffer.js b/addons/point_of_sale/static/src/js/Misc/NumberBuffer.js index b8e78959f42..b45a8329cf2 100644 --- a/addons/point_of_sale/static/src/js/Misc/NumberBuffer.js +++ b/addons/point_of_sale/static/src/js/Misc/NumberBuffer.js @@ -1,15 +1,13 @@ odoo.define('point_of_sale.NumberBuffer', function(require) { 'use strict'; - const { Component } = owl; - const { EventBus } = owl.core; - const { onMounted, onWillUnmount, useExternalListener } = owl.hooks; const { useListener } = require('web.custom_hooks'); const { parse } = require('web.field_utils'); const { BarcodeEvents } = require('barcodes.BarcodeEvents'); const { _t } = require('web.core'); const { Gui } = require('point_of_sale.Gui'); + const { Component, EventBus, onMounted, onWillUnmount, useExternalListener } = owl; const INPUT_KEYS = new Set( ['Delete', 'Backspace', '+1', '+2', '+5', '+10', '+20', '+50'].concat('0123456789+-.,'.split('')) ); diff --git a/addons/point_of_sale/static/src/js/Misc/SearchBar.js b/addons/point_of_sale/static/src/js/Misc/SearchBar.js index 74fcb79ff9f..262573f09c4 100644 --- a/addons/point_of_sale/static/src/js/Misc/SearchBar.js +++ b/addons/point_of_sale/static/src/js/Misc/SearchBar.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.SearchBar', function (require) { 'use strict'; - const { useState, useExternalListener } = owl.hooks; const { useListener } = require('web.custom_hooks'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useExternalListener, useState } = owl; + /** * This is a simple configurable search bar component. It has search fields * and selection filter. Search fields allow the users to specify the type diff --git a/addons/point_of_sale/static/src/js/PopupControllerMixin.js b/addons/point_of_sale/static/src/js/PopupControllerMixin.js index 446a514aa46..428430fb241 100644 --- a/addons/point_of_sale/static/src/js/PopupControllerMixin.js +++ b/addons/point_of_sale/static/src/js/PopupControllerMixin.js @@ -1,9 +1,10 @@ odoo.define('point_of_sale.PopupControllerMixin', function(require) { 'use strict'; - const { useState } = owl; const { useListener } = require('web.custom_hooks'); + const { useState } = owl; + /** * Allows the component declared with this mixin the ability show popup dynamically, * provided the following: diff --git a/addons/point_of_sale/static/src/js/Popups/AbstractAwaitablePopup.js b/addons/point_of_sale/static/src/js/Popups/AbstractAwaitablePopup.js index fbbcaa10d71..95de85b634b 100644 --- a/addons/point_of_sale/static/src/js/Popups/AbstractAwaitablePopup.js +++ b/addons/point_of_sale/static/src/js/Popups/AbstractAwaitablePopup.js @@ -1,9 +1,10 @@ odoo.define('point_of_sale.AbstractAwaitablePopup', function (require) { 'use strict'; - const { useExternalListener } = owl.hooks; const PosComponent = require('point_of_sale.PosComponent'); + const { useExternalListener, xml } = owl; + /** * Implement this abstract class by extending it like so: * ```js @@ -12,7 +13,7 @@ odoo.define('point_of_sale.AbstractAwaitablePopup', function (require) { * return 'result'; * } * } - * ConcretePopup.template = owl.tags.xml` + * ConcretePopup.template = xml` *
* * diff --git a/addons/point_of_sale/static/src/js/Popups/CashMovePopup.js b/addons/point_of_sale/static/src/js/Popups/CashMovePopup.js index 7c46d92b2e2..bc930a30466 100644 --- a/addons/point_of_sale/static/src/js/Popups/CashMovePopup.js +++ b/addons/point_of_sale/static/src/js/Popups/CashMovePopup.js @@ -6,15 +6,17 @@ odoo.define('point_of_sale.CashMovePopup', function (require) { const { _t } = require('web.core'); const { parse } = require('web.field_utils'); + const { useRef, useState } = owl; + class CashMovePopup extends AbstractAwaitablePopup { setup() { - this.state = owl.hooks.useState({ + this.state = useState({ inputType: '', // '' | 'in' | 'out' inputAmount: '', inputReason: '', inputHasError: false, }); - this.inputAmountRef = owl.hooks.useRef('input-amount-ref'); + this.inputAmountRef = useRef('input-amount-ref'); } confirm() { try { diff --git a/addons/point_of_sale/static/src/js/Popups/CashOpeningPopup.js b/addons/point_of_sale/static/src/js/Popups/CashOpeningPopup.js index 0c5f4e82be1..5e527556bc3 100644 --- a/addons/point_of_sale/static/src/js/Popups/CashOpeningPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/CashOpeningPopup.js @@ -1,10 +1,10 @@ odoo.define('point_of_sale.CashOpeningPopup', function(require) { 'use strict'; - const { useState, useRef } = owl.hooks; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); + const { useRef, useState } = owl; class CashOpeningPopup extends AbstractAwaitablePopup { constructor() { diff --git a/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js b/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js index 0ae622cd392..720c38d9a4b 100644 --- a/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/ClosePosPopup.js @@ -1,12 +1,13 @@ odoo.define('point_of_sale.ClosePosPopup', function(require) { 'use strict'; - const { useState, useRef } = owl.hooks; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); const { identifyError } = require('point_of_sale.utils'); const { ConnectionLostError, ConnectionAbortedError} = require('@web/core/network/rpc_service') + const { useRef, useState } = owl; + /** * This popup needs to be self-dependent because it needs to be called from different place. */ diff --git a/addons/point_of_sale/static/src/js/Popups/EditListPopup.js b/addons/point_of_sale/static/src/js/Popups/EditListPopup.js index 46e5f627c6f..01a279f8ce8 100644 --- a/addons/point_of_sale/static/src/js/Popups/EditListPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/EditListPopup.js @@ -1,12 +1,13 @@ odoo.define('point_of_sale.EditListPopup', function(require) { 'use strict'; - const { useState } = owl.hooks; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); const { useAutoFocusToLast } = require('point_of_sale.custom_hooks'); const { _lt } = require('@web/core/l10n/translation'); + const { useState } = owl; + /** * Given a array of { id, text }, we show the user this popup to be able to modify this given array. * (used to replace PackLotLinePopupWidget) diff --git a/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js b/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js index c2f71652936..fd8f6127d5d 100644 --- a/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/MoneyDetailsPopup.js @@ -1,10 +1,11 @@ odoo.define('point_of_sale.MoneyDetailsPopup', function(require) { 'use strict'; - const { useState } = owl.hooks; const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + /** * Even if this component has a "confirm and cancel"-like buttons, this should not be an AbstractAwaitablePopup. * We currently cannot show two popups at the same time, what we do is mount this component with its parent diff --git a/addons/point_of_sale/static/src/js/Popups/NumberPopup.js b/addons/point_of_sale/static/src/js/Popups/NumberPopup.js index 216f61db883..267ac299dbd 100644 --- a/addons/point_of_sale/static/src/js/Popups/NumberPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/NumberPopup.js @@ -3,12 +3,13 @@ odoo.define('point_of_sale.NumberPopup', function(require) { var core = require('web.core'); var _t = core._t; - const { useState } = owl; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const NumberBuffer = require('point_of_sale.NumberBuffer'); const { useListener } = require('web.custom_hooks'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + // formerly NumberPopupWidget class NumberPopup extends AbstractAwaitablePopup { /** diff --git a/addons/point_of_sale/static/src/js/Popups/ProductConfiguratorPopup.js b/addons/point_of_sale/static/src/js/Popups/ProductConfiguratorPopup.js index b04e55d8929..4ffca834817 100644 --- a/addons/point_of_sale/static/src/js/Popups/ProductConfiguratorPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/ProductConfiguratorPopup.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.ProductConfiguratorPopup', function(require) { 'use strict'; - const { useState, useSubEnv } = owl.hooks; const PosComponent = require('point_of_sale.PosComponent'); const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); + const { useState, useSubEnv } = owl; + class ProductConfiguratorPopup extends AbstractAwaitablePopup { constructor() { super(...arguments); diff --git a/addons/point_of_sale/static/src/js/Popups/SelectionPopup.js b/addons/point_of_sale/static/src/js/Popups/SelectionPopup.js index f57f729f581..30ad70b1b15 100644 --- a/addons/point_of_sale/static/src/js/Popups/SelectionPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/SelectionPopup.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.SelectionPopup', function (require) { 'use strict'; - const { useState } = owl.hooks; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); const { _lt } = require('@web/core/l10n/translation'); + const { useState } = owl; + // formerly SelectionPopupWidget class SelectionPopup extends AbstractAwaitablePopup { /** diff --git a/addons/point_of_sale/static/src/js/Popups/TextAreaPopup.js b/addons/point_of_sale/static/src/js/Popups/TextAreaPopup.js index cbeb9528309..b62b1f248ab 100644 --- a/addons/point_of_sale/static/src/js/Popups/TextAreaPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/TextAreaPopup.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.TextAreaPopup', function(require) { 'use strict'; - const { useState, useRef } = owl.hooks; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); const { _lt } = require('@web/core/l10n/translation'); + const { useRef, useState } = owl; + // formerly TextAreaPopupWidget // IMPROVEMENT: This code is very similar to TextInputPopup. // Combining them would reduce the code. diff --git a/addons/point_of_sale/static/src/js/Popups/TextInputPopup.js b/addons/point_of_sale/static/src/js/Popups/TextInputPopup.js index 2a121052499..f01dbd3090f 100644 --- a/addons/point_of_sale/static/src/js/Popups/TextInputPopup.js +++ b/addons/point_of_sale/static/src/js/Popups/TextInputPopup.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.TextInputPopup', function(require) { 'use strict'; - const { useState, useRef } = owl.hooks; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); const { _lt } = require('@web/core/l10n/translation'); + const { useRef, useState } = owl; + // formerly TextInputPopupWidget class TextInputPopup extends AbstractAwaitablePopup { constructor() { diff --git a/addons/point_of_sale/static/src/js/Screens/ClientListScreen/ClientListScreen.js b/addons/point_of_sale/static/src/js/Screens/ClientListScreen/ClientListScreen.js index 02dd6be189c..9c18b677c3b 100644 --- a/addons/point_of_sale/static/src/js/Screens/ClientListScreen/ClientListScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/ClientListScreen/ClientListScreen.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.ClientListScreen', function(require) { 'use strict'; - const { debounce } = owl.utils; const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); const { useListener } = require('web.custom_hooks'); + const { Observer, debounce } = owl; + /** * Render this screen using `showTempScreen` to select client. * When the shown screen is confirmed ('Set Customer' or 'Deselect Customer' @@ -31,7 +32,7 @@ odoo.define('point_of_sale.ClientListScreen', function(require) { // We are not using useState here because the object // passed to useState converts the object and its contents // to Observer proxy. Not sure of the side-effects of making - // a persistent object, such as pos, into owl.Observer. But it + // a persistent object, such as pos, into Observer. But it // is better to be safe. this.state = { query: null, diff --git a/addons/point_of_sale/static/src/js/Screens/ProductScreen/OrderWidget.js b/addons/point_of_sale/static/src/js/Screens/ProductScreen/OrderWidget.js index ee610afde01..ae3bb3fe1da 100644 --- a/addons/point_of_sale/static/src/js/Screens/ProductScreen/OrderWidget.js +++ b/addons/point_of_sale/static/src/js/Screens/ProductScreen/OrderWidget.js @@ -1,12 +1,13 @@ odoo.define('point_of_sale.OrderWidget', function(require) { 'use strict'; - const { useState, useRef, onPatched } = owl.hooks; const { useListener } = require('web.custom_hooks'); const { onChangeOrder } = require('point_of_sale.custom_hooks'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { onPatched, useRef, useState } = owl; + class OrderWidget extends PosComponent { constructor() { super(...arguments); diff --git a/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductScreen.js b/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductScreen.js index 2bdd5ce4771..d713516a046 100644 --- a/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductScreen.js @@ -8,9 +8,10 @@ odoo.define('point_of_sale.ProductScreen', function(require) { const Registries = require('point_of_sale.Registries'); const { onChangeOrder, useBarcodeReader } = require('point_of_sale.custom_hooks'); const { isConnectionError, posbus } = require('point_of_sale.utils'); - const { useState, onMounted } = owl.hooks; const { parse } = require('web.field_utils'); + const { onMounted, useState } = owl; + class ProductScreen extends ControlButtonsMixin(PosComponent) { constructor() { super(...arguments); diff --git a/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidget.js b/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidget.js index 8271fb12c96..4f32841191d 100644 --- a/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidget.js +++ b/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidget.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.ProductsWidget', function(require) { 'use strict'; - const { useState } = owl.hooks; const PosComponent = require('point_of_sale.PosComponent'); const { useListener } = require('web.custom_hooks'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + class ProductsWidget extends PosComponent { /** * @param {Object} props diff --git a/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidgetControlPanel.js b/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidgetControlPanel.js index 1d65174405a..645c97c5ac3 100644 --- a/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidgetControlPanel.js +++ b/addons/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidgetControlPanel.js @@ -1,14 +1,14 @@ odoo.define('point_of_sale.ProductsWidgetControlPanel', function(require) { 'use strict'; - const { useRef } = owl.hooks; - const { debounce } = owl.utils; const { identifyError } = require('point_of_sale.utils'); const { ConnectionLostError, ConnectionAbortedError } = require('@web/core/network/rpc_service'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); const { posbus } = require('point_of_sale.utils'); + const { debounce, useRef } = owl; + class ProductsWidgetControlPanel extends PosComponent { constructor() { super(...arguments); diff --git a/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js b/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js index 8649f69e97e..b4112552ca2 100644 --- a/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js @@ -3,11 +3,11 @@ odoo.define('point_of_sale.ReceiptScreen', function (require) { const { Printer } = require('point_of_sale.Printer'); const { is_email } = require('web.utils'); - const { useRef, useContext } = owl.hooks; const { useErrorHandlers, onChangeOrder } = require('point_of_sale.custom_hooks'); const Registries = require('point_of_sale.Registries'); const AbstractReceiptScreen = require('point_of_sale.AbstractReceiptScreen'); + const { useContext, useRef } = owl; const ReceiptScreen = (AbstractReceiptScreen) => { class ReceiptScreen extends AbstractReceiptScreen { constructor() { diff --git a/addons/point_of_sale/static/src/js/Screens/ScaleScreen/ScaleScreen.js b/addons/point_of_sale/static/src/js/Screens/ScaleScreen/ScaleScreen.js index f9b1ea97fb0..138056e201b 100644 --- a/addons/point_of_sale/static/src/js/Screens/ScaleScreen/ScaleScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/ScaleScreen/ScaleScreen.js @@ -1,11 +1,12 @@ odoo.define('point_of_sale.ScaleScreen', function(require) { 'use strict'; - const { useState, useExternalListener } = owl.hooks; const PosComponent = require('point_of_sale.PosComponent'); const { round_precision: round_pr } = require('web.utils'); const Registries = require('point_of_sale.Registries'); + const { useExternalListener, useState } = owl; + class ScaleScreen extends PosComponent { /** * @param {Object} props diff --git a/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js b/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js index 674a8712799..2698afb906d 100644 --- a/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js +++ b/addons/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js @@ -1,7 +1,6 @@ odoo.define('point_of_sale.TicketScreen', function (require) { 'use strict'; - const { useState } = owl.hooks; const models = require('point_of_sale.models'); const Registries = require('point_of_sale.Registries'); const IndependentToOrderScreen = require('point_of_sale.IndependentToOrderScreen'); @@ -10,6 +9,7 @@ odoo.define('point_of_sale.TicketScreen', function (require) { const { posbus } = require('point_of_sale.utils'); const { parse } = require('web.field_utils'); + const { useState } = owl; class TicketScreen extends IndependentToOrderScreen { constructor() { diff --git a/addons/point_of_sale/static/src/js/chrome_adapter.js b/addons/point_of_sale/static/src/js/chrome_adapter.js index d142b31fdac..22ac0b78e2f 100644 --- a/addons/point_of_sale/static/src/js/chrome_adapter.js +++ b/addons/point_of_sale/static/src/js/chrome_adapter.js @@ -6,13 +6,14 @@ import Chrome from "point_of_sale.Chrome"; import Registries from "point_of_sale.Registries"; import { configureGui } from "point_of_sale.Gui"; import { useBus } from "@web/core/utils/hooks"; -const { Component } = owl; import { registry } from "@web/core/registry"; +const { Component, debounce, onMounted, useRef, xml } = owl; + function setupResponsivePlugin(env) { const isMobile = () => window.innerWidth <= 768; env.isMobile = isMobile(); - const updateEnv = owl.utils.debounce(() => { + const updateEnv = debounce(() => { if (env.isMobile !== isMobile()) { env.isMobile = !env.isMobile; env.qweb.forceUpdate(); @@ -26,12 +27,12 @@ export class ChromeAdapter extends Component { this.PosChrome = Registries.Component.get(Chrome); this.legacyActionManager = useService("legacy_action_manager"); - this.env = owl.Component.env; + this.env = Component.env; useBus(this.env.qweb, "update", () => this.render()); setupResponsivePlugin(this.env); - const chrome = owl.hooks.useRef("chrome"); - owl.hooks.onMounted(async () => { + const chrome = useRef("chrome"); + onMounted(async () => { // Add the pos error handler when the chrome component is available. registry.category('error_handlers').add( 'posErrorHandler', @@ -52,4 +53,4 @@ export class ChromeAdapter extends Component { }); } } -ChromeAdapter.template = owl.tags.xml``; +ChromeAdapter.template = xml``; diff --git a/addons/point_of_sale/static/src/js/custom_hooks.js b/addons/point_of_sale/static/src/js/custom_hooks.js index c1e87b24ecb..1988e1b4462 100644 --- a/addons/point_of_sale/static/src/js/custom_hooks.js +++ b/addons/point_of_sale/static/src/js/custom_hooks.js @@ -1,8 +1,7 @@ odoo.define('point_of_sale.custom_hooks', function (require) { 'use strict'; - const { Component } = owl; - const { onMounted, onPatched, onWillUnmount } = owl.hooks; + const { Component, onMounted, onPatched, onWillUnmount } = owl; /** * Introduce error handlers in the component. diff --git a/addons/point_of_sale/static/src/js/main.js b/addons/point_of_sale/static/src/js/main.js index 633b3e7a40b..207c4043224 100644 --- a/addons/point_of_sale/static/src/js/main.js +++ b/addons/point_of_sale/static/src/js/main.js @@ -6,14 +6,16 @@ import { ChromeAdapter } from "@point_of_sale/js/chrome_adapter"; import Registries from "point_of_sale.Registries"; import { registry } from "@web/core/registry"; +const { Component, Portal, xml } = owl; + // For consistency's sake, we should trigger"WEB_CLIENT_READY" on the bus when PosApp is mounted // But we can't since mail and some other poll react on that cue, and we don't want those services started -class PosApp extends owl.Component { +class PosApp extends Component { setup() { this.Components = registry.category("main_components").getEntries(); } } -PosApp.template = owl.tags.xml` +PosApp.template = xml`
@@ -26,7 +28,7 @@ PosApp.template = owl.tags.xml` PosApp.components = { ChromeAdapter }; function startPosApp() { - Registries.Component.add(owl.misc.Portal); + Registries.Component.add(Portal); Registries.Component.freeze(); startWebClient(PosApp); } diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 1858f991656..51af1335922 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -2,7 +2,6 @@ odoo.define('point_of_sale.models', function (require) { "use strict"; -const { Context } = owl; var BarcodeParser = require('barcodes.BarcodeParser'); var BarcodeReader = require('point_of_sale.BarcodeReader'); var PosDB = require('point_of_sale.DB'); @@ -15,6 +14,8 @@ var time = require('web.time'); var utils = require('web.utils'); var { Gui } = require('point_of_sale.Gui'); +const { Context } = owl; + var QWeb = core.qweb; var _t = core._t; var Mutex = concurrency.Mutex; diff --git a/addons/point_of_sale/static/src/js/utils.js b/addons/point_of_sale/static/src/js/utils.js index d0f2deedf5f..f91151e6ec1 100644 --- a/addons/point_of_sale/static/src/js/utils.js +++ b/addons/point_of_sale/static/src/js/utils.js @@ -1,9 +1,10 @@ odoo.define('point_of_sale.utils', function (require) { 'use strict'; - const { EventBus } = owl.core; const { ConnectionAbortedError, ConnectionLostError } = require('@web/core/network/rpc_service'); + const { EventBus } = owl; + function getFileAsText(file) { return new Promise((resolve, reject) => { if (!file) { diff --git a/addons/point_of_sale/static/tests/unit/helpers/test_env.js b/addons/point_of_sale/static/tests/unit/helpers/test_env.js index c4b0b3ecef6..1f746334b40 100644 --- a/addons/point_of_sale/static/tests/unit/helpers/test_env.js +++ b/addons/point_of_sale/static/tests/unit/helpers/test_env.js @@ -13,7 +13,9 @@ odoo.define('point_of_sale.test_env', async function (require) { const models = require('point_of_sale.models'); const Registries = require('point_of_sale.Registries'); - Registries.Component.add(owl.misc.Portal); + const { Portal } = owl; + + Registries.Component.add(Portal); await env.session.is_bound; const pos = new models.PosModel({ diff --git a/addons/point_of_sale/static/tests/unit/test_ChromeWidgets.js b/addons/point_of_sale/static/tests/unit/test_ChromeWidgets.js index dbfa6dde611..0b799315014 100644 --- a/addons/point_of_sale/static/tests/unit/test_ChromeWidgets.js +++ b/addons/point_of_sale/static/tests/unit/test_ChromeWidgets.js @@ -5,7 +5,8 @@ odoo.define('point_of_sale.tests.ChromeWidgets', function (require) { const PopupControllerMixin = require('point_of_sale.PopupControllerMixin'); const testUtils = require('web.test_utils'); const makePosTestEnv = require('point_of_sale.test_env'); - const { xml } = owl.tags; + + const { xml } = owl; QUnit.module('unit tests for Chrome Widgets', {}); diff --git a/addons/point_of_sale/static/tests/unit/test_NumberBuffer.js b/addons/point_of_sale/static/tests/unit/test_NumberBuffer.js index 1e9da1e6b02..fb7e8e36b35 100644 --- a/addons/point_of_sale/static/tests/unit/test_NumberBuffer.js +++ b/addons/point_of_sale/static/tests/unit/test_NumberBuffer.js @@ -1,12 +1,12 @@ odoo.define('point_of_sale.tests.NumberBuffer', function(require) { 'use strict'; - const { Component, useState } = owl; - const { xml } = owl.tags; const NumberBuffer = require('point_of_sale.NumberBuffer'); const makeTestEnvironment = require('web.test_env'); const testUtils = require('web.test_utils'); + const { Component, useState, xml } = owl; + QUnit.module('unit tests for NumberBuffer', { before() {}, }); diff --git a/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js b/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js index 5dcc828b5fb..8e11147470f 100644 --- a/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js +++ b/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js @@ -6,8 +6,8 @@ odoo.define('point_of_sale.tests.PaymentScreen', function (require) { const { useListener } = require('web.custom_hooks'); const testUtils = require('web.test_utils'); const makePosTestEnv = require('point_of_sale.test_env'); - const { xml } = owl.tags; - const { useState } = owl; + + const { useState, xml } = owl; QUnit.module('unit tests for PaymentScreen components', {}); diff --git a/addons/point_of_sale/static/tests/unit/test_ProductScreen.js b/addons/point_of_sale/static/tests/unit/test_ProductScreen.js index bdd9b732b08..f371c9ec81a 100644 --- a/addons/point_of_sale/static/tests/unit/test_ProductScreen.js +++ b/addons/point_of_sale/static/tests/unit/test_ProductScreen.js @@ -6,8 +6,8 @@ odoo.define('point_of_sale.tests.ProductScreen', function (require) { const { useListener } = require('web.custom_hooks'); const testUtils = require('web.test_utils'); const makePosTestEnv = require('point_of_sale.test_env'); - const { xml } = owl.tags; - const { useState } = owl; + + const { useState, xml } = owl; QUnit.module('unit tests for ProductScreen components', {}); diff --git a/addons/point_of_sale/static/tests/unit/test_popups.js b/addons/point_of_sale/static/tests/unit/test_popups.js index 9d299563fcb..5a5c98b2c4c 100644 --- a/addons/point_of_sale/static/tests/unit/test_popups.js +++ b/addons/point_of_sale/static/tests/unit/test_popups.js @@ -6,7 +6,8 @@ odoo.define('point_of_sale.test_popups', function(require) { const PosComponent = require('point_of_sale.PosComponent'); const PopupControllerMixin = require('point_of_sale.PopupControllerMixin'); const makePosTestEnv = require('point_of_sale.test_env'); - const { xml } = owl.tags; + + const { xml } = owl; QUnit.module('unit tests for Popups', { before() { diff --git a/addons/pos_gift_card/static/src/js/GiftCardPopup.js b/addons/pos_gift_card/static/src/js/GiftCardPopup.js index 1adfdbb919f..a77ed3b26d2 100644 --- a/addons/pos_gift_card/static/src/js/GiftCardPopup.js +++ b/addons/pos_gift_card/static/src/js/GiftCardPopup.js @@ -1,10 +1,11 @@ odoo.define("pos_gift_card.GiftCardPopup", function (require) { "use strict"; - const { useState, useRef } = owl.hooks; const AbstractAwaitablePopup = require("point_of_sale.AbstractAwaitablePopup"); const Registries = require("point_of_sale.Registries"); + const { useState } = owl; + class GiftCardPopup extends AbstractAwaitablePopup { constructor() { super(...arguments); diff --git a/addons/pos_hr/static/src/js/HeaderLockButton.js b/addons/pos_hr/static/src/js/HeaderLockButton.js index 3ad0ee9f02b..ab50033977b 100644 --- a/addons/pos_hr/static/src/js/HeaderLockButton.js +++ b/addons/pos_hr/static/src/js/HeaderLockButton.js @@ -3,6 +3,7 @@ odoo.define('point_of_sale.HeaderLockButton', function(require) { const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; class HeaderLockButton extends PosComponent { diff --git a/addons/pos_mercury/static/src/js/PaymentTransactionPopup.js b/addons/pos_mercury/static/src/js/PaymentTransactionPopup.js index 565c9928ae1..c14dd62c356 100644 --- a/addons/pos_mercury/static/src/js/PaymentTransactionPopup.js +++ b/addons/pos_mercury/static/src/js/PaymentTransactionPopup.js @@ -1,11 +1,12 @@ odoo.define('pos_mercury.PaymentTransactionPopup', function(require) { 'use strict'; - const { useState } = owl.hooks; const AbstractAwaitablePopup = require('point_of_sale.AbstractAwaitablePopup'); const Registries = require('point_of_sale.Registries'); const { _lt } = require('@web/core/l10n/translation'); + const { useState } = owl; + class PaymentTransactionPopup extends AbstractAwaitablePopup { constructor() { super(...arguments); diff --git a/addons/pos_restaurant/static/src/js/Resizeable.js b/addons/pos_restaurant/static/src/js/Resizeable.js index c651ae09101..5c9e5b5a356 100644 --- a/addons/pos_restaurant/static/src/js/Resizeable.js +++ b/addons/pos_restaurant/static/src/js/Resizeable.js @@ -1,11 +1,12 @@ odoo.define('pos_restaurant.Resizeable', function(require) { 'use strict'; - const { useExternalListener } = owl.hooks; const { useListener } = require('web.custom_hooks'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useExternalListener } = owl; + class Resizeable extends PosComponent { constructor() { super(...arguments); diff --git a/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditBar.js b/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditBar.js index 43b16d93c3e..1e3975f11ca 100644 --- a/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditBar.js +++ b/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditBar.js @@ -3,7 +3,8 @@ odoo.define('pos_restaurant.EditBar', function(require) { const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); - const { useState } = owl.hooks; + + const { useState } = owl; class EditBar extends PosComponent { constructor() { diff --git a/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditableTable.js b/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditableTable.js index 4aeb781d712..4a3cad35caa 100644 --- a/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditableTable.js +++ b/addons/pos_restaurant/static/src/js/Screens/FloorScreen/EditableTable.js @@ -1,11 +1,12 @@ odoo.define('pos_restaurant.EditableTable', function(require) { 'use strict'; - const { onPatched, onMounted } = owl.hooks; const { useListener } = require('web.custom_hooks'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { onMounted, onPatched } = owl; + class EditableTable extends PosComponent { constructor() { super(...arguments); diff --git a/addons/pos_restaurant/static/src/js/Screens/FloorScreen/FloorScreen.js b/addons/pos_restaurant/static/src/js/Screens/FloorScreen/FloorScreen.js index 0e91a0ed314..6baf79f3cdb 100644 --- a/addons/pos_restaurant/static/src/js/Screens/FloorScreen/FloorScreen.js +++ b/addons/pos_restaurant/static/src/js/Screens/FloorScreen/FloorScreen.js @@ -1,13 +1,13 @@ odoo.define('pos_restaurant.FloorScreen', function (require) { 'use strict'; - const { debounce } = owl.utils; const PosComponent = require('point_of_sale.PosComponent'); - const { useState, useRef } = owl.hooks; const { useListener } = require('web.custom_hooks'); const Registries = require('point_of_sale.Registries'); const { posbus } = require('point_of_sale.utils'); + const { debounce, useRef, useState } = owl; + class FloorScreen extends PosComponent { /** * @param {Object} props diff --git a/addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js b/addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js index f44af5bff7a..181e93ae69a 100644 --- a/addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js +++ b/addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js @@ -2,11 +2,12 @@ odoo.define('pos_restaurant.SplitBillScreen', function(require) { 'use strict'; const PosComponent = require('point_of_sale.PosComponent'); - const { useState } = owl.hooks; const { useListener } = require('web.custom_hooks'); const models = require('point_of_sale.models'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + class SplitBillScreen extends PosComponent { constructor() { super(...arguments); diff --git a/addons/pos_restaurant/static/src/js/Screens/TicketScreen.js b/addons/pos_restaurant/static/src/js/Screens/TicketScreen.js index 583775a5de3..50c515d397f 100644 --- a/addons/pos_restaurant/static/src/js/Screens/TicketScreen.js +++ b/addons/pos_restaurant/static/src/js/Screens/TicketScreen.js @@ -7,7 +7,8 @@ odoo.define('pos_restaurant.TicketScreen', function (require) { const { useAutofocus } = require('web.custom_hooks'); const { posbus } = require('point_of_sale.utils'); const { parse } = require('web.field_utils'); - const { useState, useContext } = owl.hooks; + + const { useContext, useState } = owl; const PosResTicketScreen = (TicketScreen) => class extends TicketScreen { diff --git a/addons/pos_restaurant/static/src/js/Screens/TipScreen.js b/addons/pos_restaurant/static/src/js/Screens/TipScreen.js index 32d5a44a621..0f74e26a3c4 100644 --- a/addons/pos_restaurant/static/src/js/Screens/TipScreen.js +++ b/addons/pos_restaurant/static/src/js/Screens/TipScreen.js @@ -4,7 +4,8 @@ odoo.define('pos_restaurant.TipScreen', function (require) { const Registries = require('point_of_sale.Registries'); const PosComponent = require('point_of_sale.PosComponent'); const { parse } = require('web.field_utils'); - const { useContext } = owl.hooks; + + const { useContext } = owl; class TipScreen extends PosComponent { constructor() { diff --git a/addons/pos_restaurant/static/tests/unit/test_FloorScreen.js b/addons/pos_restaurant/static/tests/unit/test_FloorScreen.js index 34f13671338..f606a09236b 100644 --- a/addons/pos_restaurant/static/tests/unit/test_FloorScreen.js +++ b/addons/pos_restaurant/static/tests/unit/test_FloorScreen.js @@ -5,8 +5,8 @@ odoo.define('pos_restaurant.tests.FloorScreen', function (require) { const { useListener } = require('web.custom_hooks'); const testUtils = require('web.test_utils'); const makePosTestEnv = require('point_of_sale.test_env'); - const { xml } = owl.tags; - const { useRef } = owl.hooks; + + const { useRef, xml } = owl; QUnit.module('FloorScreen components', {}); diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js b/addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js index b126a099094..99da464ae2d 100644 --- a/addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js +++ b/addons/pos_sale/static/src/js/OrderManagementScreen/MobileSaleOrderManagementScreen.js @@ -2,7 +2,8 @@ odoo.define('point_of_sale.MobileSaleOrderManagementScreen', function (require) const SaleOrderManagementScreen = require('pos_sale.SaleOrderManagementScreen'); const Registries = require('point_of_sale.Registries'); const { useListener } = require('web.custom_hooks'); - const { useState } = owl.hooks; + + const { useState } = owl; const MobileSaleOrderManagementScreen = (SaleOrderManagementScreen) => { class MobileSaleOrderManagementScreen extends SaleOrderManagementScreen { diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderFetcher.js b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderFetcher.js index 016231aea14..5881f87f9e6 100644 --- a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderFetcher.js +++ b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderFetcher.js @@ -1,11 +1,12 @@ odoo.define('pos_sale.SaleOrderFetcher', function (require) { 'use strict'; - const { EventBus } = owl.core; const { Gui } = require('point_of_sale.Gui'); const { isConnectionError } = require('point_of_sale.utils'); const models = require('point_of_sale.models'); + const { EventBus } = owl; + class SaleOrderFetcher extends EventBus { constructor() { super(); diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderList.js b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderList.js index 9019f19c279..746fe08667b 100644 --- a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderList.js +++ b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderList.js @@ -1,11 +1,12 @@ odoo.define('pos_sale.SaleOrderList', function (require) { 'use strict'; - const { useState } = owl.hooks; const { useListener } = require('web.custom_hooks'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); + const { useState } = owl; + /** * @props {models.Order} [initHighlightedOrder] initially highligted order * @props {Array} orders diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementControlPanel.js b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementControlPanel.js index a8340ba221d..5059b5d10fd 100644 --- a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementControlPanel.js +++ b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementControlPanel.js @@ -1,13 +1,14 @@ odoo.define('pos_sale.SaleOrderManagementControlPanel', function (require) { 'use strict'; - const { useContext } = owl.hooks; const { useAutofocus, useListener } = require('web.custom_hooks'); const PosComponent = require('point_of_sale.PosComponent'); const Registries = require('point_of_sale.Registries'); const SaleOrderFetcher = require('pos_sale.SaleOrderFetcher'); const contexts = require('point_of_sale.PosContext'); + const { useContext } = owl; + // NOTE: These are constants so that they are only instantiated once // and they can be used efficiently by the OrderManagementControlPanel. const VALID_SEARCH_TAGS = new Set(['date', 'customer', 'client', 'name', 'order']); diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementScreen.js b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementScreen.js index c03c61986bb..2e78249d205 100644 --- a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementScreen.js +++ b/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementScreen.js @@ -3,7 +3,6 @@ odoo.define('pos_sale.SaleOrderManagementScreen', function (require) { const { sprintf } = require('web.utils'); const { parse } = require('web.field_utils'); - const { useContext } = owl.hooks; const { useListener } = require('web.custom_hooks'); const ControlButtonsMixin = require('point_of_sale.ControlButtonsMixin'); const NumberBuffer = require('point_of_sale.NumberBuffer'); @@ -13,6 +12,8 @@ odoo.define('pos_sale.SaleOrderManagementScreen', function (require) { const contexts = require('point_of_sale.PosContext'); const models = require('point_of_sale.models'); + const { useContext } = owl; + class SaleOrderManagementScreen extends ControlButtonsMixin(IndependentToOrderScreen) { constructor() { super(...arguments); diff --git a/addons/project/static/src/js/right_panel/project_right_panel.js b/addons/project/static/src/js/right_panel/project_right_panel.js index 9ad3c66041f..3c4e3c4c48e 100644 --- a/addons/project/static/src/js/right_panel/project_right_panel.js +++ b/addons/project/static/src/js/right_panel/project_right_panel.js @@ -2,9 +2,10 @@ import { AddMilestone, OpenMilestone } from '@project/js/right_panel/project_utils'; import { formatFloat } from "@web/fields/formatters"; -const { useState } = owl.hooks; -export default class ProjectRightPanel extends owl.Component { +const { Component, useState } = owl; + +export default class ProjectRightPanel extends Component { constructor() { super(...arguments); this.context = this.props.action.context; diff --git a/addons/project/static/src/js/right_panel/project_utils.js b/addons/project/static/src/js/right_panel/project_utils.js index a1959945c23..bb249f6d39b 100644 --- a/addons/project/static/src/js/right_panel/project_utils.js +++ b/addons/project/static/src/js/right_panel/project_utils.js @@ -4,9 +4,10 @@ import { _lt } from 'web.core'; import fieldUtils from 'web.field_utils'; import { ComponentAdapter } from 'web.OwlCompatibility'; import { FormViewDialog } from 'web.view_dialogs'; -const { useState, useRef } = owl.hooks; -class MilestoneComponent extends owl.Component { +const { Component, useRef, useState } = owl; + +class MilestoneComponent extends Component { constructor() { super(...arguments); this.contextValue = Object.assign({}, { diff --git a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js b/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js index 34655f1f8d1..961507b5e7e 100644 --- a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js +++ b/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js @@ -5,7 +5,6 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component'; import Dialog from 'web.OwlDialog'; const { Component } = owl; -const { useRef } = owl.hooks; class SnailmailErrorDialog extends Component { diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index b328e3d5aaa..058172a6782 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -356,6 +356,7 @@ This module provides the core of the Odoo Web Client. 'web/static/lib/underscore.string/lib/underscore.string.js', 'web/static/lib/moment/moment.js', 'web/static/lib/owl/owl.js', + 'web/static/src/owl_next_adapter.js', 'web/static/src/legacy/js/component_extension.js', 'web/static/lib/jquery/jquery.js', 'web/static/lib/jquery.ui/jquery-ui.js', diff --git a/addons/web/static/src/core/assets.js b/addons/web/static/src/core/assets.js index 05ecbce0c00..a043970e3bd 100644 --- a/addons/web/static/src/core/assets.js +++ b/addons/web/static/src/core/assets.js @@ -1,11 +1,11 @@ /** @odoo-module **/ -const { useEnv, onWillStart } = owl.hooks; import { memoize } from "./utils/functions"; import { browser } from "./browser/browser"; -class AssetsLoadingError extends Error { -} +const { onWillStart, useEnv } = owl; + +class AssetsLoadingError extends Error {} //------------------------------------------------------------------------------ // Types @@ -116,7 +116,6 @@ export const loadBundleTemplates = memoize(async function loadBundleTemplates(na return processTemplates(templates); }); - /** * Loads the content definition of a bundle * @param {string} name the bundleName of the bundle as declared in the manifest. @@ -145,18 +144,22 @@ export async function loadBundle(name, options) { bundlesCache[name].templates = loadBundleTemplates(name); } - if (css && !bundlesCache[name].css || js && !bundlesCache[name].js) { + if ((css && !bundlesCache[name].css) || (js && !bundlesCache[name].js)) { // we only load the bundle info (that is an RPC) if JS or CSS is requested on the bundle, // and if it has not yet been requested. /** @type BundleInfo[] */ const bundleInfo = await loadBundleDefinition(name); if (options.js) { - bundlesCache[name].js = Promise.all(bundleInfo.filter((i) => i.type === "script").map((i) => loadJS(i.src))); + bundlesCache[name].js = Promise.all( + bundleInfo.filter((i) => i.type === "script").map((i) => loadJS(i.src)) + ); } if (options.css) { - bundlesCache[name].css = Promise.all(bundleInfo.filter((i) => i.type === "link").map((i) => loadCSS(i.src))); + bundlesCache[name].css = Promise.all( + bundleInfo.filter((i) => i.type === "link").map((i) => loadCSS(i.src)) + ); } } diff --git a/addons/web/static/src/core/commands/command_palette.js b/addons/web/static/src/core/commands/command_palette.js index 229716e27fb..7736bb683cd 100644 --- a/addons/web/static/src/core/commands/command_palette.js +++ b/addons/web/static/src/core/commands/command_palette.js @@ -8,8 +8,7 @@ import { fuzzyLookup } from "@web/core/utils/search"; import { debounce } from "@web/core/utils/timing"; import { _lt } from "@web/core/l10n/translation"; -const { Component, hooks } = owl; -const { onWillStart, useRef, useState } = hooks; +const { Component, onWillStart, useRef, useState } = owl; const DEFAULT_PLACEHOLDER = _lt("Search..."); const DEFAULT_EMPTY_MESSAGE = _lt("No result found"); @@ -21,7 +20,7 @@ const FUZZY_NAMESPACES = ["default"]; /** * @typedef {Command & { - * Component?: owl.Component; + * Component?: Component; * props?: object; * }} CommandItem */ diff --git a/addons/web/static/src/core/commands/command_palette_dialog.js b/addons/web/static/src/core/commands/command_palette_dialog.js index 848941d2bd9..b48c8275712 100644 --- a/addons/web/static/src/core/commands/command_palette_dialog.js +++ b/addons/web/static/src/core/commands/command_palette_dialog.js @@ -3,8 +3,7 @@ import { Dialog } from "@web/core/dialog/dialog"; import { CommandPalette } from "./command_palette"; -const { hooks } = owl; -const { useExternalListener } = hooks; +const { useExternalListener } = owl; /** * @typedef {import("./command_service").Command} Command diff --git a/addons/web/static/src/core/commands/command_service.js b/addons/web/static/src/core/commands/command_service.js index 7893dbd1b31..c3cc60d613f 100644 --- a/addons/web/static/src/core/commands/command_service.js +++ b/addons/web/static/src/core/commands/command_service.js @@ -2,9 +2,8 @@ import { registry } from "@web/core/registry"; import { CommandPaletteDialog } from "./command_palette_dialog"; -const { Component } = owl; -const { xml } = owl.tags; +const { Component, xml } = owl; /** * @typedef {import("./command_palette").CommandPaletteConfig} CommandPaletteConfig diff --git a/addons/web/static/src/core/datepicker/datepicker.js b/addons/web/static/src/core/datepicker/datepicker.js index 5e995bc850e..b063722ce1e 100644 --- a/addons/web/static/src/core/datepicker/datepicker.js +++ b/addons/web/static/src/core/datepicker/datepicker.js @@ -4,9 +4,8 @@ import { localization } from "@web/core/l10n/localization"; import { registry } from "@web/core/registry"; import { useAutofocus } from "@web/core/utils/hooks"; -const { Component, hooks } = owl; +const { Component, useExternalListener, useRef, useState } = owl; const { DateTime } = luxon; -const { useExternalListener, useRef, useState } = hooks; const formatters = registry.category("formatters"); const parsers = registry.category("parsers"); diff --git a/addons/web/static/src/core/debug/debug_context.js b/addons/web/static/src/core/debug/debug_context.js index a7593ec6131..626037c4fd2 100644 --- a/addons/web/static/src/core/debug/debug_context.js +++ b/addons/web/static/src/core/debug/debug_context.js @@ -4,7 +4,7 @@ import { registry } from "../registry"; import { memoize } from "../utils/functions"; import { useEffect } from "@web/core/utils/hooks"; -const { useEnv, useSubEnv } = owl.hooks; +const { useEnv, useSubEnv } = owl; const debugRegistry = registry.category("debug"); const getAccessRights = memoize(async function getAccessRights(orm) { diff --git a/addons/web/static/src/core/debug/profiling/profiling_service.js b/addons/web/static/src/core/debug/profiling/profiling_service.js index 4e76743c9cd..e0ee28ab286 100644 --- a/addons/web/static/src/core/debug/profiling/profiling_service.js +++ b/addons/web/static/src/core/debug/profiling/profiling_service.js @@ -4,7 +4,7 @@ import { registry } from "@web/core/registry"; import { ProfilingItem } from "./profiling_item"; import { session } from "@web/session"; -const { core } = owl; +const { EventBus } = owl; const profilingService = { dependencies: ["orm"], @@ -17,7 +17,7 @@ const profilingService = { return Boolean(state.session); }, }; - const bus = new core.EventBus(); + const bus = new EventBus(); let recordingIcon = null; function updateDebugIcon() { @@ -46,7 +46,8 @@ const profilingService = { params ); const resp = await orm.call("ir.profile", "set_profiling", [], kwargs); - if (resp.type) { // most likely an "ir.actions.act_window" + if (resp.type) { + // most likely an "ir.actions.act_window" env.services.action.doAction(resp); } else { state.session = resp.session; diff --git a/addons/web/static/src/core/dialog/dialog.js b/addons/web/static/src/core/dialog/dialog.js index a3aa9700f17..84a06818497 100644 --- a/addons/web/static/src/core/dialog/dialog.js +++ b/addons/web/static/src/core/dialog/dialog.js @@ -3,8 +3,7 @@ import { useHotkey } from "@web/core/hotkeys/hotkey_hook"; import { useActiveElement } from "../ui/ui_service"; -const { Component, hooks } = owl; -const { useRef, useSubEnv } = hooks; +const { Component, useRef, useSubEnv, xml } = owl; export class Dialog extends Component { setup() { @@ -46,5 +45,5 @@ Dialog.renderHeader = true; Dialog.size = "modal-lg"; Dialog.technical = true; Dialog.title = "Odoo"; -Dialog.bodyTemplate = owl.tags.xml`
`; +Dialog.bodyTemplate = xml`
`; Dialog.footerTemplate = "web.DialogFooterDefault"; diff --git a/addons/web/static/src/core/dialog/dialog_container.js b/addons/web/static/src/core/dialog/dialog_container.js index 434725440cf..745bbcc771e 100644 --- a/addons/web/static/src/core/dialog/dialog_container.js +++ b/addons/web/static/src/core/dialog/dialog_container.js @@ -2,7 +2,7 @@ import { ErrorHandler, NotUpdatable } from "../utils/components"; -const { Component, tags } = owl; +const { Component, xml } = owl; export class DialogContainer extends Component { setup() { @@ -23,7 +23,7 @@ export class DialogContainer extends Component { } } DialogContainer.components = { ErrorHandler, NotUpdatable }; -DialogContainer.template = tags.xml` +DialogContainer.template = xml`
diff --git a/addons/web/static/src/core/dialog/dialog_service.js b/addons/web/static/src/core/dialog/dialog_service.js index bb6145f6c10..b55faa0ef4d 100644 --- a/addons/web/static/src/core/dialog/dialog_service.js +++ b/addons/web/static/src/core/dialog/dialog_service.js @@ -4,8 +4,7 @@ import { registry } from "../registry"; import { Dialog } from "./dialog"; import { DialogContainer } from "./dialog_container"; -const { core } = owl; -const { EventBus } = core; +const { EventBus } = owl; /** * @typedef {{ diff --git a/addons/web/static/src/core/dropdown/dropdown.js b/addons/web/static/src/core/dropdown/dropdown.js index 455006d2e04..a5a65f0972c 100644 --- a/addons/web/static/src/core/dropdown/dropdown.js +++ b/addons/web/static/src/core/dropdown/dropdown.js @@ -5,9 +5,16 @@ import { usePosition } from "../position/position_hook"; import { useDropdownNavigation } from "./dropdown_navigation_hook"; import { localization } from "../l10n/localization"; -const { Component, core, hooks, useState, QWeb } = owl; -const { EventBus } = core; -const { onWillStart, useExternalListener, useRef, useSubEnv } = hooks; +const { + Component, + EventBus, + QWeb, + onWillStart, + useExternalListener, + useRef, + useState, + useSubEnv, +} = owl; const DIRECTION_CARET_CLASS = { bottom: "dropdown", diff --git a/addons/web/static/src/core/dropdown/dropdown_item.js b/addons/web/static/src/core/dropdown/dropdown_item.js index e0e6babafad..c7521b740b9 100644 --- a/addons/web/static/src/core/dropdown/dropdown_item.js +++ b/addons/web/static/src/core/dropdown/dropdown_item.js @@ -1,5 +1,6 @@ /** @odoo-module **/ import { DROPDOWN } from "./dropdown"; + const { Component, QWeb } = owl; /** diff --git a/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js b/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js index 055be6cf1e3..db2571ba7c8 100644 --- a/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js +++ b/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js @@ -5,6 +5,8 @@ import { browser } from "../browser/browser"; import { localization } from "@web/core/l10n/localization"; import { scrollTo } from "../utils/scrolling"; +const { useComponent, useRef } = owl; + /** * @typedef {{ * el: HTMLElement, @@ -18,9 +20,6 @@ import { scrollTo } from "../utils/scrolling"; * }} MenuElement */ -const { hooks } = owl; -const { useComponent, useRef } = hooks; - const ACTIVE_MENU_ELEMENT_CLASS = "focus"; const MENU_ELEMENTS_SELECTORS = [":scope > .dropdown-item", ":scope > .dropdown"]; const NEXT_ACTIVE_INDEX_FNS = { diff --git a/addons/web/static/src/core/effects/effect_container.js b/addons/web/static/src/core/effects/effect_container.js index 96cd44b02bf..5fa9c83d0d3 100644 --- a/addons/web/static/src/core/effects/effect_container.js +++ b/addons/web/static/src/core/effects/effect_container.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -const { Component, tags } = owl; +const { Component, xml } = owl; export class EffectContainer extends Component { setup() { @@ -16,7 +16,7 @@ export class EffectContainer extends Component { } } -EffectContainer.template = tags.xml` +EffectContainer.template = xml`
diff --git a/addons/web/static/src/core/effects/effect_service.js b/addons/web/static/src/core/effects/effect_service.js index e789e77db1c..aa8f46801e5 100644 --- a/addons/web/static/src/core/effects/effect_service.js +++ b/addons/web/static/src/core/effects/effect_service.js @@ -4,7 +4,7 @@ import { registry } from "../registry"; import { EffectContainer } from "./effect_container"; import { RainbowMan } from "./rainbow_man"; -const { EventBus } = owl.core; +const { Component, EventBus } = owl; const effectRegistry = registry.category("effects"); @@ -32,7 +32,7 @@ const effectRegistry = registry.category("effects"); * 'fast' will make rainbowman dissapear quickly * 'medium' and 'slow' will wait little longer before disappearing (can be used when options.message is longer) * 'no' will keep rainbowman on screen until user clicks anywhere outside rainbowman - * @param {owl.Component} [params.Component] + * @param {Component} [params.Component] * Custom Component class to instantiate inside the Rainbow Man * @param {Object} [params.props] * If params.Component is given, its props can be passed with this argument diff --git a/addons/web/static/src/core/effects/rainbow_man.js b/addons/web/static/src/core/effects/rainbow_man.js index f3243edb6da..6cb0ad20825 100644 --- a/addons/web/static/src/core/effects/rainbow_man.js +++ b/addons/web/static/src/core/effects/rainbow_man.js @@ -3,7 +3,7 @@ import { browser } from "@web/core/browser/browser"; import { useEffect } from "@web/core/utils/hooks"; -const { Component, hooks } = owl; +const { Component, useExternalListener } = owl; /** * @typedef Common @@ -37,7 +37,7 @@ const { Component, hooks } = owl; */ export class RainbowMan extends Component { setup() { - hooks.useExternalListener(document.body, "click", this.closeRainbowMan); + useExternalListener(document.body, "click", this.closeRainbowMan); this.delay = RainbowMan.rainbowFadeouts[this.props.fadeout]; if (this.delay) { useEffect( diff --git a/addons/web/static/src/core/errors/error_dialogs.js b/addons/web/static/src/core/errors/error_dialogs.js index 2f45a8a4e15..83309362c4e 100644 --- a/addons/web/static/src/core/errors/error_dialogs.js +++ b/addons/web/static/src/core/errors/error_dialogs.js @@ -7,8 +7,7 @@ import { registry } from "../registry"; import { useService } from "@web/core/utils/hooks"; import { capitalize } from "../utils/strings"; -const { hooks } = owl; -const { useState } = hooks; +const { useState } = owl; export const odooExceptionTitleMap = new Map( Object.entries({ diff --git a/addons/web/static/src/core/file_input/file_input.js b/addons/web/static/src/core/file_input/file_input.js index 6a55f26fd6e..93a79490732 100644 --- a/addons/web/static/src/core/file_input/file_input.js +++ b/addons/web/static/src/core/file_input/file_input.js @@ -2,8 +2,7 @@ import { useService } from "@web/core/utils/hooks"; -const { Component, hooks, QWeb } = owl; -const { useRef } = hooks; +const { Component, QWeb, useRef } = owl; /** * Custom file input diff --git a/addons/web/static/src/core/l10n/localization_service.js b/addons/web/static/src/core/l10n/localization_service.js index a240dcf4793..994ef5b5a44 100644 --- a/addons/web/static/src/core/l10n/localization_service.js +++ b/addons/web/static/src/core/l10n/localization_service.js @@ -7,11 +7,13 @@ import { localization } from "./localization"; import { translatedTerms, _t } from "./translation"; import { session } from "@web/session"; +const { config } = owl; + export const localizationService = { dependencies: ["user"], start: async (env, { user }) => { // add "data-toolip" to the list of translatable attributes in owl templates - owl.config.translatableAttributes.push("data-tooltip"); + config.translatableAttributes.push("data-tooltip"); const cacheHashes = session.cache_hashes || {}; const translationsHash = cacheHashes.translations || new Date().getTime().toString(); diff --git a/addons/web/static/src/core/main_components_container.js b/addons/web/static/src/core/main_components_container.js index e9865afdb5c..6d23c22f224 100644 --- a/addons/web/static/src/core/main_components_container.js +++ b/addons/web/static/src/core/main_components_container.js @@ -2,7 +2,7 @@ import { registry } from "./registry"; import { NotUpdatable, ErrorHandler } from "./utils/components"; -const { Component, tags } = owl; +const { Component, xml } = owl; export class MainComponentsContainer extends Component { setup() { @@ -24,7 +24,7 @@ export class MainComponentsContainer extends Component { } } -MainComponentsContainer.template = tags.xml` +MainComponentsContainer.template = xml`
diff --git a/addons/web/static/src/core/notifications/notification.js b/addons/web/static/src/core/notifications/notification.js index e5fbd0c24a6..a9609be4cf1 100644 --- a/addons/web/static/src/core/notifications/notification.js +++ b/addons/web/static/src/core/notifications/notification.js @@ -1,11 +1,11 @@ /** @odoo-module **/ -const { Component, hooks } = owl; +const { Component, onWillUnmount } = owl; export class Notification extends Component { setup() { if (this.props.onClose) { - hooks.onWillUnmount(() => this.props.onClose()); + onWillUnmount(() => this.props.onClose()); } } @@ -40,13 +40,13 @@ Notification.props = { return ( typeof m === "string" || (typeof m === "object" && typeof m.toString === "function") ); - } + }, }, title: { type: [String, Boolean, { toString: Function }], optional: true }, type: { type: String, optional: true, - validate: (t) => ["warning", "danger", "success", "info"].includes(t) + validate: (t) => ["warning", "danger", "success", "info"].includes(t), }, messageIsHtml: { type: Boolean, optional: true }, className: { type: String, optional: true }, @@ -58,15 +58,15 @@ Notification.props = { name: { type: String }, icon: { type: String, optional: true }, primary: { type: Boolean, optional: true }, - onClick: Function - } - } + onClick: Function, + }, + }, }, - onClose: { type: Function, optional: true } + onClose: { type: Function, optional: true }, }; Notification.defaultProps = { buttons: [], className: "", messageIsHtml: false, - type: "warning" + type: "warning", }; diff --git a/addons/web/static/src/core/notifications/notification_container.js b/addons/web/static/src/core/notifications/notification_container.js index 5fbccdfa28e..6f79b272fa1 100644 --- a/addons/web/static/src/core/notifications/notification_container.js +++ b/addons/web/static/src/core/notifications/notification_container.js @@ -2,7 +2,7 @@ import { Notification } from "./notification"; -const { Component, tags } = owl; +const { Component, xml } = owl; export class NotificationContainer extends Component { setup() { @@ -12,7 +12,7 @@ export class NotificationContainer extends Component { } } -NotificationContainer.template = tags.xml` +NotificationContainer.template = xml`