From 44c14c51cf1b805e984e79cd8379a19e557e6bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Mattiello?= Date: Thu, 26 Mar 2026 10:19:27 +0100 Subject: [PATCH 001/321] [REF] *: remap owl2 import to compatibility layer --- .../static/tests/import_action.test.js | 6 +-- .../static/tests/builder_action.test.js | 3 +- .../basic_many2many.test.js | 3 +- .../builder_text_input.test.js | 3 +- addons/html_builder/static/tests/helpers.js | 9 ++-- .../tests/_helpers/embedded_component.js | 13 +++--- .../static/tests/embedded_components.test.js | 9 ++-- .../static/tests/composer/composer.test.js | 2 +- addons/mail/static/tests/core/record.test.js | 3 +- .../tours/discuss_channel_public_tour.js | 2 +- .../mount_generic_components.test.js | 3 +- .../tests/unit/tools/lazy_getter.test.js | 3 +- .../unit/services/scroll_dnd_hook.test.js | 5 ++- .../core/utils/draggable_hook_builder_owl.js | 6 +-- .../web/static/src/core/utils/sortable_owl.js | 6 +-- .../static/src/views/form/form_renderer.js | 4 +- .../tests/_framework/view_test_helpers.js | 3 +- .../static/tests/core/autocomplete.test.js | 3 +- addons/web/static/tests/core/checkbox.test.js | 3 +- .../web/static/tests/core/code_editor.test.js | 3 +- .../static/tests/core/color_picker.test.js | 12 +++++- .../core/commands/command_service.test.js | 7 ++-- .../components/datetime/datetime_hook.test.js | 11 ++--- .../datetime/datetime_picker.test.js | 3 +- .../tests/core/components/pager.test.js | 3 +- .../tests/core/components/time_picker.test.js | 3 +- addons/web/static/tests/core/dialog.test.js | 3 +- .../domain_selector/domain_selector.test.js | 4 +- .../tests/core/dropdown/dropdown.test.js | 5 ++- .../static/tests/core/field_service.test.js | 3 +- .../static/tests/core/hotkey_sevice.test.js | 17 ++++---- addons/web/static/tests/core/macro.test.js | 3 +- .../core/main_components_container.test.js | 3 +- .../tests/core/model_field_selector.test.js | 4 +- .../static/tests/core/navigation_hook.test.js | 25 +++++------ .../core/offline/offline_service.test.js | 3 +- .../static/tests/core/overlay_service.test.js | 3 +- .../static/tests/core/popover/popover.test.js | 7 ++-- .../tests/core/position/position_hook.test.js | 41 ++++++++++--------- addons/web/static/tests/core/reactive.test.js | 3 +- .../multi_record_selector.test.js | 15 +++++-- .../record_selectors/record_selector.test.js | 3 +- .../static/tests/core/resizable_panel.test.js | 3 +- .../web/static/tests/core/select_menu.test.js | 3 +- .../web/static/tests/core/tags_list.test.js | 3 +- addons/web/static/tests/core/template.test.js | 5 ++- .../core/tooltip/tooltip_service.test.js | 3 +- .../web/static/tests/core/transition.test.js | 3 +- .../web/static/tests/core/ui_service.test.js | 20 ++++----- .../tests/core/utils/autoresize.test.js | 13 +++--- .../static/tests/core/utils/draggable.test.js | 27 ++++++------ .../web/static/tests/core/utils/hooks.test.js | 35 ++++++++-------- .../tests/core/utils/nested_sortable.test.js | 35 ++++++++-------- .../static/tests/core/utils/sortable.test.js | 27 ++++++------ .../tests/core/virtual_grid_hook.test.js | 15 +++---- .../tests/helpers/dom_test_helpers.test.js | 5 ++- addons/web/static/tests/model/record.test.js | 3 +- addons/web/static/tests/reactivity.test.js | 3 +- .../static/tests/search/control_panel.test.js | 2 +- .../static/tests/search/pager_hook.test.js | 3 +- .../static/tests/search/with_search.test.js | 3 +- .../views/calendar/calendar_view.test.js | 3 +- .../tests/views/fields/numeric_fields.test.js | 5 ++- .../tests/views/fields/one2many_field.test.js | 3 +- .../static/tests/views/form/form_view.test.js | 9 ++-- .../tests/views/graph/graph_view.test.js | 2 +- addons/web/static/tests/views/layout.test.js | 11 +---- .../static/tests/views/list/list_view.test.js | 5 ++- addons/web/static/tests/views/view.test.js | 3 +- .../tests/views/view_button_hook.test.js | 13 +++--- .../view_scale_selector.test.js | 3 +- .../web/static/tests/webclient/navbar.test.js | 3 +- .../static/tests/tour_interactive.test.js | 3 +- .../static/tests/tour_pointer.test.js | 3 +- .../static/tests/builder/chat_hub.test.js | 2 +- .../tour_utils/lifecycle_patch_wysiwyg.js | 3 +- 76 files changed, 309 insertions(+), 246 deletions(-) diff --git a/addons/base_import/static/tests/import_action.test.js b/addons/base_import/static/tests/import_action.test.js index 1e5a624f61fe03..39d5f0be08a302 100644 --- a/addons/base_import/static/tests/import_action.test.js +++ b/addons/base_import/static/tests/import_action.test.js @@ -1,3 +1,4 @@ +import { useLayoutEffect } from "@web/owl2/utils"; import { before, describe, expect, test } from "@odoo/hoot"; import { animationFrame, @@ -7,7 +8,6 @@ import { setInputFiles, waitFor, } from "@odoo/hoot-dom"; -import { useEffect } from "@odoo/owl"; import { contains, defineActions, @@ -1026,7 +1026,7 @@ describe("Import view", () => { patchWithCleanup(ImportDataProgress.prototype, { setup() { super.setup(); - useEffect( + useLayoutEffect( () => { if (this.props.importProgress.step === 1) { // Trigger a pause at this step to resume later from the view @@ -1106,7 +1106,7 @@ describe("Import view", () => { patchWithCleanup(ImportDataProgress.prototype, { setup() { super.setup(); - useEffect( + useLayoutEffect( () => { if (this.props.importProgress.step === 1) { // Trigger a pause at this step to resume later from the view diff --git a/addons/html_builder/static/tests/builder_action.test.js b/addons/html_builder/static/tests/builder_action.test.js index 5ca8feb326b769..c002d28c3fdb36 100644 --- a/addons/html_builder/static/tests/builder_action.test.js +++ b/addons/html_builder/static/tests/builder_action.test.js @@ -1,3 +1,4 @@ +import { useState } from "@web/owl2/utils"; import { addBuilderAction, addBuilderOption, @@ -9,7 +10,7 @@ import { SavePlugin } from "@html_builder/core/save_plugin"; import { BaseOptionComponent } from "@html_builder/core/base_option_component"; import { beforeEach, describe, expect, test } from "@odoo/hoot"; import { advanceTime, animationFrame, tick } from "@odoo/hoot-dom"; -import { useState, xml } from "@odoo/owl"; +import { xml } from "@odoo/owl"; import { contains, defineModels, diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js index ce0811191bcdbe..671860248e0a1d 100644 --- a/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js +++ b/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js @@ -1,8 +1,9 @@ +import { reactive } from "@web/owl2/utils"; import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpers"; import { BaseOptionComponent } from "@html_builder/core/base_option_component"; import { describe, expect, test } from "@odoo/hoot"; import { advanceTime, animationFrame } from "@odoo/hoot-mock"; -import { reactive, xml } from "@odoo/owl"; +import { xml } from "@odoo/owl"; import { contains, defineModels, fields, models, onRpc } from "@web/../tests/web_test_helpers"; import { delay } from "@web/core/utils/concurrency"; diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js index e2d9a55e2f7e39..03395445a5a9b6 100644 --- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js +++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js @@ -1,3 +1,4 @@ +import { reactive, useState } from "@web/owl2/utils"; import { addBuilderAction, addBuilderOption, @@ -6,7 +7,7 @@ import { import { BuilderAction } from "@html_builder/core/builder_action"; import { BaseOptionComponent } from "@html_builder/core/base_option_component"; import { expect, test, describe } from "@odoo/hoot"; -import { reactive, useState, xml } from "@odoo/owl"; +import { xml } from "@odoo/owl"; import { contains } from "@web/../tests/web_test_helpers"; describe.current.tags("desktop"); diff --git a/addons/html_builder/static/tests/helpers.js b/addons/html_builder/static/tests/helpers.js index 22bc0ea5359768..d01f3fcf25c496 100644 --- a/addons/html_builder/static/tests/helpers.js +++ b/addons/html_builder/static/tests/helpers.js @@ -1,3 +1,4 @@ +import { useRef, useState, useSubEnv } from "@web/owl2/utils"; import { Builder } from "@html_builder/builder"; import { CORE_PLUGINS } from "@html_builder/core/core_plugins"; import { Image } from "@html_builder/core/img"; @@ -13,7 +14,7 @@ import { Plugin } from "@html_editor/plugin"; import { defineMailModels } from "@mail/../tests/mail_test_helpers"; import { after, click, queryAll, queryFirst } from "@odoo/hoot"; import { animationFrame, waitForNone, queryOne, waitFor, advanceTime, tick } from "@odoo/hoot-dom"; -import { Component, onMounted, useRef, useState, useSubEnv, xml } from "@odoo/owl"; +import { Component, onMounted, xml } from "@odoo/owl"; import { contains, defineModels, @@ -100,10 +101,10 @@ export function getSnippetStructure({ class BuilderContainer extends Component { static template = xml` -
-
+
+
-