diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py index 2288e6296d7..c5cf214e4e2 100644 --- a/addons/website/__manifest__.py +++ b/addons/website/__manifest__.py @@ -180,7 +180,6 @@ 'website/static/src/components/website_loader/website_loader.js', 'website/static/src/components/website_loader/website_loader.scss', 'website/static/src/components/views/*', - 'website/static/src/services/chat_window_service_patch.js', 'website/static/src/services/website_service.js', 'website/static/src/js/utils.js', 'website/static/src/xml/website.xml', diff --git a/addons/website/static/src/client_actions/website_preview/website_preview.js b/addons/website/static/src/client_actions/website_preview/website_preview.js index dc0480db641..1df57d8afb7 100644 --- a/addons/website/static/src/client_actions/website_preview/website_preview.js +++ b/addons/website/static/src/client_actions/website_preview/website_preview.js @@ -125,7 +125,6 @@ export class WebsitePreview extends Component { // OdooFrameContentLoaded event to unblock the iframe, as it is // triggered faster than the load event. this.iframe.el.addEventListener('OdooFrameContentLoaded', () => this.websiteService.unblockPreview('load-iframe'), { once: true }); - this.websiteService.context.isPreviewOpen = true; }); onWillUnmount(() => { @@ -135,7 +134,6 @@ export class WebsitePreview extends Component { this.websiteService.currentWebsiteId = null; this.websiteService.websiteRootInstance = undefined; this.websiteService.pageDocument = null; - this.websiteService.context.isPreviewOpen = false; }); /** diff --git a/addons/website/static/src/services/chat_window_service_patch.js b/addons/website/static/src/services/chat_window_service_patch.js deleted file mode 100644 index 1925108d726..00000000000 --- a/addons/website/static/src/services/chat_window_service_patch.js +++ /dev/null @@ -1,11 +0,0 @@ -/* @odoo-module */ - -import { ChatWindowService } from "@mail/core/common/chat_window_service"; - -import { patch } from "@web/core/utils/patch"; - -patch(ChatWindowService.prototype, { - get visible() { - return this.env.services.website?.context.isPreviewOpen ? [] : super.visible; - }, -}); diff --git a/addons/website/static/src/services/website_service.js b/addons/website/static/src/services/website_service.js index c4a25c9ae6b..a2ff6ed7673 100644 --- a/addons/website/static/src/services/website_service.js +++ b/addons/website/static/src/services/website_service.js @@ -50,7 +50,6 @@ export const websiteService = { showAceEditor: false, edition: false, isPublicRootReady: false, - isPreviewOpen: false, snippetsLoaded: false, isMobile: false, }); diff --git a/addons/website/static/tests/tours/hide_chat_window_on_preview.js b/addons/website/static/tests/tours/hide_chat_window_on_preview.js deleted file mode 100644 index e9e765df4fd..00000000000 --- a/addons/website/static/tests/tours/hide_chat_window_on_preview.js +++ /dev/null @@ -1,25 +0,0 @@ -/* @odoo-module */ - -import { registry } from "@web/core/registry"; - -import wTourUtils from "@website/js/tours/tour_utils"; - -registry.category("web_tour.tours").add("test_hide_chat_window_on_preview", { - test: true, - steps: () => [ - { - trigger: ".o-mail-ChatWindow", - run() { - window.location.href = wTourUtils.getClientActionUrl("/"); - }, - }, - { - trigger: ".o_website_preview", - run() { - if (document.querySelector(".o-mail-ChatWindow")) { - throw new Error("Chat window should not be visible"); - } - }, - }, - ], -}); diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py index 33be21a7194..30bb3b96ef0 100644 --- a/addons/website/tests/test_ui.py +++ b/addons/website/tests/test_ui.py @@ -423,16 +423,6 @@ class TestUi(odoo.tests.HttpCase): def test_27_website_clicks(self): self.start_tour('/web', 'website_click_tour', login='admin') - def test_28_hide_chat_window_on_preview(self): - session = self.authenticate('admin', 'admin') - partner_id = self.env['res.users'].search([('id', '=', session.uid)]).partner_id - self.env['discuss.channel'].create({ - 'name': 'Test Channel', - 'channel_type': 'chat', - 'channel_member_ids': [odoo.Command.create({'partner_id': partner_id.id, 'is_minimized': True})], - }) - self.start_tour(f'/web#id={partner_id.id}&model=res.partner&view_type=form', 'test_hide_chat_window_on_preview', login='admin') - def test_29_website_text_edition(self): self.start_tour('/@/', 'website_text_edition', login='admin')