From bb1641787bfa087b1fe447c96281a6dc839be7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Voet=20=28ryv=29?= Date: Fri, 29 Dec 2023 09:36:37 +0100 Subject: [PATCH] [REM] *: remove useless 'group_by_no_leaf' context key As of https://github.com/odoo/odoo/pull/110737, 'group_by_no_leaf' is no longer used. Previously it was used to change the name of the '__count' aggregate of read_group() but had no effect anywhere (and the webclient just didn't care). Remove this remnant. closes odoo/odoo#147735 Related: odoo/enterprise#53488 Signed-off-by: Raphael Collet --- .../report/account_invoice_report_view.xml | 4 ++-- .../report/report_membership_views.xml | 2 +- .../views/pos_order_report_view.xml | 2 +- .../project/report/project_report_views.xml | 2 +- addons/sale/report/sale_report_views.xml | 4 ++-- .../sale_project/views/project_task_views.xml | 2 +- .../data/files/invoicing_dashboard.json | 24 +++++++------------ .../data/files/tasks_dashboard.json | 8 ------- .../data/files/pos_dashboard.json | 7 ------ .../data/files/product_dashboard.json | 4 ---- .../data/files/sales_dashboard.json | 9 ------- .../data/files/ecommerce_dashboard.json | 2 -- .../src/webclient/actions/action_service.js | 2 +- .../web/static/tests/helpers/mock_server.js | 3 +-- .../web/static/tests/views/list_view_tests.js | 24 ------------------- .../report/crm_partner_report_view.xml | 2 +- 16 files changed, 19 insertions(+), 82 deletions(-) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 6c6decdb27ed3..19f5ff9d1c328 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -132,7 +132,7 @@ Invoices Analysis account.invoice.report graph,pivot - {'search_default_current':1, 'search_default_supplier': 1, 'group_by':['invoice_date:month'], 'group_by_no_leaf':1} + {'search_default_current':1, 'search_default_supplier': 1, 'group_by':['invoice_date:month']} From this report, you can have an overview of the amount invoiced from your vendors. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs. @@ -140,7 +140,7 @@ Invoices Analysis account.invoice.report graph,pivot - {'search_default_current':1, 'search_default_customer': 1, 'group_by':['invoice_date:month'], 'group_by_no_leaf':1} + {'search_default_current':1, 'search_default_customer': 1, 'group_by':['invoice_date:month']} From this report, you can have an overview of the amount invoiced to your customers. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs. diff --git a/addons/membership/report/report_membership_views.xml b/addons/membership/report/report_membership_views.xml index 89b1cfd829694..c443dc2b96487 100644 --- a/addons/membership/report/report_membership_views.xml +++ b/addons/membership/report/report_membership_views.xml @@ -83,7 +83,7 @@ report.membership graph,pivot - {"search_default_start_date":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1} + {"search_default_start_date":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1}

No data yet! diff --git a/addons/point_of_sale/views/pos_order_report_view.xml b/addons/point_of_sale/views/pos_order_report_view.xml index fa269c181fcbe..a7fb3c060ebf0 100644 --- a/addons/point_of_sale/views/pos_order_report_view.xml +++ b/addons/point_of_sale/views/pos_order_report_view.xml @@ -82,7 +82,7 @@ report.pos.order graph,pivot - {'group_by_no_leaf':1,'group_by':[]} + {'group_by':[]}

No data yet! diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml index 60c412e3c8834..522be83b692af 100644 --- a/addons/project/report/project_report_views.xml +++ b/addons/project/report/project_report_views.xml @@ -45,7 +45,7 @@ report.project.task.user graph,pivot - {'group_by_no_leaf':1, 'group_by':[], 'graph_measure': '__count__'} + {'group_by':[], 'graph_measure': '__count__'}

