From 2fbc08a197c17a410b7ed06e2d0158da193e6e96 Mon Sep 17 00:00:00 2001 From: "Michael (mcm)" Date: Wed, 27 Sep 2023 08:38:39 +0200 Subject: [PATCH] [IMP] *: remove legacy service mappers This commit removes the legacy service mappers which are useless now. closes odoo/odoo#136807 Task: 3439226 Related: odoo/enterprise#48015 Signed-off-by: Mathieu Duckerts-Antoine (dam) --- .../legacy/make_bus_service_to_legacy_env.js | 16 ---------------- .../legacy/make_multi_tab_to_legacy_env.js | 16 ---------------- addons/im_livechat/__manifest__.py | 1 - addons/mail/__manifest__.py | 1 - addons/mail/static/tests/helpers/test_utils.js | 8 +------- .../static/src/legacy/js/public/public_root.js | 4 ---- addons/web/static/src/legacy/legacy_setup.js | 4 ---- addons/web/static/tests/helpers/mock_env.js | 2 -- 8 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 addons/bus/static/src/services/legacy/make_bus_service_to_legacy_env.js delete mode 100644 addons/bus/static/src/services/legacy/make_multi_tab_to_legacy_env.js diff --git a/addons/bus/static/src/services/legacy/make_bus_service_to_legacy_env.js b/addons/bus/static/src/services/legacy/make_bus_service_to_legacy_env.js deleted file mode 100644 index 410845d0ec2..00000000000 --- a/addons/bus/static/src/services/legacy/make_bus_service_to_legacy_env.js +++ /dev/null @@ -1,16 +0,0 @@ -/** @odoo-module **/ - -import { registry } from "@web/core/registry"; - -export function makeBusServiceToLegacyEnv(legacyEnv) { - return { - dependencies: ["bus_service"], - start(_, { bus_service }) { - legacyEnv.services["bus_service"] = bus_service; - }, - }; -} - -registry - .category("wowlToLegacyServiceMappers") - .add("bus_service_to_legacy_env", makeBusServiceToLegacyEnv); diff --git a/addons/bus/static/src/services/legacy/make_multi_tab_to_legacy_env.js b/addons/bus/static/src/services/legacy/make_multi_tab_to_legacy_env.js deleted file mode 100644 index cd9bcd8080d..00000000000 --- a/addons/bus/static/src/services/legacy/make_multi_tab_to_legacy_env.js +++ /dev/null @@ -1,16 +0,0 @@ -/** @odoo-module **/ - -import { registry } from "@web/core/registry"; - -export function makeMultiTabToLegacyEnv(legacyEnv) { - return { - dependencies: ["multi_tab"], - start(_, { multi_tab }) { - legacyEnv.services["multi_tab"] = multi_tab; - }, - }; -} - -registry - .category("wowlToLegacyServiceMappers") - .add("multi_tab_to_legacy_env", makeMultiTabToLegacyEnv); diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index bc078687a75..5e7bbebda10 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -126,7 +126,6 @@ Help your customers with this chat, and analyse their feedback. 'web/static/src/views/fields/file_handler.*', 'bus/static/src/*.js', 'bus/static/src/services/**/*.js', - ('remove', 'bus/static/src/services/legacy/**/*'), 'bus/static/src/workers/websocket_worker.js', 'bus/static/src/workers/websocket_worker_utils.js', diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py index 89be1e48ca3..2d3d7a8ff24 100644 --- a/addons/mail/__manifest__.py +++ b/addons/mail/__manifest__.py @@ -190,7 +190,6 @@ For more specific needs, you may also assign custom-defined actions 'bus/static/src/*.js', 'bus/static/src/services/**/*.js', - ('remove', 'bus/static/src/services/legacy/**/*'), 'bus/static/src/workers/websocket_worker.js', 'bus/static/src/workers/websocket_worker_utils.js', diff --git a/addons/mail/static/tests/helpers/test_utils.js b/addons/mail/static/tests/helpers/test_utils.js index 6ed2b3ea0b1..7c1768bfc4c 100644 --- a/addons/mail/static/tests/helpers/test_utils.js +++ b/addons/mail/static/tests/helpers/test_utils.js @@ -79,13 +79,7 @@ function getOpenFormView(openView) { * web clients. */ function resetRegistries() { - const categories = [ - "actions", - "main_components", - "services", - "systray", - "wowlToLegacyServiceMappers", - ]; + const categories = ["actions", "main_components", "services", "systray"]; for (const name of categories) { clearRegistryWithCleanup(registry.category(name)); } diff --git a/addons/web/static/src/legacy/js/public/public_root.js b/addons/web/static/src/legacy/js/public/public_root.js index 131b61d625b..c621b75db74 100644 --- a/addons/web/static/src/legacy/js/public/public_root.js +++ b/addons/web/static/src/legacy/js/public/public_root.js @@ -327,10 +327,6 @@ export async function createPublicRoot(RootWidget) { // add a bunch of mapping services that will redirect service calls from the legacy env // to the wowl env serviceRegistry.add("legacy_notification", makeLegacyNotificationService(legacyEnv)); - const wowlToLegacyServiceMappers = registry.category('wowlToLegacyServiceMappers').getEntries(); - for (const [legacyServiceName, wowlToLegacyServiceMapper] of wowlToLegacyServiceMappers) { - serviceRegistry.add(legacyServiceName, wowlToLegacyServiceMapper(legacyEnv)); - } await whenReady(); const wowlEnv = makeEnv(); diff --git a/addons/web/static/src/legacy/legacy_setup.js b/addons/web/static/src/legacy/legacy_setup.js index f1fbe8d876e..afbdb73205d 100644 --- a/addons/web/static/src/legacy/legacy_setup.js +++ b/addons/web/static/src/legacy/legacy_setup.js @@ -20,10 +20,6 @@ export const legacySetupProm = new Promise((resolve) => { // add a service to redirect rpc events triggered on the bus in the // legacy env on the bus in the wowl env serviceRegistry.add("legacy_notification", makeLegacyNotificationService(legacyEnv)); - const wowlToLegacyServiceMappers = registry.category("wowlToLegacyServiceMappers").getEntries(); - for (const [legacyServiceName, wowlToLegacyServiceMapper] of wowlToLegacyServiceMappers) { - serviceRegistry.add(legacyServiceName, wowlToLegacyServiceMapper(legacyEnv)); - } await whenReady(); legacyEnv.templates = templates; legacySetupResolver(legacyEnv); diff --git a/addons/web/static/tests/helpers/mock_env.js b/addons/web/static/tests/helpers/mock_env.js index 9ec3577f880..51861883807 100644 --- a/addons/web/static/tests/helpers/mock_env.js +++ b/addons/web/static/tests/helpers/mock_env.js @@ -57,7 +57,6 @@ export const registryNamesToCloneWithCleanup = [ "main_components", "view_widgets", "views", - "wowlToLegacyServiceMappers", ]; export const utils = { @@ -74,7 +73,6 @@ export const utils = { clearRegistryWithCleanup(registry.category("favoriteMenu")); clearRegistryWithCleanup(registry.category("ir.actions.report handlers")); clearRegistryWithCleanup(registry.category("main_components")); - clearRegistryWithCleanup(registry.category("wowlToLegacyServiceMappers")); clearRegistryWithCleanup(registry.category("services")); clearServicesMetadataWithCleanup();