From ed7f4eb7dbae36bfaf657b6dde843d88f95fd44a Mon Sep 17 00:00:00 2001 From: Pierre Paridans Date: Thu, 31 Aug 2023 17:18:41 +0200 Subject: [PATCH] [IMP] web: remove unused legacy_dialog_mapping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit task-3439226 closes odoo/odoo#134258 Related: odoo/enterprise#47349 Signed-off-by: Adrien Dieudonné (adr) --- .../src/legacy/js/public/public_root.js | 2 - addons/web/static/src/legacy/legacy_setup.js | 3 -- addons/web/static/src/legacy/utils.js | 49 ------------------- 3 files changed, 54 deletions(-) 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 2076849f3e1..f3965cfa0b5 100644 --- a/addons/web/static/src/legacy/js/public/public_root.js +++ b/addons/web/static/src/legacy/js/public/public_root.js @@ -10,7 +10,6 @@ import lazyloader from "@web/legacy/js/public/lazyloader"; import { makeLegacyNotificationService, - makeLegacyDialogMappingService, mapLegacyEnvToWowlEnv, makeLegacyRPCService, createWidgetParent, @@ -361,7 +360,6 @@ export async function createPublicRoot(RootWidget) { // to the wowl env serviceRegistry.add("legacy_rpc", makeLegacyRPCService(legacyEnv)); serviceRegistry.add("legacy_notification", makeLegacyNotificationService(legacyEnv)); - serviceRegistry.add("legacy_dialog_mapping", makeLegacyDialogMappingService(legacyEnv)); const wowlToLegacyServiceMappers = registry.category('wowlToLegacyServiceMappers').getEntries(); for (const [legacyServiceName, wowlToLegacyServiceMapper] of wowlToLegacyServiceMappers) { serviceRegistry.add(legacyServiceName, wowlToLegacyServiceMapper(legacyEnv)); diff --git a/addons/web/static/src/legacy/legacy_setup.js b/addons/web/static/src/legacy/legacy_setup.js index c006bd07845..6d9bbaba6c4 100644 --- a/addons/web/static/src/legacy/legacy_setup.js +++ b/addons/web/static/src/legacy/legacy_setup.js @@ -3,7 +3,6 @@ import { registry } from "../core/registry"; import { makeLegacyNotificationService, - makeLegacyDialogMappingService, makeLegacyRPCService, } from "./utils"; import { makeLegacyActionManagerService } from "./backend_utils"; @@ -28,8 +27,6 @@ export const legacySetupProm = new Promise((resolve) => { // legacy env on the bus in the wowl env serviceRegistry.add("legacy_rpc", makeLegacyRPCService(legacyEnv)); serviceRegistry.add("legacy_notification", makeLegacyNotificationService(legacyEnv)); - const legacyDialogMappingService = makeLegacyDialogMappingService(legacyEnv); - serviceRegistry.add("legacy_dialog_mapping", legacyDialogMappingService); const wowlToLegacyServiceMappers = registry.category("wowlToLegacyServiceMappers").getEntries(); for (const [legacyServiceName, wowlToLegacyServiceMapper] of wowlToLegacyServiceMappers) { serviceRegistry.add(legacyServiceName, wowlToLegacyServiceMapper(legacyEnv)); diff --git a/addons/web/static/src/legacy/utils.js b/addons/web/static/src/legacy/utils.js index e1b822526db..27e58530501 100644 --- a/addons/web/static/src/legacy/utils.js +++ b/addons/web/static/src/legacy/utils.js @@ -24,55 +24,6 @@ import { export const wowlServicesSymbol = Symbol("wowlServices"); -class LegacyDialogContainer extends Component { - static template = xml`
`; - static props = []; -} - -/** - * Returns a service that maps legacy dialogs - * to new environment services behavior. - * - * @param {object} legacyEnv - * @returns a wowl deployable service - */ -export function makeLegacyDialogMappingService(legacyEnv) { - return { - dependencies: ["ui", "hotkey", "overlay"], - start(_, { ui, hotkey, overlay }) { - overlay.add(LegacyDialogContainer, {}); - - function getModalEl(dialog) { - return dialog.modalRef ? dialog.modalRef.el : dialog.$modal[0]; - } - - function getCloseCallback(dialog) { - return dialog.modalRef ? () => dialog._close() : () => dialog.$modal.modal("hide"); - } - - const dialogHotkeyRemoveMap = new Map(); - - function onOpenDialog(dialog) { - ui.activateElement(getModalEl(dialog)); - const remove = hotkey.add("escape", getCloseCallback(dialog)); - dialogHotkeyRemoveMap.set(dialog, remove); - } - - function onCloseDialog(dialog) { - ui.deactivateElement(getModalEl(dialog)); - if (dialogHotkeyRemoveMap.has(dialog)) { - const removeHotkey = dialogHotkeyRemoveMap.get(dialog); - removeHotkey(); - dialogHotkeyRemoveMap.delete(dialog); - } - } - - legacyEnv.bus.on("legacy_dialog_opened", null, onOpenDialog); - legacyEnv.bus.on("legacy_dialog_destroyed", null, onCloseDialog); - }, - }; -} - /** * Deploys a service allowing legacy to add/remove commands. *