No data yet! diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml index 372217183f4df..3b0d9de0e2a03 100644 --- a/addons/sale/report/sale_report_views.xml +++ b/addons/sale/report/sale_report_views.xml @@ -126,7 +126,7 @@ [('state', '!=', 'cancel')] - {'search_default_Sales':1, 'group_by_no_leaf':1,'group_by':[], 'search_default_filter_order_date': 1} + {'search_default_Sales':1,'group_by':[], 'search_default_filter_order_date': 1} This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application. @@ -146,7 +146,7 @@ graph,pivot - {'search_default_Sales': 1, 'search_default_Product': 1, 'group_by_no_leaf':1, 'group_by': 'product_id', 'search_default_filter_order_date': 1} + {'search_default_Sales': 1, 'search_default_Product': 1, 'group_by': 'product_id', 'search_default_filter_order_date': 1} This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application. diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml index c45ae4d9a8fe8..3469693008511 100644 --- a/addons/sale_project/views/project_task_views.xml +++ b/addons/sale_project/views/project_task_views.xml @@ -14,7 +14,7 @@ - {'group_by_no_leaf':1, 'group_by':[], 'graph_measure': '__count__', 'sale_show_partner_name': True} + {'group_by':[], 'graph_measure': '__count__', 'sale_show_partner_name': True} diff --git a/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json b/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json index 83b01aaf8789f..d27018509bab1 100644 --- a/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json +++ b/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json @@ -1237,8 +1237,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", @@ -1606,8 +1605,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", @@ -1656,8 +1654,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", @@ -1706,8 +1703,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", @@ -1756,8 +1752,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", @@ -1806,8 +1801,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", @@ -1847,8 +1841,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", @@ -1891,8 +1884,7 @@ "context": { "group_by": [ "invoice_date" - ], - "group_by_no_leaf": 1 + ] }, "domain": [ "&", diff --git a/addons/spreadsheet_dashboard_hr_timesheet/data/files/tasks_dashboard.json b/addons/spreadsheet_dashboard_hr_timesheet/data/files/tasks_dashboard.json index 22fefb49dea91..4ed644598a63f 100644 --- a/addons/spreadsheet_dashboard_hr_timesheet/data/files/tasks_dashboard.json +++ b/addons/spreadsheet_dashboard_hr_timesheet/data/files/tasks_dashboard.json @@ -741,7 +741,6 @@ "searchParams": { "comparison": null, "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, @@ -780,7 +779,6 @@ "searchParams": { "comparison": null, "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, @@ -1075,7 +1073,6 @@ "1": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, @@ -1112,7 +1109,6 @@ "2": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, @@ -1149,7 +1145,6 @@ "3": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, @@ -1186,7 +1181,6 @@ "4": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, @@ -1223,7 +1217,6 @@ "5": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, @@ -1258,7 +1251,6 @@ "6": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [], "graph_measure": "__count__" }, diff --git a/addons/spreadsheet_dashboard_pos_hr/data/files/pos_dashboard.json b/addons/spreadsheet_dashboard_pos_hr/data/files/pos_dashboard.json index ab42fd71a2e0c..6e3379748010f 100644 --- a/addons/spreadsheet_dashboard_pos_hr/data/files/pos_dashboard.json +++ b/addons/spreadsheet_dashboard_pos_hr/data/files/pos_dashboard.json @@ -1096,7 +1096,6 @@ "searchParams": { "comparison": null, "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [["state", "in", ["paid", "done", "invoiced"]]], @@ -1327,7 +1326,6 @@ "1": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [["state", "in", ["paid", "done", "invoiced"]]], @@ -1357,7 +1355,6 @@ "2": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [["state", "in", ["paid", "done", "invoiced"]]], @@ -1387,7 +1384,6 @@ "3": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -1424,7 +1420,6 @@ "4": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -1461,7 +1456,6 @@ "5": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [["state", "in", ["paid", "done", "invoiced"]]], @@ -1482,7 +1476,6 @@ "6": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [["state", "in", ["paid", "done", "invoiced"]]], diff --git a/addons/spreadsheet_dashboard_sale/data/files/product_dashboard.json b/addons/spreadsheet_dashboard_sale/data/files/product_dashboard.json index 1169d5cd96197..1cf35d3bba5be 100644 --- a/addons/spreadsheet_dashboard_sale/data/files/product_dashboard.json +++ b/addons/spreadsheet_dashboard_sale/data/files/product_dashboard.json @@ -471,7 +471,6 @@ "searchParams": { "comparison": null, "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [[ @@ -515,7 +514,6 @@ "searchParams": { "comparison": null, "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [[ @@ -724,7 +722,6 @@ "1": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [[ @@ -765,7 +762,6 @@ "2": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [[ diff --git a/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json b/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json index 7b289f815614a..ca9f0c23abec6 100644 --- a/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json +++ b/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json @@ -1954,7 +1954,6 @@ "searchParams": { "comparison": null, "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2380,7 +2379,6 @@ "menu_id": 878, "cids": 1 }, - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2431,7 +2429,6 @@ "menu_id": 878, "cids": 1 }, - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2482,7 +2479,6 @@ "menu_id": 878, "cids": 1 }, - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2533,7 +2529,6 @@ "menu_id": 878, "cids": 1 }, - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2577,7 +2572,6 @@ "7": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2621,7 +2615,6 @@ "8": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2665,7 +2658,6 @@ "9": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ @@ -2709,7 +2701,6 @@ "10": { "colGroupBys": [], "context": { - "group_by_no_leaf": 1, "group_by": [] }, "domain": [ diff --git a/addons/spreadsheet_dashboard_website_sale/data/files/ecommerce_dashboard.json b/addons/spreadsheet_dashboard_website_sale/data/files/ecommerce_dashboard.json index 90f00520b09d1..491ae1ed57598 100644 --- a/addons/spreadsheet_dashboard_website_sale/data/files/ecommerce_dashboard.json +++ b/addons/spreadsheet_dashboard_website_sale/data/files/ecommerce_dashboard.json @@ -530,7 +530,6 @@ "comparison": null, "context": { "search_default_Sales": 1, - "group_by_no_leaf": 1, "group_by": [], "search_default_filter_order_date": 1, "search_default_recurring": 0, @@ -804,7 +803,6 @@ "colGroupBys": [], "context": { "search_default_Sales": 1, - "group_by_no_leaf": 1, "group_by": [], "search_default_filter_order_date": 1, "search_default_recurring": 0, diff --git a/addons/web/static/src/webclient/actions/action_service.js b/addons/web/static/src/webclient/actions/action_service.js index 894b41f8b47f2..48852651b236d 100644 --- a/addons/web/static/src/webclient/actions/action_service.js +++ b/addons/web/static/src/webclient/actions/action_service.js @@ -116,7 +116,7 @@ export class InvalidButtonParamsError extends Error {} // regex that matches context keys not to forward from an action to another const CTX_KEY_REGEX = - /^(?:(?:default_|search_default_|show_).+|.+_view_ref|group_by|group_by_no_leaf|active_id|active_ids|orderedBy)$/; + /^(?:(?:default_|search_default_|show_).+|.+_view_ref|group_by|active_id|active_ids|orderedBy)$/; // only register this template once for all dynamic classes ControllerComponent const ControllerComponentTemplate = xml``; diff --git a/addons/web/static/tests/helpers/mock_server.js b/addons/web/static/tests/helpers/mock_server.js index 2245a789c672d..71df2c28abe31 100644 --- a/addons/web/static/tests/helpers/mock_server.js +++ b/addons/web/static/tests/helpers/mock_server.js @@ -1248,9 +1248,8 @@ export class MockServer { delete group.__range; } // compute count key to match dumb server logic... - const groupByNoLeaf = kwargs.context ? "group_by_no_leaf" in kwargs.context : false; let countKey; - if (kwargs.lazy && (groupBy.length >= 2 || !groupByNoLeaf)) { + if (kwargs.lazy && groupBy.length >= 1) { countKey = groupBy[0].split(":")[0] + "_count"; } else { countKey = "__count"; diff --git a/addons/web/static/tests/views/list_view_tests.js b/addons/web/static/tests/views/list_view_tests.js index d035a84c174c8..f1c0f9dfd7a98 100644 --- a/addons/web/static/tests/views/list_view_tests.js +++ b/addons/web/static/tests/views/list_view_tests.js @@ -18226,30 +18226,6 @@ QUnit.module("Views", (hooks) => { assert.deepEqual([...getPagerValue(target), getPagerLimit(target)], [1, 2]); }); - QUnit.test("list with group_by_no_leaf and group by", async function (assert) { - assert.expect(4); - - await makeView({ - type: "list", - resModel: "foo", - serverData, - arch: '', - groupBy: ["currency_id"], - context: { group_by_no_leaf: true }, - }); - - const groups = target.querySelectorAll(".o_group_name"); - const groupsRecords = [...target.querySelectorAll(".o_data_row .o_data_cell")]; - assert.strictEqual(groups.length, 2, "There should be 2 groups"); - assert.strictEqual(groups[0].textContent, "USD (3) ", "Second group should have 3 records"); - assert.strictEqual(groups[1].textContent, "EUR (1) ", "First group should have 1 record"); - assert.deepEqual( - groupsRecords.map((groupEl) => groupEl.textContent), - ["blip", "gnap", "blip", "yop"], - "Groups should contains correct records" - ); - }); - QUnit.test("sort on a non sortable field with allow_order option", async function (assert) { serverData.models.foo.records = [{ bar: true }, { bar: false }, { bar: true }]; diff --git a/addons/website_crm_partner_assign/report/crm_partner_report_view.xml b/addons/website_crm_partner_assign/report/crm_partner_report_view.xml index 60dc09fa97ce1..8954aed0d395c 100644 --- a/addons/website_crm_partner_assign/report/crm_partner_report_view.xml +++ b/addons/website_crm_partner_assign/report/crm_partner_report_view.xml @@ -47,7 +47,7 @@ Partnership Analysis crm.partner.report.assign - {'group_by_no_leaf':1,'group_by':[]} + {'group_by':[]} graph [('grade_id', '!=', False)]