From 5ad404fbb521f03d6038c8b2366db2d7fdf8dfc3 Mon Sep 17 00:00:00 2001 From: Romain Derie Date: Fri, 12 Aug 2022 13:27:08 +0000 Subject: [PATCH] [REM] website, *: remove the now useless backend_dashboard tour * website_sale That tour keeps failing. A fix attempt was made with [1] but wasn't enough. The tour was actually useless as since [2] google analytics dashboard was not part of the website dashboard anymore (due to google not allowing GA4 dashboard to be embed). The tour, which was initially made to ensure that google analytics was correctly shown even if not yet connected to was then not useful anymore. The opportunity is also taken to rename the misleading ID of related records still mentioning Google. [1]: https://github.com/odoo/odoo/commit/1a191357e3ac0c4542b2fc7c3a2aee18dc54699d [2]: https://github.com/odoo/odoo/commit/985e49bdb5e22fa197ba267aa41d7a8ba7e50550 runbot-4498 runbot-4499 runbot-4466 closes odoo/odoo#98090 Related: odoo/upgrade#3774 Signed-off-by: Romain Derie (rde) --- .../static/tests/tours/dashboard_tour.js | 27 ------------------- addons/website/tests/test_ui.py | 3 --- addons/website/views/website_views.xml | 6 ++--- .../static/src/js/tours/website_sale_shop.js | 2 +- 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 addons/website/static/tests/tours/dashboard_tour.js diff --git a/addons/website/static/tests/tours/dashboard_tour.js b/addons/website/static/tests/tours/dashboard_tour.js deleted file mode 100644 index 70d2b1bb5f4..00000000000 --- a/addons/website/static/tests/tours/dashboard_tour.js +++ /dev/null @@ -1,27 +0,0 @@ -odoo.define("website.tour.backend_dashboard", function (require) { - "use strict"; - - const wTourUtils = require("website.tour_utils"); - - wTourUtils.registerEditionTour( - "backend_dashboard", - { - test: true, - url: '/', - }, - [ - { - trigger: 'button[data-menu-xmlid="website.menu_reporting"]', - }, - { - trigger: '.dropdown-item[data-menu-xmlid="website.menu_website_google_analytics"]', - }, - { - // Analytics section should always be present even when empty / not hooked to anything - trigger: 'h2:contains("Analytics")', - content: "Check if dashboard loads", - run: function () {}, - }, - ] - ); -}); diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py index 4b64a63d71c..45f144007ef 100644 --- a/addons/website/tests/test_ui.py +++ b/addons/website/tests/test_ui.py @@ -142,9 +142,6 @@ class TestUi(odoo.tests.HttpCase): }) self.start_tour(self.env['website'].get_client_action_url('/'), 'restricted_editor', login='restricted') - def test_03_backend_dashboard(self): - self.start_tour('/@/', 'backend_dashboard', login='admin') - def test_04_website_navbar_menu(self): website = self.env['website'].search([], limit=1) self.env['website.menu'].create({ diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml index 4c6184c0092..88fc7cc8b0a 100644 --- a/addons/website/views/website_views.xml +++ b/addons/website/views/website_views.xml @@ -469,7 +469,7 @@ - + Website: Analytics code @@ -638,11 +638,11 @@ action="website.ir_actions_server_website_dashboard" active="0"/> - + action="website.ir_actions_server_website_analytics"/>